add(postgres): gql ID for App storage resolver

* update test files

Co-authored-by: Tommy Trøen <[email protected]>
Co-authored-by: Christer Edvartsen <[email protected]>

Author: 3 people

data/k8s/dev/devteam/app-w-all-storage.yaml

@@ -12,7 +12,7 @@ spec:
     sqlInstances:
       - type: POSTGRES_15
         cascadingDelete: true
-        name: deleteme
+        name: contests
       - type: POSTGRES_14
         name: donotdelete
     bigQueryDatasets:

data/k8s/dev/devteam/sqlinstance.yaml

@@ -16,14 +16,14 @@ metadata:
     app.kubernetes.io/name: app-w-all-storage
     helm.sh/chart: app-w-all-storage-2024-02-22-115844-b411609
     team: nais
-  name: deleteme
+  name: contests
   namespace: nais-system
 spec:
   databaseVersion: POSTGRES_15
   instanceType: CLOUD_SQL_INSTANCE
   maintenanceVersion: POSTGRES_15_10.R20240130.00_05
   region: europe-north1
-  resourceID: deleteme
+  resourceID: contests
   settings:
     activationPolicy: ALWAYS
     availabilityType: ZONAL
@@ -59,9 +59,9 @@ status:
   conditions:
     - lastTransitionTime: "2024-01-23T09:30:20Z"
       message: The resource is up to date
-      reason: Provisioning
+      reason: UpToDate
       status: "True"
-      type: NotReady
+      type: Ready
   connectionName: nais-dev-123:europe-north1:app-w-all-storage
   firstIpAddress: 1.2.3.4
   instanceType: CLOUD_SQL_INSTANCE
@@ -135,10 +135,10 @@ spec:
 status:
   conditions:
     - lastTransitionTime: "2024-01-23T09:30:20Z"
-      message: The resource is up to date
-      reason: Provisioning
-      status: "True"
-      type: NotReady
+      message: "Update call failed: error applying desired state: summary: Error, failed to update instance settings for : googleapi: Error 400: Invalid request: backup retention should be >= transaction log retention.,"
+      reason: UpdateFailed
+      status: "False"
+      type: Ready
   connectionName: nais-dev-123:europe-north1:app-w-all-storage
   firstIpAddress: 1.2.3.4
   instanceType: CLOUD_SQL_INSTANCE

data/k8s/superprod/devteam/sqlinstance_update_failed.yaml

@@ -65,7 +65,7 @@ status:
     - lastTransitionTime: "2024-04-03T10:49:48Z"
       message: 'Update call failed: error applying desired state: summary: Error, failed
       to update instance settings for : googleapi: Error 400: Invalid request: Incorrect
-      Service Networking config for instance: tommytest3-dev-a367:contests-failing:SERVICE_NETWORKING_NOT_ENABLED.,
+      Service Networking config for instance: superprod-test:contests-failing:SERVICE_NETWORKING_NOT_ENABLED.,
       invalid'
       reason: UpdateFailed
       status: "False"

internal/k8s/apps.go

@@ -112,7 +112,7 @@ func (c *Client) App(ctx context.Context, name, team, env string) (*model.App, e
 		return nil, c.error(ctx, err, "getting topics")
 	}
 
-	storage, err := appStorage(obj.(*unstructured.Unstructured), topics)
+	storage, err := appStorage(obj.(*unstructured.Unstructured), topics, env)
 	if err != nil {
 		return nil, c.error(ctx, err, "converting to app storage")
 	}
@@ -928,7 +928,7 @@ func synchronizationStateCondition(conditions []metav1.Condition) *metav1.Condit
 	return nil
 }
 
-func appStorage(u *unstructured.Unstructured, topics []*model.Topic) ([]model.Storage, error) {
+func appStorage(u *unstructured.Unstructured, topics []*model.Topic, env string) ([]model.Storage, error) {
 	app := &naisv1alpha1.Application{}
 	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, app); err != nil {
 		return nil, fmt.Errorf("converting to application: %w", err)
@@ -954,6 +954,7 @@ func appStorage(u *unstructured.Unstructured, topics []*model.Topic) ([]model.St
 			if sqlInstance.Name == "" {
 				sqlInstance.Name = app.Name
 			}
+			sqlInstance.ID = scalar.SqlInstanceIdent("sqlInstance_" + env + "_" + app.GetNamespace() + "_" + sqlInstance.GetName())
 			ret = append(ret, sqlInstance)
 		}