Merge pull request #779 from aws/dev

chore: release 1.14

Author: philasmar

src/AWS.Deploy.Common/Exceptions.cs

@@ -126,7 +126,8 @@ public enum DeployToolErrorCode
         FailedToReadCdkBootstrapVersion = 10010400,
         UnsupportedOptionSettingType = 10010500,
         FailedToSaveDeploymentSettings = 10010600,
-        InvalidWindowsManifestFile = 10010700
+        InvalidWindowsManifestFile = 10010700,
+        UserDeploymentFileNotFound = 10010800,
     }
 
     public class ProjectFileNotFoundException : DeployToolException

src/AWS.Deploy.Orchestration/DeploymentSettingsHandler.cs

@@ -52,15 +52,22 @@ public DeploymentSettingsHandler(IFileManager fileManager, IDirectoryManager dir
 
         public async Task<DeploymentSettings?> ReadSettings(string filePath)
         {
-            try
-            {
-                var contents = await _fileManager.ReadAllTextAsync(filePath);
-                var userDeploymentSettings = JsonConvert.DeserializeObject<DeploymentSettings>(contents);
-                return userDeploymentSettings;
+            if (_fileManager.Exists(filePath))
+            {
+                try
+                {
+                    var contents = await _fileManager.ReadAllTextAsync(filePath);
+                    var userDeploymentSettings = JsonConvert.DeserializeObject<DeploymentSettings>(contents);
+                    return userDeploymentSettings;
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidDeploymentSettingsException(DeployToolErrorCode.FailedToDeserializeUserDeploymentFile, $"An error occurred while trying to deserialize the deployment settings file located at {filePath}.\n  {ex.Message}", ex);
+                }
             }
-            catch (Exception ex)
-            {
-                throw new InvalidDeploymentSettingsException(DeployToolErrorCode.FailedToDeserializeUserDeploymentFile, $"An error occured while trying to deserialize the deployment settings file located at {filePath}", ex);
+            else
+            {
+                throw new InvalidDeploymentSettingsException(DeployToolErrorCode.UserDeploymentFileNotFound, $"The deployment settings file located at {filePath} doesn't exist.");
             }
         }
 

test/AWS.Deploy.CLI.Common.UnitTests/ConfigFileDeployment/DeploymentSettingsHandlerTests.cs

@@ -246,6 +246,38 @@ public async Task SaveSettings_PushImageToECR()
             Assert.Equal(expectedSnapshot, actualSnapshot);
         }
 
+        [Fact]
+        public async Task ReadSettings_InvalidJson()
+        {
+            // ARRANGE
+            var recommendations = await _recommendationEngine.ComputeRecommendations();
+            var selectedRecommendation = recommendations.FirstOrDefault(x => string.Equals(x.Recipe.Id, "AspNetAppAppRunner"));
+            var filePath = Path.Combine("ConfigFileDeployment", "TestFiles", "InvalidConfigFile.json");
+
+            // ACT
+            var readAction = async () => await _deploymentSettingsHandler.ReadSettings(filePath);
+
+            // ASSERT
+            var ex = await Assert.ThrowsAsync<InvalidDeploymentSettingsException>(readAction);
+            Assert.Equal(DeployToolErrorCode.FailedToDeserializeUserDeploymentFile, ex.ErrorCode);
+        }
+
+        [Fact]
+        public async Task ReadSettings_FileNotFound()
+        {
+            // ARRANGE
+            var recommendations = await _recommendationEngine.ComputeRecommendations();
+            var selectedRecommendation = recommendations.FirstOrDefault(x => string.Equals(x.Recipe.Id, "AspNetAppAppRunner"));
+            var filePath = Path.Combine("ConfigFileDeployment", "TestFiles", "AppRunnerConfigFile");
+
+            // ACT
+            var readAction = async () => await _deploymentSettingsHandler.ReadSettings(filePath);
+
+            // ASSERT
+            var ex = await Assert.ThrowsAsync<InvalidDeploymentSettingsException>(readAction);
+            Assert.Equal(DeployToolErrorCode.UserDeploymentFileNotFound, ex.ErrorCode);
+        }
+
         private object GetOptionSettingValue(Recommendation recommendation, string fullyQualifiedId)
         {
             var optionSetting = _optionSettingHandler.GetOptionSetting(recommendation, fullyQualifiedId);

test/AWS.Deploy.CLI.Common.UnitTests/ConfigFileDeployment/TestFiles/InvalidConfigFile.json

@@ -0,0 +1,12 @@
+{
+  "AWSProfile": "default",
+  "AWSRegion": "us-west-2",
+  "RecipeId": "PushContainerImageEcr"
+  "Settings": {
+    "ImageTag": 123456789,
+    "DockerBuildArgs": "",
+    "DockerfilePath": "DockerAssets/Dockerfile",
+    "DockerExecutionDirectory": "DockerAssets",
+    "ECRRepositoryName": "my-ecr-repository"
+  }
+}

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.13",
+  "version": "1.14",
   "publicReleaseRefSpec": [
     ".*"
   ],