chore: fixes after rebase

Signed-off-by: Jakob Steiner <jakob.steiner@glasskube.eu>
glasskube · Feb 18, 2025 · 45c75de · 45c75de
1 parent 49e6ba3
commit 45c75de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/internal/handlers/application_licenses.go b/internal/handlers/application_licenses.go
@@ -87,7 +87,7 @@ func updateApplicationLicense(w http.ResponseWriter, r *http.Request) {
 	license.OrganizationID = *auth.CurrentOrgID()
 
 	existing := internalctx.GetApplicationLicense(ctx)
-	if IsEmptyUUID(license.ID) {
+	if license.ID == uuid.Nil {
 		license.ID = existing.ID
 	} else if license.ID != existing.ID {
 		w.WriteHeader(http.StatusBadRequest)

diff --git a/internal/handlers/deployment_targets.go b/internal/handlers/deployment_targets.go
@@ -97,7 +97,7 @@ func updateDeploymentTarget(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !IsEmptyUUID(dt.AgentVersion.ID) {
+	if dt.AgentVersion.ID != uuid.Nil {
 		dt.AgentVersionID = &dt.AgentVersion.ID
 	}
 

diff --git a/internal/handlers/deployments.go b/internal/handlers/deployments.go
@@ -182,7 +182,7 @@ func validateDeploymentRequestLicense(
 	ctx context.Context,
 	w http.ResponseWriter,
 	request api.DeploymentRequest,
-	license *types.ApplicationLicenseWithVersions,
+	license *types.ApplicationLicense,
 	app *types.Application,
 	target *types.DeploymentTargetWithCreatedBy,
 ) error {
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	if !IsEmptyUUID(dt.AgentVersion.ID) {
+    	if dt.AgentVersion.ID != uuid.Nil {
     		dt.AgentVersionID = &dt.AgentVersion.ID
     	}
@@ Expand Down @@