Merge pull request #1749 from diggerhq/fix/remove-is-acknowledged

Remove IsAcknowledged, use status instead
diggerhq · Oct 4, 2024 · 9545695 · 9545695
2 parents ca1a3c5 + 1947a11
commit 9545695
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 37 deletions.
diff --git a/ee/drift/controllers/ci_jobs.go b/ee/drift/controllers/ci_jobs.go
@@ -1,13 +1,14 @@
 package controllers
 
 import (
+	"log"
+	"net/http"
+	"time"
+
 	"github.com/diggerhq/digger/ee/drift/dbmodels"
 	"github.com/diggerhq/digger/ee/drift/model"
 	"github.com/diggerhq/digger/libs/terraform_utils"
 	"github.com/gin-gonic/gin"
-	"log"
-	"net/http"
-	"time"
 )
 
 type SetJobStatusRequest struct {
@@ -119,7 +120,7 @@ func ProjectDriftStateMachineApply(project model.Project, tfplan string, resourc
 	}
 	if !isEmptyPlan && !wasEmptyPlan {
 		if project.DriftTerraformPlan != tfplan {
-			if project.IsAcknowledged {
+			if project.DriftStatus == dbmodels.DriftStatusAcknowledgeDrift {
 				project.DriftStatus = dbmodels.DriftStatusNewDrift
 			}
 		}

diff --git a/ee/drift/model/org_settings.gen.go b/ee/drift/model/org_settings.gen.go
diff --git a/ee/drift/model/projects.gen.go b/ee/drift/model/projects.gen.go
diff --git a/ee/drift/model/users.gen.go b/ee/drift/model/users.gen.go
diff --git a/ee/drift/models_generated/org_settings.gen.go b/ee/drift/models_generated/org_settings.gen.go
diff --git a/ee/drift/models_generated/projects.gen.go b/ee/drift/models_generated/projects.gen.go
diff --git a/ee/drift/models_generated/users.gen.go b/ee/drift/models_generated/users.gen.go