Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump HealthcareSharedPackageVersion from 1.1.9 to 1.2.2 #598

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Bump HealthcareSharedPackageVersion from 1.1.9 to 1.2.2 #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7feb900
Bump HealthcareSharedPackageVersion from 1.1.9 to 1.2.2
dependabot[bot] Mar 2, 2021
db243d7
Updates to standard packages.
brandonpollett Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<HealthcareSharedPackageVersion>1.1.9</HealthcareSharedPackageVersion>
<HealthcareSharedPackageVersion>1.2.2</HealthcareSharedPackageVersion>
<HighEntropyVA>true</HighEntropyVA>
<LangVersion>Latest</LangVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.Health.Dicom.Web/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.Azure.Services.AppAuthentication;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.AzureKeyVault;
using Microsoft.Health.Development.IdentityProvider;

namespace Microsoft.Health.Dicom.Web
{
Expand All @@ -30,7 +29,7 @@ public static void Main(string[] args)
builder.AddAzureKeyVault(keyVaultEndpoint, keyVaultClient, new DefaultKeyVaultSecretManager());
}

builder.AddDevelopmentAuthEnvironmentIfConfigured(builtConfig, "DicomServer");
builder.AddDevelopmentAuthEnvironmentIfConfigured(builtConfig);
})
.ConfigureKestrel(option => option.Limits.MaxRequestBodySize = int.MaxValue) // When hosted on Kestrel, it's allowed to upload >2GB file, set to 2GB by default
.UseStartup<Startup>()
Expand Down
5 changes: 2 additions & 3 deletions test/Microsoft.Health.Dicom.Web.Tests.E2E/Common/AuthenticationSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
// -------------------------------------------------------------------------------------------------
using System;
using Microsoft.Health.Development.IdentityProvider.Configuration;
using static Microsoft.Health.Dicom.Tests.Common.EnvironmentVariables;

namespace Microsoft.Health.Dicom.Web.Tests.E2E.Common
Expand All @@ -15,9 +14,9 @@ namespace Microsoft.Health.Dicom.Web.Tests.E2E.Common
/// </summary>
public static class AuthenticationSettings
{
public static string Scope => GetEnvironmentVariableWithDefault("security_scope", Provider.Audience);
public static string Scope => GetEnvironmentVariableWithDefault("security_scope", DevelopmentIdentityProviderConfiguration.Audience);

public static string Resource => GetEnvironmentVariableWithDefault("security_resource", Provider.Audience);
public static string Resource => GetEnvironmentVariableWithDefault("security_resource", DevelopmentIdentityProviderConfiguration.Audience);

public static Uri TokenUri => new Uri(GetEnvironmentVariableWithDefault("security_tokenUrl", "https://inprochost/connect/token"));

Expand Down
3 changes: 1 addition & 2 deletions test/Microsoft.Health.Dicom.Web.Tests.E2E/Common/InProcTestDicomWebServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.Health.Development.IdentityProvider;
using Microsoft.Health.Dicom.Web.Tests.E2E.Common;

namespace Microsoft.Health.Dicom.Web.Tests.E2E
Expand Down Expand Up @@ -47,7 +46,7 @@ public InProcTestDicomWebServer(Type startupType)
{
config.AddInMemoryCollection(authSettings);
var existingConfig = config.Build();
config.AddDevelopmentAuthEnvironmentIfConfigured(existingConfig, "DicomServer");
config.AddDevelopmentAuthEnvironmentIfConfigured(existingConfig);
if (string.Equals(existingConfig["DicomServer:Security:Enabled"], bool.TrueString, StringComparison.OrdinalIgnoreCase))
{
Environment.SetEnvironmentVariable("security_enabled", "true");
Expand Down