Skip to content

Commit

Permalink
Remove ARM REST API mitigate code (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
shibayan committed Jul 3, 2023
1 parent 828469c commit 6ad7477
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 39 deletions.
39 changes: 36 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore

# User-specific files
*.rsuser
Expand Down Expand Up @@ -90,6 +90,7 @@ StyleCopReport.xml
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
Expand Down Expand Up @@ -293,6 +294,17 @@ node_modules/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp

# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp

# Visual Studio 6 technical files
*.ncb
*.aps

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand Down Expand Up @@ -349,6 +361,9 @@ ASALocalRun/
# Local History for Visual Studio
.localhistory/

# Visual Studio History (VSHistory) files
.vshistory/

# BeatPulse healthcheck temp database
healthchecksdb

Expand All @@ -361,5 +376,23 @@ MigrationBackup/
# Fody - auto-generated XML schema
FodyWeavers.xsd

# Azure Resource Manager dependency files
ServiceDependencies/
# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
*.sln.iml
7 changes: 6 additions & 1 deletion AppService.Acmebot/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,9 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc

# Service dependencies
Properties/serviceDependencies.json
Properties/serviceDependencies.*.json
Properties/ServiceDependencies/
4 changes: 2 additions & 2 deletions AppService.Acmebot/AppService.Acmebot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<PackageReference Include="Azure.Identity" Version="1.9.0" />
<PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2" />
<PackageReference Include="Azure.ResourceManager.Dns" Version="1.0.1" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.4.0" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.6.0" />
<PackageReference Include="DnsClient" Version="1.7.0" />
<PackageReference Include="DurableTask.TypedProxy" Version="2.2.2" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.9.5" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.9.6" />
<PackageReference Include="Microsoft.Extensions.Http" Version="[6.0.*,7.0.0)" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
<PackageReference Include="WebJobs.Extensions.HttpApi" Version="2.0.3" />
Expand Down
28 changes: 0 additions & 28 deletions AppService.Acmebot/Internal/ArmSdkMitigatePolicy.cs

This file was deleted.

6 changes: 1 addition & 5 deletions AppService.Acmebot/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ public override void Configure(IFunctionsHostBuilder builder)
var environment = provider.GetRequiredService<AzureEnvironment>();
var credential = provider.GetRequiredService<TokenCredential>();
var armClientOptions = new ArmClientOptions { Environment = environment.ResourceManager };
armClientOptions.AddPolicy(new ArmSdkMitigatePolicy(), HttpPipelinePosition.PerRetry);
return new ArmClient(credential, options.Value.SubscriptionId, armClientOptions);
return new ArmClient(credential, options.Value.SubscriptionId, new ArmClientOptions { Environment = environment.ResourceManager });
});

builder.Services.AddSingleton<AcmeProtocolClientFactory>();
Expand Down

0 comments on commit 6ad7477

Please sign in to comment.