Merge pull request #181 from bcgov/2.3.13

Fix sass package, fix invalid DOM nesting issue, update version

Author: bcgov-brwang

.pipeline/lib/deploy.js

@@ -42,6 +42,17 @@ module.exports = (settings) => {
     )
   );
 
+  objects.push(
+    ...oc.processDeploymentTemplate(
+      `${templatesLocalBaseUrl}/configmaps/api-appsettings.yaml`,
+      {
+        param: {
+          ENV: phases[phase].phase,
+        },
+      }
+    )
+  );
+
   objects.push(
     ...oc.processDeploymentTemplate(
       `${templatesLocalBaseUrl}/api-deploy-config.yaml`,
@@ -56,6 +67,7 @@ module.exports = (settings) => {
           CPU_LIMIT: phases[phase].resources.api.cpu.limit,
           MEMORY_REQUEST: phases[phase].resources.api.memory.request,
           MEMORY_LIMIT: phases[phase].resources.api.memory.limit,
+          ENV: phases[phase].phase,
         },
       }
     )

api/.s2i/bin/run

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+echo "---> Overwriting appsettings.json ..."
+cp /opt/app-root/configmap/appsettings.json /opt/app-root/app/appsettings.json
+
+# Execute the default S2I script
+echo "---> Executing default s2i run script ..."
+source ${STI_SCRIPTS_PATH}/run

api/TransAction.API/.gitignore

@@ -345,3 +345,6 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
+
+# Override .s2i/bin
+!.s2i/bin

api/TransAction.API/TransAction.API.csproj

@@ -5,11 +5,11 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RepositoryUrl>https://github.com/bcgov/TransAction.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>2.3.12</Version>
+    <Version>2.3.13</Version>
     <Description>The API server for the TransAction System</Description>
     <Copyright>Copyright© 2012, Province of British Columbia.</Copyright>
-    <AssemblyVersion>2.3.12.0</AssemblyVersion>
-    <FileVersion>2.3.12.0</FileVersion>
+    <AssemblyVersion>2.3.13.0</AssemblyVersion>
+    <FileVersion>2.3.13.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

api/TransAction.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "Constants": {
-    "Version": "2.3.12"
+    "Version": "2.3.13"
   },
   "Serilog": {
     "MinimumLevel": {
@@ -9,7 +9,14 @@
         "Microsoft": "Warning"
       }
     },
-    "WriteTo": [{ "Name": "Console" }]
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ]
   },
   "AllowedHosts": "*",
   "CONNECTION_STRING": "Server=localhost;User Id=<userid>;Password=<password>;Database=TransAction;",

api/TransAction.Data/Models/TransActionContext.cs

@@ -1,17 +1,21 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using System.Linq;
 
 namespace TransAction.Data.Models
 {
     public partial class TransActionContext : DbContext
     {
+        private readonly ILogger<TransActionContext> _logger;
+
         public TransActionContext()
         {
         }
 
-        public TransActionContext(DbContextOptions<TransActionContext> options)
+        public TransActionContext(DbContextOptions<TransActionContext> options, ILogger<TransActionContext> logger)
             : base(options)
         {
+            _logger = logger;
         }
 
         public virtual DbSet<TraActivity> TraActivity { get; set; }

api/TransAction.Data/Models/TransActionContextExtension.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -62,7 +63,8 @@ public override int SaveChanges()
             {
                 if (!e.InnerException.Message.Contains(" Cannot insert duplicate key in object 'dbo.TRA_USER'."))
                 {
-                    Console.WriteLine(e);
+                    string exceptionMessage = e.ToString();
+                    _logger.LogError($"TransActionContext exception: {exceptionMessage}");
                     throw;
                 }
             }