[Rollout] Production rollout 2024-12-16 (#4247)

dotnet · Dec 13, 2024 · 5c20f1e · 5c20f1e
2 parents ba658be + 3e003ab
commit 5c20f1e
Show file tree

Hide file tree

Showing 127 changed files with 1,178 additions and 746 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.24562.1",
+      "version": "1.1.0-beta.24605.8",
       "commands": [
         "secret-manager"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dnceng.configuration.bootstrap": {
-      "version": "1.1.0-beta.24562.1",
+      "version": "1.1.0-beta.24605.8",
       "commands": [
         "bootstrap-dnceng-configuration"
       ]

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -97,6 +97,7 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="3.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
@@ -155,6 +156,7 @@
          https://dnceng.visualstudio.com/internal/_workitems/edit/5117 -->
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.0" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="TextCopy" Version="6.2.1" />
     <PackageVersion Include="Verify.NUnit" Version="19.6" />

diff --git a/arcade-services.sln b/arcade-services.sln
@@ -88,8 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Authentication", "src\Maestro\Maestro.Authentication\Maestro.Authentication.csproj", "{70D48B7A-DBFE-4762-A83F-4617ECF80838}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.Client", "src\ProductConstructionService\ProductConstructionService.Client\ProductConstructionService.Client.csproj", "{964FA796-358E-48AE-B75C-E42132600BCC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Common", "src\Maestro\Maestro.Common\Maestro.Common.csproj", "{16F086DD-8387-44BB-87D5-CD804355A110}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.SubscriptionTriggerer", "src\ProductConstructionService\ProductConstructionService.SubscriptionTriggerer\ProductConstructionService.SubscriptionTriggerer.csproj", "{C70CD49F-052C-472B-A420-4215B708C478}"
@@ -122,6 +120,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.BarViz", "src\ProductConstructionService\ProductConstructionService.BarViz\ProductConstructionService.BarViz.csproj", "{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProductConstructionService.Client", "src\ProductConstructionService\Microsoft.DotNet.ProductConstructionService.Client\Microsoft.DotNet.ProductConstructionService.Client.csproj", "{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -505,18 +505,6 @@ Global
 		{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x64.Build.0 = Release|Any CPU
 		{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x86.ActiveCfg = Release|Any CPU
 		{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x86.Build.0 = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x64.Build.0 = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x86.Build.0 = Debug|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x64.ActiveCfg = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x64.Build.0 = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x86.ActiveCfg = Release|Any CPU
-		{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x86.Build.0 = Release|Any CPU
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -709,6 +697,18 @@ Global
 		{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x64.Build.0 = Release|Any CPU
 		{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x86.ActiveCfg = Release|Any CPU
 		{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x86.Build.0 = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x64.Build.0 = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x86.Build.0 = Debug|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x64.ActiveCfg = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x64.Build.0 = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.ActiveCfg = Release|Any CPU
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -748,7 +748,6 @@ Global
 		{243A4561-BF35-405A-AF12-AC57BB27796D} = {D4718FE8-B3EA-4543-A424-315E649A4F70}
 		{BB8CC065-79D6-48CE-AD96-32EDDDC4D404} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
 		{70D48B7A-DBFE-4762-A83F-4617ECF80838} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
-		{964FA796-358E-48AE-B75C-E42132600BCC} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 		{16F086DD-8387-44BB-87D5-CD804355A110} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
 		{C70CD49F-052C-472B-A420-4215B708C478} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 		{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
@@ -765,6 +764,7 @@ Global
 		{12D91D30-EC50-4D2B-8D67-0C19FCD2303F} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
 		{A4125B78-593D-4659-AA28-0E176D4644E5} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 		{B993607A-BD63-47A8-AF5D-7B49ACF0AF21} = {243A4561-BF35-405A-AF12-AC57BB27796D}
+		{0F27CF0C-4C95-DB17-AF84-78197F32FEBE} = {243A4561-BF35-405A-AF12-AC57BB27796D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

diff --git a/azure-pipelines-product-construction-service.yml b/azure-pipelines-product-construction-service.yml
@@ -154,10 +154,23 @@ stages:
         devBranchSuffix: $(devBranchSuffix)
         dockerImageName: $(dockerRegistryUrl)/$(containerName)
 
-- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
+- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}:
+  - stage: Approval
+    dependsOn:
+    - Build
+    jobs:
+    - deployment: approval
+      displayName: Deployment approval
+      ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/production') }}:
+        environment: Production
+      ${{ else }}:
+        environment: Staging
+      pool: server
+
   - stage: DeployPCS
     dependsOn:
     - Build
+    - Approval
     displayName: Deploy Product Construction Service
 
     jobs:

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -115,13 +115,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24562.1">
+    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24605.8">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>b61ece47324607e2ab69de0b6e8cf2d19cef2570</Sha>
+      <Sha>54066b7abcc2b7ec05ade63be8d91c44fcfc1c9d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24562.1">
+    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24605.8">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>b61ece47324607e2ab69de0b6e8cf2d19cef2570</Sha>
+      <Sha>54066b7abcc2b7ec05ade63be8d91c44fcfc1c9d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -37,8 +37,8 @@
     <MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24606.1</MicrosoftDotNetWebAuthenticationVersion>
     <ServiceFabricMocksVersion>1.1.0-beta.24606.1</ServiceFabricMocksVersion>
     <CoreHealthMonitorVersion>1.1.0-beta.24606.1</CoreHealthMonitorVersion>
-    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24562.1</MicrosoftDncEngSecretManagerVersion>
-    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24562.1</MicrosoftDncEngConfigurationBootstrapVersion>
+    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24605.8</MicrosoftDncEngSecretManagerVersion>
+    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24605.8</MicrosoftDncEngConfigurationBootstrapVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>

diff --git a/eng/templates/jobs/e2e-pcs-tests.yml b/eng/templates/jobs/e2e-pcs-tests.yml
@@ -22,7 +22,7 @@ jobs:
     - group: Arcade-Services-Scenario-Tests
     - ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/production'), startsWith(variables['Build.SourceBranch'], 'refs/heads/production-'), eq(variables['Build.SourceBranch'], 'refs/heads/production'))) }}:
       - name: PcsTestEndpoint
-        value: https://product-construction-int.delightfuldune-c0f01ab0.westus2.azurecontainerapps.io
+        value: https://product-construction-int.agreeablesky-499be9de.westus2.azurecontainerapps.io
       - name: ScenarioTestSubscription
         value: "Darc: Maestro Staging"
       - name: MaestroAppId

diff --git a/eng/templates/stages/deploy.yaml b/eng/templates/stages/deploy.yaml
@@ -20,9 +20,6 @@ stages:
     ${{ else }}:
       environment: Staging
     pool: server
-    strategy:
-      runOnce:
-        deploy: {}
 
 - stage: deploy
   displayName: Deploy

diff --git a/src/Maestro/Client/src/MaestroApiOptions.cs b/src/Maestro/Client/src/MaestroApiOptions.cs
@@ -23,7 +23,7 @@ public partial class MaestroApiOptions
         public const string StagingMaestroUri = "https://maestro.int-dot.net/";
         public const string OldPcsStagingUri = "https://maestro-int.westus2.cloudapp.azure.com/";
         public const string PcsProdUri = "https://product-construction-prod.wittysky-0c79e3cc.westus2.azurecontainerapps.io/";
-        public const string PcsStagingUri = "https://product-construction-int.delightfuldune-c0f01ab0.westus2.azurecontainerapps.io/";
+        public const string PcsStagingUri = "https://product-construction-int.agreeablesky-499be9de.westus2.azurecontainerapps.io/";
         public const string PcsLocalUri = "https://localhost:53180/";
 
         private const string APP_USER_SCOPE = "Maestro.User";

diff --git a/src/Maestro/SubscriptionActorService/Program.cs b/src/Maestro/SubscriptionActorService/Program.cs
@@ -17,7 +17,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Octokit;
-using ProductConstructionService.Client;
 
 namespace SubscriptionActorService;
 
@@ -74,19 +73,6 @@ public static void Configure(IServiceCollection services)
         });
         services.Configure<GitHubTokenProviderOptions>("GitHub", (o, s) => s.Bind(o));
         services.Configure<AzureDevOpsTokenProviderOptions>("AzureDevOps", (o, s) => s.Bind(o));
-        services.AddSingleton<IProductConstructionServiceApi>(s =>
-        {
-            var config = s.GetRequiredService<IConfiguration>();
-            var uri = config["ProductConstructionService:Uri"];
-
-            var noAuth = config.GetValue<bool>("ProductConstructionService:NoAuth");
-            if (noAuth)
-            {
-                return PcsApiFactory.GetAnonymous(uri);
-            }
-
-            return PcsApiFactory.GetAuthenticated(uri, managedIdentityId: "system", disableInteractiveAuth: true);
-        });
 
         services.AddMergePolicies();
         services.AddKustoClientProvider("Kusto");

diff --git a/src/Maestro/SubscriptionActorService/SubscriptionActorService.csproj b/src/Maestro/SubscriptionActorService/SubscriptionActorService.csproj
@@ -34,7 +34,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.DotNet.Darc\DarcLib\Microsoft.DotNet.DarcLib.csproj" />
-    <ProjectReference Include="..\..\ProductConstructionService\ProductConstructionService.Client\ProductConstructionService.Client.csproj" />
     <ProjectReference Include="..\Client\src\Microsoft.DotNet.Maestro.Client.csproj" />
     <ProjectReference Include="..\Maestro.Common\Maestro.Common.csproj" />
     <ProjectReference Include="..\Maestro.Contracts\Maestro.Contracts.csproj" />

diff --git a/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/InitializeOperation.cs b/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/InitializeOperation.cs
@@ -40,7 +40,6 @@ await _vmrInitializer.InitializeRepository(
             _options.Recursive,
             new NativePath(_options.SourceMappings),
             additionalRemotes,
-            _options.ComponentTemplate,
             _options.TpnTemplate,
             _options.GenerateCodeowners,
             _options.GenerateCredScanSuppressions,

diff --git a/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/UpdateOperation.cs b/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/UpdateOperation.cs
@@ -40,7 +40,6 @@ await _vmrUpdater.UpdateRepository(
             barId: null,
             _options.Recursive,
             additionalRemotes,
-            _options.ComponentTemplate,
             _options.TpnTemplate,
             _options.GenerateCodeowners,
             _options.GenerateCredScanSuppressions,

diff --git a/src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/VmrSyncCommandLineOptions.cs b/src/Microsoft.DotNet.Darc/Darc/Options/VirtualMonoRepo/VmrSyncCommandLineOptions.cs
@@ -20,9 +20,6 @@ internal abstract class VmrSyncCommandLineOptions<T> : VmrCommandLineOptions<T>,
         "Omitting REVISION will synchronize the repo to current HEAD.")]
     public IEnumerable<string> Repositories { get; set; }
 
-    [Option("component-template", Required = false, HelpText = "Path to a template for generating VMRs Component.md file. Leave empty to skip generation.")]
-    public string ComponentTemplate { get; set; }
-
     [Option("tpn-template", Required = false, HelpText = "Path to a template for generating VMRs THIRD-PARTY-NOTICES file. Leave empty to skip generation.")]
     public string TpnTemplate { get; set; }
 

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/ComponentListGenerator.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/ComponentListGenerator.cs
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrInitializer.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrInitializer.cs
@@ -20,7 +20,6 @@ public interface IVmrInitializer
     /// <param name="initializeDependencies">When true, initializes dependencies (from Version.Details.xml) recursively</param>
     /// <param name="sourceMappingsPath">Path to the source-mappings.json file</param>
     /// <param name="additionalRemotes">Additional git remotes to use when fetching</param>
-    /// <param name="componentTemplatePath">Path to VMR's README.md template</param>
     /// <param name="tpnTemplatePath">Path to VMR's THIRD-PARTY-NOTICES.md template</param>
     /// <param name="generateCodeowners">Whether to generate a CODEOWNERS file</param>
     /// <param name="generateCredScanSuppressions">Whether to generate a .config/CredScanSuppressions.json file</param>
@@ -33,7 +32,6 @@ Task InitializeRepository(
         bool initializeDependencies,
         LocalPath sourceMappingsPath,
         IReadOnlyCollection<AdditionalRemote> additionalRemotes,
-        string? componentTemplatePath,
         string? tpnTemplatePath,
         bool generateCodeowners,
         bool generateCredScanSuppressions,

diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrUpdater.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/IVmrUpdater.cs
@@ -20,7 +20,6 @@ public interface IVmrUpdater
     /// <param name="barId">Bar id of the build that's being flown, if applicable</param>
     /// <param name="updateDependencies">When true, updates dependencies (from Version.Details.xml) recursively</param>
     /// <param name="additionalRemotes">Additional git remotes to use when fetching</param>
-    /// <param name="componentTemplatePath">Path to VMR's Component.md template</param>
     /// <param name="tpnTemplatePath">Path to VMR's THIRD-PARTY-NOTICES.md template</param>
     /// <param name="generateCodeowners">Whether to generate a CODEOWNERS file</param>
     /// <param name="generateCredScanSuppressions">Whether to generate a .config/CredScanSuppressions.json file</param>
@@ -36,7 +35,6 @@ Task<bool> UpdateRepository(
         int? barId,
         bool updateDependencies,
         IReadOnlyCollection<AdditionalRemote> additionalRemotes,
-        string? componentTemplatePath,
         string? tpnTemplatePath,
         bool generateCodeowners,
         bool generateCredScanSuppressions,