linode · j-zimnowoda · Apr 11, 2025 · Apr 3, 2025 · Apr 3, 2025 · Apr 3, 2025
@@ -554,7 +554,6 @@
     if (hasCorrespondingDecryptedFile(filePath, files)) return
     promises.push(deps.loadFileToSpec(filePath, fileMap, spec))
   })
-
   await Promise.all(promises)
 }
 
@@ -565,18 +564,35 @@
   deps = { loadYaml },
 ): Promise<void> {
   const jsonPath = getJsonPath(fileMap, filePath)
-  const data = await deps.loadYaml(filePath)
-  if (fileMap.processAs === 'arrayItem') {
-    const ref: Record<string, any>[] = get(spec, jsonPath)
-    ref.push(data?.spec)
-  } else {
-    const ref: Record<string, any> = get(spec, jsonPath)
-    // Decrypted secrets may need to be merged with plain text specs
-    const newRef = merge(cloneDeep(ref), data?.spec)
-    set(spec, jsonPath, newRef)
+  const data = (await deps.loadYaml(filePath)) || {}
+
+  try {
+    if (!filePath.includes('secrets.')) {
+      // data.spec.id = data.metadata.name
+
+      if (fileMap.resourceGroup === 'team') {
+        data.spec.name = data.metadata.name
+        // data.spec.teamId = data.metadata.labels['apl.io/teamId']
+      }
+      if (fileMap.resourceGroup === 'users') {
+        data.spec.id = data.metadata.name
+      }
+    }
+    if (fileMap.processAs === 'arrayItem') {
+      const ref: Record<string, any>[] = get(spec, jsonPath)
+      ref.push(data?.spec)
+    } else {
+      const ref: Record<string, any> = get(spec, jsonPath)
+      // Decrypted secrets may need to be merged with plain text specs
+      const newRef = merge(cloneDeep(ref), data?.spec)
+      set(spec, jsonPath, newRef)
+    }
+  } catch (e) {
+    console.log(filePath)
+    console.log(fileMap)
+    throw e
   }
 }
-
 export async function getKmsSettings(envDir: string, deps = { loadToSpec }): Promise<Record<string, any>> {
   const kmsFiles = getFileMap('AplKms', envDir)
   const spec = {}

@@ -3,9 +3,9 @@ metadata:
     name: cluster
     labels: {}
 spec:
+    name: demo
     apiServer: https://1.1.1.1:8443
     domainSuffix: dev.linode-apl.net
     k8sContext: linode-dev
-    name: demo
     owner: akamai
     provider: linode
@@ -6,7 +6,6 @@ metadata:
 spec:
     auth: true
     domain: hello.team-admin.dev.linode-apl.net
-    name: hello-admin
     ownHost: true
     port: 80
     type: public
@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: admin
 spec:
-    id: admin
     managedMonitoring:
         alertmanager: true
         grafana: true

@@ -5,7 +5,6 @@ metadata:
         apl.io/teamId: admin
 spec:
     chart: crossplane
-    name: crossplane-custom-namespace
     namespace: crossplane
     revision: 1.11.2
     url: https://charts.crossplane.io/stable
@@ -5,6 +5,5 @@ metadata:
         apl.io/teamId: admin
 spec:
     chart: crossplane
-    name: crossplane-team-namespace
     revision: 1.11.2
     url: https://charts.crossplane.io/stable
@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: admin
 spec:
-    name: wa1
     path: /
     revision: HEAD
     url: https://myrepo.local/mychart.git
@@ -5,6 +5,5 @@ metadata:
         apl.io/teamId: admin
 spec:
     chart: mychart
-    name: wa2
     revision: 1.2.3
     url: https://myregistry.local/mychart
@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: bu1
     schedule: 0 0 0 * *
     snapshotVolumes: true
     ttl: 8h
@@ -9,7 +9,6 @@ spec:
           value: hello
         - name: backup
           value: all
-    name: bu2
     schedule: 0 0 0 * *
     snapshotVolumes: true
     ttl: 8h
diff --git a/tests/fixtures/env/teams/demo/builds/demo-java1.yaml b/tests/fixtures/env/teams/demo/builds/demo-java1.yaml
@@ -11,7 +11,6 @@ spec:
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: docker
-    name: demo-java1
     scanSource: true
     tag: v.0.0.1
     trigger: false
diff --git a/tests/fixtures/env/teams/demo/builds/demo-java2.yaml b/tests/fixtures/env/teams/demo/builds/demo-java2.yaml
@@ -16,7 +16,6 @@ spec:
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: buildpacks
-    name: demo-java2
     scanSource: false
     tag: v.0.0.1
     trigger: false
diff --git a/tests/fixtures/env/teams/demo/builds/demo-java3.yaml b/tests/fixtures/env/teams/demo/builds/demo-java3.yaml
@@ -16,7 +16,6 @@ spec:
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: docker
-    name: demo-java3
     scanSource: true
     secretName: my-secret
     tag: v_0_0_1

@@ -5,7 +5,5 @@ metadata:
     name: buildpacks-samples
 spec:
     gitService: github
-    name: buildpacks-samples
     private: false
     repositoryUrl: https://github.com/buildpacks/samples
-    teamId: demo
@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: allow-egress-1
     ruleType:
         egress:
             domain: demo.local

@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: allow-egress-2
     ruleType:
         egress:
             domain: demo.local

@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: allow-ingress-1
     ruleType:
         ingress:
             allow:

diff --git a/tests/fixtures/env/teams/demo/sealedsecrets/demo.yaml b/tests/fixtures/env/teams/demo/sealedsecrets/demo.yaml
@@ -0,0 +1,18 @@
+kind: AplTeamSecret
+metadata:
+    name: demo
+    labels:
+        apl.io/teamId: demo
+spec:
+    encryptedData:
+        foo: bar
+    metadata:
+        annotations:
+            - key: test
+              value: annotation
+        finalizers:
+            - sealedsecrets.bitnami.com/finalizer-sealedsecret-v1alpha1
+        labels:
+            - key: test
+              value: label
+    type: kubernetes.io/opaque
@@ -5,7 +5,6 @@ metadata:
         apl.io/teamId: demo
 spec:
     hasCert: true
-    name: has-cert-svc
     paths:
         - /jeho
     type: public
@@ -7,7 +7,6 @@ spec:
     domain: tlspass.dev.linode-apl.net
     ksvc:
         predeployed: true
-    name: hello-auth
     ownHost: true
     paths: []
     port: 80

@@ -7,7 +7,6 @@ spec:
     ingressClassName: platform
     ksvc:
         predeployed: false
-    name: hello-blue-green
     ownHost: true
     paths: []
     port: 80

@@ -18,7 +18,6 @@ spec:
                   value: same-origin
     ksvc:
         predeployed: true
-    name: hello
     ownHost: true
     port: 80
     tlsPass: true

@@ -4,5 +4,4 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: service-a
     type: cluster
@@ -4,5 +4,4 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: service-b
     type: cluster
@@ -4,5 +4,4 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: service-d
     type: cluster
@@ -19,7 +19,6 @@ spec:
                 - name: sander
                   value: same-origin
     ingressClassName: net-a
-    name: service-e
     trafficControl:
         enabled: true
         weightV1: 50

@@ -4,6 +4,5 @@ metadata:
     labels:
         apl.io/teamId: demo
 spec:
-    name: some-svc
     port: 80
     type: cluster
@@ -6,7 +6,6 @@ metadata:
 spec:
     ksvc:
         predeployed: true
-    name: tlspass
     port: 443
     tlsPass: true
     type: public
@@ -15,7 +15,6 @@ spec:
             channel: aaaaa
             channelCrit: aaaaa
             url: https://slack.con
-    id: demo
     managedMonitoring:
         alertmanager: true
         grafana: true

@@ -6,7 +6,6 @@ metadata:
 spec:
     imageUpdateStrategy:
         type: disabled
-    name: wd
     path: ./
     revision: main
     url: https://myrepo.local/mychart.git
@@ -11,7 +11,6 @@ spec:
             tag: latest
             tagParameter: v2.image.tag
         type: digest
-    name: wd1
     path: ./
     revision: main
     url: https://myrepo.local/mychart.git
@@ -9,7 +9,6 @@ spec:
             imageRepository: harbor.try-otomi.net/team-orange/green
             versionConstraint: '1.12'
         type: semver
-    name: wd2
     path: ./
     revision: main
     url: https://myrepo.local/mychart.git
@@ -6,7 +6,6 @@ metadata:
 spec:
     imageUpdateStrategy:
         type: disabled
-    name: wd3
     path: ./
     revision: main
     url: https://myrepo.local/mychart.git
@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: dev
 spec:
-    name: allow-egress-2
     ruleType:
         type: egress
         egress:

@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: dev
 spec:
-    name: allow-ingress-1
     ruleType:
         ingress:
             allow:

@@ -4,7 +4,6 @@ metadata:
     labels:
         apl.io/teamId: dev
 spec:
-    id: dev
     managedMonitoring:
         alertmanager: true
         grafana: true

@@ -11,4 +11,3 @@ spec:
     lastName: admin
     teams:
         - demo
-    id: 23d63558-49ed-48ba-bc28-8037a7236ddf
@@ -11,4 +11,3 @@ spec:
     lastName: member
     teams:
         - demo
-    id: 9a3a478b-a747-4b4a-be69-a9abf1979df2
@@ -9,4 +9,3 @@ spec:
     isPlatformAdmin: true
     isTeamAdmin: true
     lastName: admin
-    id: a83e20b7-474a-4262-a3ad-b09813364ece
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,3 @@ spec: @@
         lastName: admin
         teams:
             - demo
-        id: 23d63558-49ed-48ba-bc28-8037a7236ddf