feat: service page using new components

helmfile.d/snippets/blackbox-targets.gotmpl

@@ -1,7 +1,6 @@
 {{- $registry := list }}
 {{- range $s := .services }}
-  {{- $type := $s.type | default "auth" }}
-  {{- if and (eq $type "public") (not ($s | get "ksvc.scaleToZero" false)) }}
+  {{- if (not ($s | get "ksvc.scaleToZero" false)) }}
     {{- $host := (printf "%s-%s" $s.name $.teamId) }}
     {{- $svcDomain := ($s | get "domain" (printf "%s.%s" $host $.domain)) }}
     {{- $paths:= $s | get "paths" list }}

src/cmd/migrate.test.ts

@@ -16,8 +16,8 @@ describe('Upgrading values', () => {
     teamConfig: {
       teamA: {
         services: [
-          { name: 'svc1', prop: 'replaceMe', bla: [{ ok: 'replaceMe' }] },
-          { name: 'svc1', prop: 'replaceMe', di: [{ ok: 'replaceMeNot' }] },
+          { name: 'svc1', prop: 'replaceMe', bla: [{ ok: 'replaceMe' }], type: 'cluster' },
+          { name: 'svc2', prop: 'replaceMe', di: [{ ok: 'replaceMeNot' }], type: 'public' },
         ],
       },
     },
@@ -43,11 +43,19 @@ describe('Upgrading values', () => {
       ],
       renamings: [{ 'somefile.yaml': 'newloc.yaml' }],
     },
+    {
+      version: 4,
+      deletions: [
+        // { 'some.k8sVersion': 'printf "v%s" .prev' },
+        'teamConfig.{team}.services[].type',
+        // { 'teamConfig.{team}.services[].bla[].ok': 'print .prev "ee"' },
+      ],
+    },
   ]
 
   describe('Filter changes', () => {
     it('should only select changes whose version >= current version', () => {
-      expect(filterChanges(oldVersion, mockChanges)).toEqual(mockChanges.slice(1, 3))
+      expect(filterChanges(oldVersion, mockChanges)).toEqual(mockChanges.slice(1, 4))
     })
   })
   describe('Apply changes to values', () => {
@@ -66,12 +74,12 @@ describe('Upgrading values', () => {
             teamA: {
               services: [
                 { name: 'svc1', prop: 'replaced', bla: [{ ok: 'replaceMe' }] },
-                { name: 'svc1', prop: 'replaced', di: [{ ok: 'replaceMeNot' }] },
+                { name: 'svc2', prop: 'replaced', di: [{ ok: 'replaceMeNot' }] },
               ],
             },
           },
           some: { bla: {}, k8sVersion: '1.18' },
-          versions: { specVersion: 3 },
+          versions: { specVersion: 4 },
         },
         true,
       )

src/cmd/migrate.ts

@@ -450,14 +450,40 @@ export const applyChanges = async (
 
 export const unparsePaths = (path: string, values: Record<string, any>): Array<string> => {
   if (path.includes('{team}')) {
-    const paths: Array<string> = []
+    let paths: Array<string> = []
     const teams: Array<string> = Object.keys(values?.teamConfig as Record<string, any>)
     teams.forEach((teamName) => paths.push(path.replace('{team}', teamName)))
+    paths = transformArrayToPaths(paths, values)
     return paths.sort()
   } else {
-    return [path]
+    const paths = transformArrayToPaths([path], values)
+    return paths
   }
 }
+
+function transformArrayToPaths(paths: string[], values: Record<string, any>): string[] {
+  const transformedPaths: string[] = []
+
+  paths.forEach((path) => {
+    const match = path.match(/^(.*)\.(\w+)\[\](.*)$/)
+    if (!match) {
+      transformedPaths.push(path)
+      return
+    }
+
+    const [, beforeArrayPath, arrayKey, afterArrayPath] = match
+
+    const objectPath = beforeArrayPath.split('.').reduce((obj, key) => obj?.[key], values)
+
+    if (objectPath && objectPath[arrayKey]) {
+      objectPath[arrayKey].forEach((_item: any, index: number) => {
+        transformedPaths.push(`${beforeArrayPath}.${arrayKey}[${index}]${afterArrayPath}`)
+      })
+    }
+  })
+
+  return transformedPaths
+}
 export const unsetAtPath = (path: string, values: Record<string, any>): void => {
   const paths = unparsePaths(path, values)
   paths.forEach((p) => unset(values, p))
@@ -610,12 +636,13 @@ export const migrate = async (): Promise<boolean> => {
   const versions = await loadYaml(`${env.ENV_DIR}/env/settings/versions.yaml`, { noError: true })
   const prevVersion: number = versions?.spec?.specVersion
   if (!prevVersion) {
+    d.log('No previous version detected')
     d.log('No changes detected, skipping')
     return false
   }
-
+  d.log('PREVIOUS VERSION: ', prevVersion)
   const filteredChanges = filterChanges(prevVersion, changes)
-
+  d.log('FILTEREDCHANGES', filteredChanges)
   if (filteredChanges.length) {
     d.log(
       `Changes detected, migrating from ${prevVersion} to ${

src/common/repo.ts

@@ -455,6 +455,8 @@ export async function saveResourceGroupToFiles(
       try {
         const filePath = getFilePath(fileMap, nodePath, nodeValue, '')
         const manifest = renderManifest(fileMap, nodePath, nodeValue)
+        console.log('filepath: ', filePath)
+        console.log('manifest: ', manifest)
         await deps.writeValuesToFile(filePath, manifest)
       } catch (e) {
         console.log(nodePath)

src/common/values.ts

@@ -1,6 +1,6 @@
 import { pathExists } from 'fs-extra'
 import { mkdir, unlink, writeFile } from 'fs/promises'
-import { cloneDeep, get, isEmpty, isEqual, merge, omit, pick, set } from 'lodash'
+import { cloneDeep, get, isEmpty, isEqual, merge, mergeWith, omit, pick, set } from 'lodash'
 import path from 'path'
 import { supportedK8sVersions } from 'src/supportedK8sVersions.json'
 import { stringify } from 'yaml'
@@ -102,6 +102,10 @@ export const getRepo = (values: Record<string, any>): Repo => {
   return { remote, branch, email, username, password }
 }
 
+function mergeCustomizer(prev, next) {
+  return next
+}
+
 let hasSops = false
 /**
  * Writes new values to a file. Will keep the original values if `overwrite` is `false`.
@@ -121,7 +125,7 @@ export const writeValuesToFile = async (
   const values = cloneDeep(inValues)
   const originalValues = (await loadYaml(targetPath + suffix, { noError: true })) ?? {}
   d.debug('originalValues: ', JSON.stringify(originalValues, null, 2))
-  const mergeResult = merge(cloneDeep(originalValues), values)
+  const mergeResult = mergeWith(cloneDeep(originalValues), values, mergeCustomizer)
   const cleanedValues = removeBlankAttributes(values)
   const cleanedMergeResult = removeBlankAttributes(mergeResult)
   if (((overwrite && isEmpty(cleanedValues)) || (!overwrite && isEmpty(cleanedMergeResult))) && isSecretsFile) {
@@ -145,6 +149,7 @@ export const writeValuesToFile = async (
       return
     }
   }
+
   if (isEqual(originalValues, useValues)) {
     d.info(`No changes for ${targetPath}${suffix}, skipping...`)
     return

tests/bootstrap/input-local-dev.yaml

@@ -58,14 +58,12 @@ teamConfig:
         name: httpbin
         ownHost: true
         port: 80
-        type: public
       - id: a106eb22-8c06-41b6-ab15-97aafb0888b5
         ingressClassName: platform
         name: nginx-deployment
         ownHost: true
         paths: []
         port: 80
-        type: public
       - id: 91f6af98-ad8e-4111-b916-cf1b5bdcafb0
         ingressClassName: platform
         ksvc:
@@ -74,7 +72,6 @@ teamConfig:
         ownHost: true
         paths: []
         port: 80
-        type: public
     workloads:
       - name: nodejs-helloworld
         url: https://github.com/linode/apl-nodejs-helloworld.git

tests/bootstrap/input.yaml

@@ -57,14 +57,12 @@ teamConfig:
         name: httpbin
         ownHost: true
         port: 80
-        type: public
       - id: a106eb22-8c06-41b6-ab15-97aafb0888b5
         ingressClassName: platform
         name: nginx-deployment
         ownHost: true
         paths: []
         port: 80
-        type: public
       - id: 91f6af98-ad8e-4111-b916-cf1b5bdcafb0
         ingressClassName: platform
         ksvc:
@@ -73,7 +71,6 @@ teamConfig:
         ownHost: true
         paths: []
         port: 80
-        type: public
     workloads:
       - name: nodejs-helloworld
         url: https://github.com/linode/apl-nodejs-helloworld.git

tests/fixtures/env/apps/loki.yaml

@@ -3,6 +3,7 @@ metadata:
     name: loki
     labels: {}
 spec:
+    _rawValues: {}
     autoscaling:
         distributor:
             enabled: true
@@ -94,4 +95,3 @@ spec:
         duration: 24h
         period: 24h
     v11StartDate: 2021-05-13T00:00:00.000Z
-    _rawValues: {}

tests/fixtures/env/settings/versions.yaml

@@ -3,4 +3,4 @@ metadata:
     name: versions
     labels: {}
 spec:
-    specVersion: 35
+    specVersion: 36

tests/fixtures/env/teams/admin/services/hello-admin.yaml

@@ -8,4 +8,3 @@ spec:
     domain: hello.team-admin.dev.linode-apl.net
     ownHost: true
     port: 80
-    type: public

tests/fixtures/env/teams/demo/builds/demo-java1-v0-0-1.yaml

@@ -5,14 +5,13 @@ metadata:
         apl.io/teamId: demo
 spec:
     externalRepo: false
+    imageName: demo-java1
     mode:
         docker:
             path: ./Dockerfile
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: docker
-    name: demo-java1-v0-0-1
-    imageName: demo-java1
     scanSource: true
     tag: v0.0.1
     trigger: false

tests/fixtures/env/teams/demo/builds/demo-java2-v0-0-1.yaml

@@ -5,6 +5,7 @@ metadata:
         apl.io/teamId: demo
 spec:
     externalRepo: false
+    imageName: demo-java2
     mode:
         buildpacks:
             envVars:
@@ -16,8 +17,6 @@ spec:
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: buildpacks
-    name: demo-java2-v0-0-1
-    imageName: demo-java2
     scanSource: false
     tag: v0.0.1
     trigger: false

tests/fixtures/env/teams/demo/builds/demo-java3-v0-0-1.yaml

@@ -5,6 +5,7 @@ metadata:
         apl.io/teamId: demo
 spec:
     externalRepo: true
+    imageName: demo-java3
     mode:
         docker:
             envVars:
@@ -16,8 +17,6 @@ spec:
             repoUrl: https://github.com/buildpacks/samples
             revision: HEAD
         type: docker
-    name: demo-java3-v0-0-1
-    imageName: demo-java3
     scanSource: true
     secretName: my-secret
     tag: v0.0.1

tests/fixtures/env/teams/demo/services/has-cert-svc.yaml

@@ -7,4 +7,3 @@ spec:
     hasCert: true
     paths:
         - /jeho
-    type: public

tests/fixtures/env/teams/demo/services/hello-auth.yaml

@@ -10,4 +10,3 @@ spec:
     ownHost: true
     paths: []
     port: 80
-    type: public

tests/fixtures/env/teams/demo/services/hello-blue-green.yaml

@@ -14,5 +14,4 @@ spec:
         enabled: true
         weightV1: 90
         weightV2: 10
-    type: public
     useCname: false

tests/fixtures/env/teams/demo/services/hello.yaml

@@ -25,5 +25,4 @@ spec:
         enabled: true
         weightV1: 70
         weightV2: 30
-    type: public
     useCname: true

tests/fixtures/env/teams/demo/services/service-a.yaml

@@ -3,5 +3,4 @@ metadata:
     name: service-a
     labels:
         apl.io/teamId: demo
-spec:
-    type: cluster
+spec: {}

tests/fixtures/env/teams/demo/services/service-e.yaml

@@ -23,5 +23,4 @@ spec:
         enabled: true
         weightV1: 50
         weightV2: 50
-    type: public
     useCname: true

tests/fixtures/env/teams/demo/services/tlspass.yaml

@@ -8,4 +8,3 @@ spec:
         predeployed: true
     port: 443
     tlsPass: true
-    type: public

tests/fixtures/env/teams/demo/settings.yaml

@@ -5,17 +5,14 @@ metadata:
         apl.io/teamId: demo
 spec:
     alerts:
-        email:
-            critical: [email protected]
-            nonCritical: [email protected]
+        email: {}
+        groupInterval: 5m
         receivers:
             - slack
         repeatInterval: 3h
         slack:
             channel: aaaaa
             channelCrit: aaaaa
-            url: https://slack.con
-        groupInterval: 5m
     managedMonitoring:
         alertmanager: true
         grafana: true
@@ -40,4 +37,3 @@ spec:
             - ingress
         team:
             - alerts
-    password: somesecretvalue