Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: consider deleted release in delete env from app #2015

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: consider deleted release in delete env from app #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkg/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,24 @@ func (h *DBHandler) processReleaseManifestRows(ctx context.Context, err error, r
return result, nil
}

func (h *DBHandler) DBSelectReleasesByAppIncludingDeleted(ctx context.Context, tx *sql.Tx, app string, ignorePrepublishes bool) ([]*DBReleaseWithMetaData, error) {
span, ctx := tracer.StartSpanFromContext(ctx, "DBSelectReleasesByApp")
defer span.Finish()
selectQuery := h.AdaptQuery(fmt.Sprintf(
"SELECT eslVersion, created, appName, metadata, manifests, releaseVersion, deleted " +
" FROM releases " +
" WHERE appName=? " +
" ORDER BY releaseVersion DESC, eslVersion DESC, created DESC;"))
span.SetTag("query", selectQuery)
rows, err := tx.QueryContext(
ctx,
selectQuery,
app,
)

return h.processReleaseRows(ctx, err, rows, ignorePrepublishes)
}

func (h *DBHandler) DBSelectReleasesByApp(ctx context.Context, tx *sql.Tx, app string, deleted bool, ignorePrepublishes bool) ([]*DBReleaseWithMetaData, error) {
span, ctx := tracer.StartSpanFromContext(ctx, "DBSelectReleasesByApp")
defer span.Finish()
Expand Down
6 changes: 5 additions & 1 deletion services/cd-service/pkg/repository/transformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,12 +1689,16 @@ func (u *DeleteEnvFromApp) Transform(
return "", err
}
if state.DBHandler.ShouldUseOtherTables() {
releases, err := state.DBHandler.DBSelectReleasesByApp(ctx, transaction, u.Application, false, true)
releases, err := state.DBHandler.DBSelectReleasesByAppIncludingDeleted(ctx, transaction, u.Application, true)
if err != nil {
return "", err
}

for _, dbReleaseWithMetadata := range releases {
if dbReleaseWithMetadata.Deleted {
// the release is already deleted, so we can skip it
continue
}
newManifests := make(map[string]string)
for envName, manifest := range dbReleaseWithMetadata.Manifests.Manifests {
if envName != u.Environment {
Expand Down
Loading