Skip to content

Commit 9545695

Browse files
authored
Merge pull request #1749 from diggerhq/fix/remove-is-acknowledged
Remove IsAcknowledged, use status instead
2 parents ca1a3c5 + 1947a11 commit 9545695

File tree

7 files changed

+48
-37
lines changed

7 files changed

+48
-37
lines changed

ee/drift/controllers/ci_jobs.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package controllers
22

33
import (
4+
"log"
5+
"net/http"
6+
"time"
7+
48
"github.com/diggerhq/digger/ee/drift/dbmodels"
59
"github.com/diggerhq/digger/ee/drift/model"
610
"github.com/diggerhq/digger/libs/terraform_utils"
711
"github.com/gin-gonic/gin"
8-
"log"
9-
"net/http"
10-
"time"
1112
)
1213

1314
type SetJobStatusRequest struct {
@@ -119,7 +120,7 @@ func ProjectDriftStateMachineApply(project model.Project, tfplan string, resourc
119120
}
120121
if !isEmptyPlan && !wasEmptyPlan {
121122
if project.DriftTerraformPlan != tfplan {
122-
if project.IsAcknowledged {
123+
if project.DriftStatus == dbmodels.DriftStatusAcknowledgeDrift {
123124
project.DriftStatus = dbmodels.DriftStatusNewDrift
124125
}
125126
}

ee/drift/model/org_settings.gen.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ee/drift/model/projects.gen.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ee/drift/model/users.gen.go

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ee/drift/models_generated/org_settings.gen.go

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ee/drift/models_generated/projects.gen.go

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ee/drift/models_generated/users.gen.go

Lines changed: 19 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)