fix: remove smtp from settings (#956)

Author: dennisvankekem

src/fileStore/file-map.ts

@@ -107,14 +107,6 @@ export function getFileMaps(envDir: string): Map<AplKind, FileMap> {
     name: 'platformBackups',
   })
 
-  maps.set('AplSmtp', {
-    kind: 'AplSmtp',
-    envDir,
-    pathGlob: `${envDir}/env/settings/*smtp.{yaml,yaml.dec}`,
-    pathTemplate: 'env/settings/smtp.yaml',
-    name: 'smtp',
-  })
-
   maps.set('AplUser', {
     kind: 'AplUser',
     envDir,

src/openapi/settings.yaml

@@ -378,41 +378,4 @@ Settings:
         platformAdmin: [read-any, update-any]
         teamAdmin: [read]
         teamMember: [read]
-    smtp:
-      title: SMTP
-      additionalProperties: false
-      nullable: true
-      properties:
-        auth_identity:
-          title: Authentication identity
-          type: string
-        auth_password:
-          title: Authentication password
-          type: string
-        auth_secret:
-          title: Authentication secret
-          type: string
-        auth_username:
-          title: Authentication username
-          type: string
-        from:
-          $ref: 'definitions.yaml#/email'
-          description: The from address. Defaults to alerts@$clusterDomain.
-          title: From address
-        hello:
-          description: The hostname to identify to the SMTP server.
-          title: Hello
-          type: string
-        smarthost:
-          description: The smtp host:port combination.
-          pattern: ^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]):()([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])$
-          type: string
-          title: Smart Host
-      required:
-        - smarthost
-      type: object
-      x-acl:
-        platformAdmin: [read-any, update-any]
-        teamAdmin: []
-        teamMember: []
   type: object

src/openapi/settingsinfo.yaml

@@ -59,10 +59,6 @@ SettingsInfo:
             branch:
               type: string
               description: The branch to use in the Git repository.
-    smtp:
-      properties:
-        smarthost:
-          type: string
     ingressClassNames:
       description: Ingress class names that are used by the cluster.
       items:

src/otomi-models.ts

@@ -71,7 +71,6 @@ export type Alerts = Settings['alerts']
 export type Cluster = Settings['cluster']
 export type Dns = Settings['dns']
 export type Ingress = Settings['ingress']
-export type Smtp = Settings['smtp']
 export type Kms = Settings['kms']
 export type Oidc = Settings['oidc']
 export type Otomi = Settings['otomi']
@@ -112,7 +111,6 @@ export const APL_KINDS = [
   'AplKms',
   'AplIdentityProvider',
   'AplCapabilitySet',
-  'AplSmtp',
   'AplBackupCollection',
   'AplUser',
   'AplPlatformSettingSet',
@@ -305,7 +303,6 @@ export interface Repo {
   oidc: Oidc
   otomi: Otomi
   platformBackups: Record<string, any>
-  smtp: Smtp
   users: User[]
   versions: Versions
   teamConfig: Record<string, TeamConfig>

src/otomi-stack.ts

@@ -1,4 +1,4 @@
-import { CoreV1Api, KubeConfig, User as k8sUser, V1ObjectReference } from '@kubernetes/client-node'
+import { CoreV1Api, User as k8sUser, KubeConfig, V1ObjectReference } from '@kubernetes/client-node'
 import Debug from 'debug'
 
 import { getRegions, ObjectStorageKeyRegions, Region, ResourcePage } from '@linode/api-v4'
@@ -123,6 +123,7 @@ import {
   getTeamSecretsFromK8s,
   watchPodUntilRunning,
 } from './k8s_operations'
+import CloudTty from './tty'
 import {
   getGiteaRepoUrls,
   getPrivateRepoBranches,
@@ -143,7 +144,6 @@ import {
   sparseCloneChart,
   validateGitUrl,
 } from './utils/workloadUtils'
-import CloudTty from './tty'
 
 interface ExcludedApp extends App {
   managed: boolean
@@ -318,7 +318,7 @@ export default class OtomiStack {
   }
 
   getSettingsInfo(): SettingsInfo {
-    const settings = this.getSettings(['cluster', 'dns', 'otomi', 'smtp', 'ingress'])
+    const settings = this.getSettings(['cluster', 'dns', 'otomi', 'ingress'])
     const otomiInfo = pick(settings.otomi, [
       'hasExternalDNS',
       'hasExternalIDP',
@@ -334,7 +334,6 @@ export default class OtomiStack {
       cluster: pick(settings.cluster, ['name', 'domainSuffix', 'apiServer', 'provider', 'linode']),
       dns: pick(settings.dns, ['zones']),
       otomi: otomiInfo,
-      smtp: pick(settings.smtp, ['smarthost']),
       ingressClassNames: map(settings.ingress?.classes, 'className') ?? [],
     } as SettingsInfo
   }
@@ -2694,7 +2693,6 @@ export default class OtomiStack {
     const settingsPrefixMap: Record<string, string> = {
       AplDns: 'dns.',
       AplKms: 'kms.',
-      AplSmtp: 'smtp.',
       AplIdentityProvider: 'oidc.',
       AplCapabilitySet: 'otomi.',
       AplAlertSet: 'alerts.',

test/env/settings.yaml

@@ -53,10 +53,4 @@ otomi:
     isHomeMonitored: true
     isMultitenant: true
     version: latest
-smtp:
-    auth_password: somesecretvalue
-    auth_identity: no-reply@doma.in
-    from: no-reply@doma.in
-    hello: doma.in
-    smarthost: smtp-relay.gmail.com:587
 version: 5