Skip to content

Commit 5c20f1e

Browse files
premunpremun
authored
[Rollout] Production rollout 2024-12-16 (#4247)
2 parents ba658be + 3e003ab commit 5c20f1e

File tree

127 files changed

+1178
-746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1178
-746
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.24562.1",
6+
"version": "1.1.0-beta.24605.8",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.24562.1",
18+
"version": "1.1.0-beta.24605.8",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎Directory.Packages.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(AspNetCoreVersion)" />
9898
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
9999
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
100+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
100101
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
101102
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="3.0.1" />
102103
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
@@ -155,6 +156,7 @@
155156
https://dnceng.visualstudio.com/internal/_workitems/edit/5117 -->
156157
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.0" />
157158
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
159+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
158160
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
159161
<PackageVersion Include="TextCopy" Version="6.2.1" />
160162
<PackageVersion Include="Verify.NUnit" Version="19.6" />

‎arcade-services.sln‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.
8888
EndProject
8989
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Authentication", "src\Maestro\Maestro.Authentication\Maestro.Authentication.csproj", "{70D48B7A-DBFE-4762-A83F-4617ECF80838}"
9090
EndProject
91-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProductConstructionService.Client", "src\ProductConstructionService\ProductConstructionService.Client\ProductConstructionService.Client.csproj", "{964FA796-358E-48AE-B75C-E42132600BCC}"
92-
EndProject
9391
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maestro.Common", "src\Maestro\Maestro.Common\Maestro.Common.csproj", "{16F086DD-8387-44BB-87D5-CD804355A110}"
9492
EndProject
9593
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.
122120
EndProject
123121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProductConstructionService.BarViz", "src\ProductConstructionService\ProductConstructionService.BarViz\ProductConstructionService.BarViz.csproj", "{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}"
124122
EndProject
123+
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}"
124+
EndProject
125125
Global
126126
GlobalSection(SolutionConfigurationPlatforms) = preSolution
127127
Debug|Any CPU = Debug|Any CPU
@@ -505,18 +505,6 @@ Global
505505
{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x64.Build.0 = Release|Any CPU
506506
{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x86.ActiveCfg = Release|Any CPU
507507
{70D48B7A-DBFE-4762-A83F-4617ECF80838}.Release|x86.Build.0 = Release|Any CPU
508-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
509-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
510-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x64.ActiveCfg = Debug|Any CPU
511-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x64.Build.0 = Debug|Any CPU
512-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x86.ActiveCfg = Debug|Any CPU
513-
{964FA796-358E-48AE-B75C-E42132600BCC}.Debug|x86.Build.0 = Debug|Any CPU
514-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
515-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|Any CPU.Build.0 = Release|Any CPU
516-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x64.ActiveCfg = Release|Any CPU
517-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x64.Build.0 = Release|Any CPU
518-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x86.ActiveCfg = Release|Any CPU
519-
{964FA796-358E-48AE-B75C-E42132600BCC}.Release|x86.Build.0 = Release|Any CPU
520508
{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
521509
{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|Any CPU.Build.0 = Debug|Any CPU
522510
{16F086DD-8387-44BB-87D5-CD804355A110}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -709,6 +697,18 @@ Global
709697
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x64.Build.0 = Release|Any CPU
710698
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x86.ActiveCfg = Release|Any CPU
711699
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21}.Release|x86.Build.0 = Release|Any CPU
700+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
701+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
702+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x64.ActiveCfg = Debug|Any CPU
703+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x64.Build.0 = Debug|Any CPU
704+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x86.ActiveCfg = Debug|Any CPU
705+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Debug|x86.Build.0 = Debug|Any CPU
706+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
707+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|Any CPU.Build.0 = Release|Any CPU
708+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x64.ActiveCfg = Release|Any CPU
709+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x64.Build.0 = Release|Any CPU
710+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.ActiveCfg = Release|Any CPU
711+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE}.Release|x86.Build.0 = Release|Any CPU
712712
EndGlobalSection
713713
GlobalSection(SolutionProperties) = preSolution
714714
HideSolutionNode = FALSE
@@ -748,7 +748,6 @@ Global
748748
{243A4561-BF35-405A-AF12-AC57BB27796D} = {D4718FE8-B3EA-4543-A424-315E649A4F70}
749749
{BB8CC065-79D6-48CE-AD96-32EDDDC4D404} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
750750
{70D48B7A-DBFE-4762-A83F-4617ECF80838} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
751-
{964FA796-358E-48AE-B75C-E42132600BCC} = {243A4561-BF35-405A-AF12-AC57BB27796D}
752751
{16F086DD-8387-44BB-87D5-CD804355A110} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
753752
{C70CD49F-052C-472B-A420-4215B708C478} = {243A4561-BF35-405A-AF12-AC57BB27796D}
754753
{CAB42DEB-5D9D-42D6-BF4E-DAAD9C7B5C66} = {AE791E26-78E1-4936-BCF4-1BF5152CBBD6}
@@ -765,6 +764,7 @@ Global
765764
{12D91D30-EC50-4D2B-8D67-0C19FCD2303F} = {1A456CF0-C09A-4DE6-89CE-1110EED31180}
766765
{A4125B78-593D-4659-AA28-0E176D4644E5} = {243A4561-BF35-405A-AF12-AC57BB27796D}
767766
{B993607A-BD63-47A8-AF5D-7B49ACF0AF21} = {243A4561-BF35-405A-AF12-AC57BB27796D}
767+
{0F27CF0C-4C95-DB17-AF84-78197F32FEBE} = {243A4561-BF35-405A-AF12-AC57BB27796D}
768768
EndGlobalSection
769769
GlobalSection(ExtensibilityGlobals) = postSolution
770770
SolutionGuid = {32B9C883-432E-4FC8-A1BF-090EB033DD5B}

‎azure-pipelines-product-construction-service.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,23 @@ stages:
154154
devBranchSuffix: $(devBranchSuffix)
155155
dockerImageName: $(dockerRegistryUrl)/$(containerName)
156156

157-
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
157+
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal')) }}:
158+
- stage: Approval
159+
dependsOn:
160+
- Build
161+
jobs:
162+
- deployment: approval
163+
displayName: Deployment approval
164+
${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/production') }}:
165+
environment: Production
166+
${{ else }}:
167+
environment: Staging
168+
pool: server
169+
158170
- stage: DeployPCS
159171
dependsOn:
160172
- Build
173+
- Approval
161174
displayName: Deploy Product Construction Service
162175

163176
jobs:

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116116
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24562.1">
118+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24605.8">
119119
<Uri>https://github.com/dotnet/dnceng</Uri>
120-
<Sha>b61ece47324607e2ab69de0b6e8cf2d19cef2570</Sha>
120+
<Sha>54066b7abcc2b7ec05ade63be8d91c44fcfc1c9d</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24562.1">
122+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.24605.8">
123123
<Uri>https://github.com/dotnet/dnceng</Uri>
124-
<Sha>b61ece47324607e2ab69de0b6e8cf2d19cef2570</Sha>
124+
<Sha>54066b7abcc2b7ec05ade63be8d91c44fcfc1c9d</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24606.1</MicrosoftDotNetWebAuthenticationVersion>
3838
<ServiceFabricMocksVersion>1.1.0-beta.24606.1</ServiceFabricMocksVersion>
3939
<CoreHealthMonitorVersion>1.1.0-beta.24606.1</CoreHealthMonitorVersion>
40-
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24562.1</MicrosoftDncEngSecretManagerVersion>
41-
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24562.1</MicrosoftDncEngConfigurationBootstrapVersion>
40+
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24605.8</MicrosoftDncEngSecretManagerVersion>
41+
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24605.8</MicrosoftDncEngConfigurationBootstrapVersion>
4242
</PropertyGroup>
4343
<!--Package names-->
4444
<PropertyGroup>

‎eng/templates/jobs/e2e-pcs-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- group: Arcade-Services-Scenario-Tests
2323
- ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/production'), startsWith(variables['Build.SourceBranch'], 'refs/heads/production-'), eq(variables['Build.SourceBranch'], 'refs/heads/production'))) }}:
2424
- name: PcsTestEndpoint
25-
value: https://product-construction-int.delightfuldune-c0f01ab0.westus2.azurecontainerapps.io
25+
value: https://product-construction-int.agreeablesky-499be9de.westus2.azurecontainerapps.io
2626
- name: ScenarioTestSubscription
2727
value: "Darc: Maestro Staging"
2828
- name: MaestroAppId

‎eng/templates/stages/deploy.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ stages:
2020
${{ else }}:
2121
environment: Staging
2222
pool: server
23-
strategy:
24-
runOnce:
25-
deploy: {}
2623

2724
- stage: deploy
2825
displayName: Deploy

‎src/Maestro/Client/src/MaestroApiOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public partial class MaestroApiOptions
2323
public const string StagingMaestroUri = "https://maestro.int-dot.net/";
2424
public const string OldPcsStagingUri = "https://maestro-int.westus2.cloudapp.azure.com/";
2525
public const string PcsProdUri = "https://product-construction-prod.wittysky-0c79e3cc.westus2.azurecontainerapps.io/";
26-
public const string PcsStagingUri = "https://product-construction-int.delightfuldune-c0f01ab0.westus2.azurecontainerapps.io/";
26+
public const string PcsStagingUri = "https://product-construction-int.agreeablesky-499be9de.westus2.azurecontainerapps.io/";
2727
public const string PcsLocalUri = "https://localhost:53180/";
2828

2929
private const string APP_USER_SCOPE = "Maestro.User";

‎src/Maestro/SubscriptionActorService/Program.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using Microsoft.Extensions.DependencyInjection.Extensions;
1818
using Microsoft.Extensions.Logging;
1919
using Octokit;
20-
using ProductConstructionService.Client;
2120

2221
namespace SubscriptionActorService;
2322

@@ -74,19 +73,6 @@ public static void Configure(IServiceCollection services)
7473
});
7574
services.Configure<GitHubTokenProviderOptions>("GitHub", (o, s) => s.Bind(o));
7675
services.Configure<AzureDevOpsTokenProviderOptions>("AzureDevOps", (o, s) => s.Bind(o));
77-
services.AddSingleton<IProductConstructionServiceApi>(s =>
78-
{
79-
var config = s.GetRequiredService<IConfiguration>();
80-
var uri = config["ProductConstructionService:Uri"];
81-
82-
var noAuth = config.GetValue<bool>("ProductConstructionService:NoAuth");
83-
if (noAuth)
84-
{
85-
return PcsApiFactory.GetAnonymous(uri);
86-
}
87-
88-
return PcsApiFactory.GetAuthenticated(uri, managedIdentityId: "system", disableInteractiveAuth: true);
89-
});
9076

9177
services.AddMergePolicies();
9278
services.AddKustoClientProvider("Kusto");

0 commit comments

Comments
 (0)