Fix Data Service email (#130)

bcgov · Mar 28, 2024 · f935bb3 · f935bb3
1 parent 70e69d2
commit f935bb3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 3 deletions.
diff --git a/devops/kustomize/base/data-service/config-map.yaml b/devops/kustomize/base/data-service/config-map.yaml
@@ -15,6 +15,7 @@ metadata:
     created-by: jeremy.foster
 data:
   API_URL: http://api:8080
+  ENVIRONMENT: "DEV"
 ---
 kind: ConfigMap
 apiVersion: v1

diff --git a/devops/kustomize/base/data-service/cron-job.yaml b/devops/kustomize/base/data-service/cron-job.yaml
@@ -84,6 +84,12 @@ spec:
                       name: data-service
                       key: API_URL
 
+                - name: Service__Environment
+                  valueFrom:
+                    configMapKeyRef:
+                      name: data-service
+                      key: ENVIRONMENT
+
                 - name: ServiceNow__ApiUrl
                   valueFrom:
                     secretKeyRef:

diff --git a/devops/kustomize/overlays/dev/data-service/kustomization.yaml b/devops/kustomize/overlays/dev/data-service/kustomization.yaml
@@ -37,7 +37,10 @@ patches:
         value: https://ches-dev.api.gov.bc.ca/api/v1
       - op: replace
         path: /data/FROM
-        value: (DEV) Hosting Service Dashboard <[email protected]>
+        value: Hosting Service Dashboard <[email protected]>
       - op: replace
         path: /data/TO
         value: [email protected]
+      - op: replace
+        path: /data/ENVIRONMENT
+        value: DEV
diff --git a/devops/kustomize/overlays/prod/data-service/kustomization.yaml b/devops/kustomize/overlays/prod/data-service/kustomization.yaml
@@ -41,3 +41,6 @@ patches:
       - op: replace
         path: /data/TO
         value: [email protected],[email protected]
+      - op: replace
+        path: /data/ENVIRONMENT
+        value: PROD
diff --git a/devops/kustomize/overlays/test/data-service/kustomization.yaml b/devops/kustomize/overlays/test/data-service/kustomization.yaml
@@ -37,7 +37,10 @@ patches:
         value: https://ches-test.api.gov.bc.ca/api/v1
       - op: replace
         path: /data/FROM
-        value: (TEST) Hosting Service Dashboard <[email protected]>
+        value: Hosting Service Dashboard <[email protected]>
       - op: replace
         path: /data/TO
         value: [email protected],[email protected]
+      - op: replace
+        path: /data/ENVIRONMENT
+        value: TEST
diff --git a/src/data-service/Config/ServiceOptions.cs b/src/data-service/Config/ServiceOptions.cs
@@ -71,6 +71,11 @@ public class ServiceOptions
     /// </summary>
     public bool SendFailureEmail { get; set; } = true;
 
+    /// <summary>
+    /// get/set - Identify the environment this service is running in.
+    /// </summary>
+    public string Environment { get; set; } = "";
+
     /// <summary>
     /// get/set - Number of sequential failures that are allowed to occur before service stops (default = 3).
     /// </summary>

diff --git a/src/data-service/DataService.cs b/src/data-service/DataService.cs
@@ -166,7 +166,7 @@ public async Task RunAsync()
     /// <returns></returns>
     private async Task SendEmail(string subject, string body)
     {
-        var email = new EmailModel(this.ChesOptions.From, this.ChesOptions.OverrideTo.Split(","), subject, body);
+        var email = new EmailModel(this.ChesOptions.From, this.ChesOptions.OverrideTo.Split(","), $"{(!String.IsNullOrWhiteSpace(this.Options.Environment) ? $"({this.Options.Environment}) - " : "")}{subject}", body);
         await this.ChesService.SendEmailAsync(email);
     }