Merge branch 'master' of github.com:redkubes/otomi-api [ci skip]

Author: Maurice Faber

src/api.authz.test.ts

@@ -18,7 +18,7 @@ describe('Admin API tests', () => {
   })
 
   describe('Admin /settings/{setting} endpoint tests', () => {
-    const endpoints = ['alerts', 'azure', 'customer', 'dns', 'kms', 'home', 'oidc', 'otomi', 'policies', 'smtp']
+    const endpoints = ['alerts', 'azure', 'dns', 'kms', 'home', 'oidc', 'otomi', 'policies', 'smtp']
     endpoints.forEach((ep) => {
       it(`admin can get /settings/${ep}`, (done) => {
         request(app)

src/fixtures/values.ts

@@ -395,13 +395,11 @@ export default {
       apiServer: 'apiServer.onprem.example.com',
       domainSuffix: 'dev.onprem.example.com',
       k8sVersion: '1.19',
+      owner: 'demo',
       name: 'dev',
       provider: 'onprem',
       region: 'eu-central-1',
     },
-    customer: {
-      name: 'demo',
-    },
     dns: {
       zones: ['some.com', 'onprem.example.com', 'onprem.private.net'],
       aws: {

src/openapi/api.yaml

@@ -517,7 +517,6 @@ paths:
             - alerts
             - azure
             - cluster
-            - customer
             - dns
             - home
             - kms

src/openapi/cluster.yaml

@@ -18,6 +18,11 @@ entrypoint:
   type: string
 name:
   title: Name
+  description: A cluster name.
+  type: string
+owner:
+  title: Name
+  descrption: A cluster owner. Used in alerts/reports to distinguish between resources for different customers.
   type: string
 provider:
   title: Provider
@@ -93,6 +98,9 @@ Cluster:
     name:
       $ref: '#/name'
       x-readOnly: true
+    owner:
+      $ref: '#/name'
+      x-readOnly: true
     provider:
       $ref: '#/provider'
       x-readOnly: true

src/openapi/settings.yaml

@@ -49,15 +49,6 @@ Settings:
       type: object
     cluster:
       $ref: cluster.yaml#/Cluster
-    customer:
-      title: Customer
-      description: A customer's settings.
-      additionalProperties: false
-      properties:
-        name:
-          type: string
-          title: Name
-          description: Used in alerts/reports to distinguish between resources for different customers.
     dns:
       $ref: definitions.yaml#/dns
       x-externalDocsPath: docs/console/settings/dns

src/otomi-models.ts

@@ -17,7 +17,6 @@ export type Setting =
   | components['schemas']['Settings']['azure']
   | components['schemas']['Settings']['cluster']
   | components['schemas']['Session']['cluster']
-  | components['schemas']['Settings']['customer']
   | components['schemas']['Settings']['dns']
   | components['schemas']['Settings']['home']
   | components['schemas']['Settings']['kms']

test/env/cluster.yaml

@@ -4,5 +4,6 @@ cluster:
   domainSuffix: dev.onprem.example.com
   k8sVersion: '1.19'
   name: dev
+  owner: demo
   provider: onprem
   region: eu-central-1

test/env/settings.yaml

@@ -8,8 +8,6 @@ alerts:
 azure:
   appgw:
     isManaged: true
-customer:
-  name: demo
 dns:
   zones: [some.com, onprem.example.com, onprem.private.net]
   aws: