fix: cert arn and name (#223)

Author: Maurice Faber

src/fixtures/values.ts

@@ -143,6 +143,7 @@ export default {
       },
       ingress: {
         certArn: undefined,
+        certName: undefined,
         domain: 'onprem.example.com',
         forwardPath: false,
         hasCert: false,
@@ -162,10 +163,11 @@ export default {
         serviceType: 'svcPredeployed',
       },
       ingress: {
-        certArn: undefined,
+        certArn: 'some-arn',
+        certName: undefined,
         domain: 'dev.onprem.example.com',
         forwardPath: false,
-        hasCert: false,
+        hasCert: true,
         auth: false,
         path: undefined,
         subdomain: 'hello.team-otomi',
@@ -183,6 +185,7 @@ export default {
       },
       ingress: {
         certArn: undefined,
+        certName: undefined,
         domain: 'onprem.private.net',
         forwardPath: false,
         hasCert: false,
@@ -203,9 +206,10 @@ export default {
       },
       ingress: {
         certArn: undefined,
+        certName: 'bla',
         domain: 'some.com',
         forwardPath: false,
-        hasCert: false,
+        hasCert: true,
         auth: false,
         path: undefined,
         subdomain: 'hello',
@@ -248,6 +252,7 @@ export default {
       },
       ingress: {
         certArn: undefined,
+        certName: undefined,
         domain: 'onprem.example.com',
         forwardPath: false,
         hasCert: false,
@@ -332,6 +337,7 @@ export default {
       ingress: {
         auth: false,
         certArn: undefined,
+        certName: undefined,
         domain: 'dev.onprem.example.com',
         forwardPath: false,
         hasCert: false,
@@ -442,11 +448,6 @@ export default {
         },
       },
       additionalClusters: [
-        {
-          name: 'dev',
-          domainSuffix: 'dev.eks.otomi.cloud',
-          provider: 'aws',
-        },
         {
           name: 'demo',
           domainSuffix: 'demo.eks.otomi.cloud',

src/openapi/service.yaml

@@ -96,7 +96,7 @@ Ingress:
       type: boolean
     certName:
       description: The name of a TLS secret known to exist in the team namespace.
-      example: www-example-com
+      example: example-com
       title: Secret name
       type: string
     certArn:

src/otomi-stack.ts

@@ -563,7 +563,20 @@ export default class OtomiStack {
 
   loadService(svcRaw, teamId): void {
     // Create service
-    const svc = omit(svcRaw, 'domain', 'forwardPath', 'hasCert', 'auth', 'ksvc', 'paths', 'type', 'ownHost', 'tlsPass')
+    const svc = omit(
+      svcRaw,
+      'certArn',
+      'certName',
+      'domain',
+      'forwardPath',
+      'hasCert',
+      'auth',
+      'ksvc',
+      'paths',
+      'type',
+      'ownHost',
+      'tlsPass',
+    )
     svc.teamId = teamId
     if (!('name' in svcRaw)) {
       debug('Unknown service structure')
@@ -591,16 +604,17 @@ export default class OtomiStack {
       const cluster: Cluster = this.getSetting('cluster') as Cluster
       const url = getServiceUrl({ domain: svcRaw.domain, name: svcRaw.name, teamId, cluster, dns })
       svc.ingress = {
-        hasCert: 'hasCert' in svcRaw,
         auth: 'auth' in svcRaw,
         certArn: svcRaw.certArn || undefined,
+        certName: svcRaw.certName || undefined,
         domain: url.domain,
-        subdomain: url.subdomain,
-        useDefaultSubdomain: !svcRaw.domain && svcRaw.ownHost,
-        path: svcRaw.paths && svcRaw.paths.length ? svcRaw.paths[0] : undefined,
         forwardPath: 'forwardPath' in svcRaw,
+        hasCert: 'hasCert' in svcRaw,
+        path: svcRaw.paths && svcRaw.paths.length ? svcRaw.paths[0] : undefined,
+        subdomain: url.subdomain,
         tlsPass: 'tlsPass' in svcRaw,
         type: svcRaw.type,
+        useDefaultSubdomain: !svcRaw.domain && svcRaw.ownHost,
       }
     }
 
@@ -638,6 +652,7 @@ export default class OtomiStack {
       else svcCloned.domain = `${ing.subdomain}.${ing.domain}`
       if (ing.auth) svcCloned.auth = true
       if (ing.hasCert) svcCloned.hasCert = true
+      if (ing.certName) svcCloned.certName = ing.certName
       if (ing.certArn) svcCloned.certArn = ing.certArn
       if (ing.path) svcCloned.paths = [ing.path]
       if (ing.forwardPath) svcCloned.forwardPath = true

test/env/settings.yaml

@@ -41,9 +41,6 @@ otomi:
     conftest:
       enabled: true
   additionalClusters:
-    - name: dev
-      domainSuffix: dev.eks.otomi.cloud
-      provider: aws
     - name: demo
       domainSuffix: demo.eks.otomi.cloud
       provider: aws

test/env/teams/services.otomi.yaml

@@ -28,6 +28,8 @@ teamConfig:
           id: f818a64d-25a4-46e0-9eaf-769b78866031
           ownHost: true
           type: public
+          certArn: some-arn
+          hasCert: true
         - name: hello-private
           id: f818a64d-25a4-46e0-9eaf-769b78866032
           domain: hello-private.team-otomi.dev.onprem.private.net
@@ -36,6 +38,8 @@ teamConfig:
           id: f818a64d-25a4-46e0-9eaf-769b78866033
           domain: hello.some.com
           type: public
+          hasCert: true
+          certName: bla
         - name: servant2
           id: f818a64d-25a4-46e0-9eaf-769b7886603d
           ksvc: