Merge pull request #826 from aws/dev

chore: release 1.20
aws · Apr 24, 2024 · 645648d · 645648d
2 parents 741dff6 + 5c97372
commit 645648d
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 79 deletions.
diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES
@@ -1,26 +1,26 @@
-** AWSSDK.EC2; version 3.7.214 -- https://www.nuget.org/packages/AWSSDK.EC2
-** AWSSDK.IdentityManagement; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.IdentityManagement
-** AWSSDK.CloudFormation; version 3.7.203.36 -- https://www.nuget.org/packages/AWSSDK.CloudFormation
-** AWSSDK.SecurityToken; version 3.7.201.38 -- https://www.nuget.org/packages/AWSSDK.SecurityToken
-** AWSSDK.SSO; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.SSO
-** AWSSDK.SSOOIDC; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.SSOOIDC
-** AWSSDK.CloudControlApi; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.CloudControlApi/
-** AWSSDK.CloudWatchEvents; version 3.7.201.12 -- https://www.nuget.org/packages/AWSSDK.CloudWatchEvents/
-** AWSSDK.EC2; version 3.7.214 -- https://www.nuget.org/packages/AWSSDK.EC2/
-** AWSSDK.Extensions.NETCore.Setup; version 3.7.7 -- https://www.nuget.org/packages/AWSSDK.Extensions.NETCore.Setup
-** AWSSDK.AppRunner; version 3.7.201.14 -- https://www.nuget.org/packages/AWSSDK.AppRunner/
-** AWSSDK.CloudFront; version 3.7.201.36 -- https://www.nuget.org/packages/AWSSDK.CloudFront/
-** AWSSDK.DynamoDBv2; version 3.7.201.13 -- https://www.nuget.org/packages/AWSSDK.DynamoDBv2/
-** AWSSDK.ECR; version 3.7.201.6 -- https://www.nuget.org/packages/AWSSDK.ECR
-** AWSSDK.ECS; version 3.7.201.12 -- https://www.nuget.org/packages/AWSSDK.ECS
-** AWSSDK.S3; version 3.7.203.17 -- https://www.nuget.org/packages/AWSSDK.S3/
-** AWSSDK.SimpleSystemsManagement; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.SimpleSystemsManagement/
-** AWSSDK.SimpleNotificationService; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/
-** AWSSDK.SQS; version 3.7.200.43 -- https://www.nuget.org/packages/AWSSDK.SQS/
-** AWSSDK.ElasticBeanstalk; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.ElasticBeanstalk
-** AWSSDK.ElasticLoadBalancingV2; version 3.7.201.27 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/
-** AWSSDK.Core; version 3.7.202.11 -- https://www.nuget.org/packages/AWSSDK.Core
-** AWSSDK.CloudWatchLogs; version 3.7.200.42 -- https://www.nuget.org/packages/AWSSDK.CloudWatchLogs
+** AWSSDK.EC2; version 3.7.323.1 -- https://www.nuget.org/packages/AWSSDK.EC2
+** AWSSDK.IdentityManagement; version 3.7.301.3 -- https://www.nuget.org/packages/AWSSDK.IdentityManagement
+** AWSSDK.CloudFormation; version 3.7.307.3 -- https://www.nuget.org/packages/AWSSDK.CloudFormation
+** AWSSDK.SecurityToken; version 3.7.300.78 -- https://www.nuget.org/packages/AWSSDK.SecurityToken
+** AWSSDK.SSO; version 3.7.300.77 -- https://www.nuget.org/packages/AWSSDK.SSO
+** AWSSDK.SSOOIDC; version 3.7.301.72 -- https://www.nuget.org/packages/AWSSDK.SSOOIDC
+** AWSSDK.CloudControlApi; version 3.7.300.77 -- https://www.nuget.org/packages/AWSSDK.CloudControlApi/
+** AWSSDK.CloudWatchEvents; version 3.7.300.77 -- https://www.nuget.org/packages/AWSSDK.CloudWatchEvents/
+** AWSSDK.EC2; version 3.7.323.1 -- https://www.nuget.org/packages/AWSSDK.EC2/
+** AWSSDK.Extensions.NETCore.Setup; version 3.7.300 -- https://www.nuget.org/packages/AWSSDK.Extensions.NETCore.Setup
+** AWSSDK.AppRunner; version 3.7.301.49 -- https://www.nuget.org/packages/AWSSDK.AppRunner/
+** AWSSDK.CloudFront; version 3.7.302.3 -- https://www.nuget.org/packages/AWSSDK.CloudFront/
+** AWSSDK.DynamoDBv2; version 3.7.302.18 -- https://www.nuget.org/packages/AWSSDK.DynamoDBv2/
+** AWSSDK.ECR; version 3.7.301.72 -- https://www.nuget.org/packages/AWSSDK.ECR
+** AWSSDK.ECS; version 3.7.305.39 -- https://www.nuget.org/packages/AWSSDK.ECS
+** AWSSDK.S3; version 3.7.307.18 -- https://www.nuget.org/packages/AWSSDK.S3/
+** AWSSDK.SimpleSystemsManagement; version 3.7.303.26 -- https://www.nuget.org/packages/AWSSDK.SimpleSystemsManagement/
+** AWSSDK.SimpleNotificationService; version 3.7.301.25 -- https://www.nuget.org/packages/AWSSDK.SimpleNotificationService/
+** AWSSDK.SQS; version 3.7.300.77 -- https://www.nuget.org/packages/AWSSDK.SQS/
+** AWSSDK.ElasticBeanstalk; version 3.7.300.77 -- https://www.nuget.org/packages/AWSSDK.ElasticBeanstalk
+** AWSSDK.ElasticLoadBalancingV2; version 3.7.302.33 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/
+** AWSSDK.Core; version 3.7.303.20 -- https://www.nuget.org/packages/AWSSDK.Core
+** AWSSDK.CloudWatchLogs; version 3.7.305.18 -- https://www.nuget.org/packages/AWSSDK.CloudWatchLogs
 ** Amazon.CDK.Lib; version 2.131.0 -- https://www.nuget.org/packages/Amazon.CDK.Lib/
 
 Apache License

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -65,4 +65,7 @@ markdown_extensions:
 
 plugins:
     - search
-    - awesome-pages
+    - awesome-pages
+
+extra_javascript:
+  - assets/js/beacon_scode.js
diff --git a/site/content/assets/js/beacon_scode.js b/site/content/assets/js/beacon_scode.js
@@ -0,0 +1,8 @@
+const cleanUrl = (url) => {
+  const { origin, pathname } = new URL(url);
+  return (origin + pathname).replace(new RegExp('/', 'g'), '|');
+};
+
+const assetUrl = cleanUrl(window.location.href);
+
+void fetch(`https://prod.us-west-2.tcx-beacon.docs.aws.dev/basic-beacon/${assetUrl}`);
diff --git a/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj b/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj
@@ -21,11 +21,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.203.36" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.201.38" />
-    <PackageReference Include="AWSSDK.SSO" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.200.42" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.301.3" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.307.3" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.78" />
+    <PackageReference Include="AWSSDK.SSO" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.301.72" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />

diff --git a/src/AWS.Deploy.CLI/App.cs b/src/AWS.Deploy.CLI/App.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.CommandLine;
-using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
@@ -48,29 +47,50 @@ public async Task<int> Run(string[] args)
         private static void SetExecutionEnvironment(string[] args)
         {
             const string envName = "AWS_EXECUTION_ENV";
-            const string awsDotnetDeployCLI = "aws-dotnet-deploy-cli";
 
-            var assemblyVersion = typeof(Program).Assembly
-                .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
-                .FirstOrDefault()
-                as AssemblyInformationalVersionAttribute;
+            var toolVersion = GetToolVersion();
+
+            // The leading and trailing whitespaces are intentional
+            var userAgent = $" lib/aws-dotnet-deploy-cli#{toolVersion} ";
+            if (args?.Length > 0)
+            {
+                // The trailing whitespace is intentional
+                userAgent = $"{userAgent}md/cli-args#{args[0]} ";
+            }
+
 
             var envValue = new StringBuilder();
+            var existingValue = Environment.GetEnvironmentVariable(envName);
 
             // If there is an existing execution environment variable add this tool as a suffix.
-            if(!string.IsNullOrEmpty(Environment.GetEnvironmentVariable(envName)))
+            if (!string.IsNullOrEmpty(existingValue))
             {
-                envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
+                envValue.Append(existingValue);
             }
 
-            envValue.Append($"{awsDotnetDeployCLI}_{assemblyVersion?.InformationalVersion}");
+            envValue.Append(userAgent);
 
-            if (args?.Length > 0)
+            Environment.SetEnvironmentVariable(envName, envValue.ToString());
+        }
+
+        private static string GetToolVersion()
+        {
+            var assembly = typeof(App).GetTypeInfo().Assembly;
+            var version = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version;
+            if (version is null)
             {
-                envValue.Append($"_{args[0]}");
+                return string.Empty;
             }
 
-            Environment.SetEnvironmentVariable(envName, envValue.ToString());
+            var versionParts = version.Split('.');
+            if (versionParts.Length == 4)
+            {
+                // The revision part of the version number is intentionally set to 0 since package versioning on
+                // NuGet follows semantic versioning consisting only of Major.Minor.Patch versions.
+                versionParts[3] = "0";
+            }
+
+            return string.Join(".", versionParts);
         }
     }
 }
diff --git a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj
@@ -8,25 +8,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudControlApi" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.201.12" />
-    <PackageReference Include="AWSSDK.EC2" Version="3.7.214" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.7" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.201.38" />
-    <PackageReference Include="AWSSDK.AppRunner" Version="3.7.201.14" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.203.36" />
-    <PackageReference Include="AWSSDK.CloudFront" Version="3.7.201.36" />
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
-    <PackageReference Include="AWSSDK.ECR" Version="3.7.201.6" />
-    <PackageReference Include="AWSSDK.ECS" Version="3.7.201.12" />
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.203.17" />
-    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.200.43" />
+    <PackageReference Include="AWSSDK.CloudControlApi" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.EC2" Version="3.7.323.1" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.300" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.78" />
+    <PackageReference Include="AWSSDK.AppRunner" Version="3.7.301.49" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.307.3" />
+    <PackageReference Include="AWSSDK.CloudFront" Version="3.7.302.3" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.302.18" />
+    <PackageReference Include="AWSSDK.ECR" Version="3.7.301.72" />
+    <PackageReference Include="AWSSDK.ECS" Version="3.7.305.39" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.301.3" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.307.18" />
+    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.303.26" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301.25" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.300.77" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.ElasticLoadBalancingV2" Version="3.7.201.27" />
+    <PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.ElasticLoadBalancingV2" Version="3.7.302.33" />
   </ItemGroup>
 
   <Import Project="..\AWS.Deploy.Constants\AWS.Deploy.Constants.projitems" Label="Shared" />

diff --git a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj
@@ -12,22 +12,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudControlApi" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.201.13" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.200.43" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.201.12" />
-    <PackageReference Include="AWSSDK.CloudFront" Version="3.7.201.36" />
-    <PackageReference Include="AWSSDK.EC2" Version="3.7.214" />
-    <PackageReference Include="AWSSDK.ECR" Version="3.7.201.6" />
-    <PackageReference Include="AWSSDK.ECS" Version="3.7.201.12" />
-    <PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.ElasticLoadBalancingV2" Version="3.7.201.27" />
-    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.203.36" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.203.17" />
-    <PackageReference Include="AWSSDK.AppRunner" Version="3.7.201.14" />
-    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.200.42" />
+    <PackageReference Include="AWSSDK.CloudControlApi" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.302.18" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.301.25" />
+    <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.CloudFront" Version="3.7.302.3" />
+    <PackageReference Include="AWSSDK.EC2" Version="3.7.323.1" />
+    <PackageReference Include="AWSSDK.ECR" Version="3.7.301.72" />
+    <PackageReference Include="AWSSDK.ECS" Version="3.7.305.39" />
+    <PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.300.77" />
+    <PackageReference Include="AWSSDK.ElasticLoadBalancingV2" Version="3.7.302.33" />
+    <PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.301.3" />
+    <PackageReference Include="AWSSDK.CloudFormation" Version="3.7.307.3" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.307.18" />
+    <PackageReference Include="AWSSDK.AppRunner" Version="3.7.301.49" />
+    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.303.26" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.TemplateEngine.IDE" Version="5.0.1" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="5.0.1" />

diff --git a/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj b/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.7.202.11" />
+    <PackageReference Include="AWSSDK.Core" Version="3.7.303.20" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.22" />
     <!-- We are pining Newtonsoft.Json to 13.0.1 to maintain compatibility with the VS Toolkit. 
     https://devblogs.microsoft.com/visualstudio/using-newtonsoft-json-in-a-visual-studio-extension/-->

diff --git a/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj b/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.200.42" />
-    <PackageReference Include="AWSSDK.ECS" Version="3.7.201.12" />
+    <PackageReference Include="AWSSDK.CloudWatchLogs" Version="3.7.305.18" />
+    <PackageReference Include="AWSSDK.ECS" Version="3.7.305.39" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.19",
+  "version": "1.20",
   "publicReleaseRefSpec": [
     ".*"
   ],