Skip to content

Commit 1897a49

Browse files
nvmLantananvmLantana
authored
Merge branch 'dev' into nvm/LNK-4374_CensusManagerQueries
2 parents 7921735 + e72874a commit 1897a49

45 files changed

Lines changed: 188 additions & 417 deletions

Some content is hidden

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

‎.github/workflows/pr-title-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
core.setFailed('Cannot determine PR title for validation.')
3232
}
3333
const prTitleExpectedPattern = /(^LNK-\d+:\s)|(^TECH_DEBT:\s)|(^DOCS:\s)/g
34-
const prTitleMismatchError = 'Invalid PR title! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title'
34+
const prTitleMismatchError = 'Invalid PR title "' + prTitle + '"! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title'
3535
if (!prTitleExpectedPattern.test(prTitle)) {
3636
// Fail the workflow
3737
console.log(prTitleMismatchError)

‎Azure_Pipelines/azure-pipelines.db-schema-creation.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,26 @@ stages:
248248
publishLocation: 'container'
249249
displayName: Generate Tenant SQL Script
250250
###
251+
# Submission
252+
- job: Submission
253+
displayName: "Generate Submission Schema Script"
254+
steps:
255+
- task: DotNetCoreCLI@2
256+
displayName: Install dotnet-ef
257+
inputs:
258+
command: 'custom'
259+
custom: 'tool'
260+
arguments: 'install --global dotnet-ef'
261+
- script: |
262+
dotnet ef migrations script --idempotent --verbose -c SubmissionContext -s $(build.sourcesdirectory)/DotNet/Submission/Submission.csproj -p $(build.sourcesdirectory)/DotNet/Submission.Data/Submission.Data.csproj -o $(build.artifactstagingdirectory)/DatabaseScripts/submissionDb.sql
263+
displayName: Generate Submission SQL Script
264+
- task: PublishBuildArtifacts@1
265+
inputs:
266+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
267+
ArtifactName: 'scripts'
268+
publishLocation: 'container'
269+
displayName: Generate Submission SQL Script
270+
###
251271
# Tenant
252272
- job: Tenant
253273
displayName: "Build Tenant"

‎DotNet/Account/Account.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<PackageReference Include="Confluent.Kafka" Version="2.*" />
2424
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
2525
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
26-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
2726
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
2827
<PrivateAssets>all</PrivateAssets>
2928
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎DotNet/Account/Program.cs‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
using Microsoft.EntityFrameworkCore;
3636
using Microsoft.Extensions.Compliance.Classification;
3737
using Microsoft.Extensions.Compliance.Redaction;
38-
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
3938
using Microsoft.OpenApi.Models;
4039
using Serilog;
4140
using Serilog.Enrichers.Span;
@@ -58,32 +57,8 @@
5857

5958
static void RegisterServices(WebApplicationBuilder builder)
6059
{
61-
//load external configuration source if specified
62-
var externalConfigurationSource = builder.Configuration.GetSection(AccountConstants.AppSettingsSectionNames.ExternalConfigurationSource).Get<string>();
63-
if (!string.IsNullOrEmpty(externalConfigurationSource))
64-
{
65-
switch (externalConfigurationSource)
66-
{
67-
case ("AzureAppConfiguration"):
68-
builder.Configuration.AddAzureAppConfiguration(options =>
69-
{
70-
options.Connect(builder.Configuration.GetConnectionString("AzureAppConfiguration"))
71-
// Load configuration values with no label
72-
.Select("*", LabelFilter.Null)
73-
// Load configuration values for service name
74-
.Select("*", AccountConstants.ServiceName)
75-
// Load configuration values for service name and environment
76-
.Select("*", AccountConstants.ServiceName + ":" + builder.Environment.EnvironmentName);
77-
78-
options.ConfigureKeyVault(kv =>
79-
{
80-
kv.SetCredential(new DefaultAzureCredential());
81-
});
82-
83-
});
84-
break;
85-
}
86-
}
60+
// load external configuration source (if specified)
61+
builder.AddExternalConfiguration(AccountConstants.ServiceName);
8762

8863
//Initialize activity source
8964
var assemblyVersion = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? string.Empty;

‎DotNet/Account/Settings/AccountConstants.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public static class AccountConstants
66

77
public static class AppSettingsSectionNames
88
{
9-
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
109
public const string DatabaseProvider = "DatabaseProvider";
1110
public const string UserManagement = "UserManagement";
1211
}

‎DotNet/Admin.BFF/Admin.BFF.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
3535
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.7" />
3636
<PackageReference Include="Microsoft.Extensions.Compliance.Redaction" Version="8.7.0" />
37-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0-preview" />
3837
<PackageReference Include="Microsoft.Extensions.Telemetry" Version="8.7.0" />
3938
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
4039
<PackageReference Include="Serilog" Version="4.0.1" />

‎DotNet/Admin.BFF/Infrastructure/Extensions/ExternalServices/ExternalConfigurationExtension.cs‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎DotNet/Admin.BFF/Program.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,8 @@
5252
#region Register Services
5353
static void RegisterServices(WebApplicationBuilder builder)
5454
{
55-
// load external configuration source if specified
56-
var externalConfigurationSource = builder.Configuration.GetSection(LinkAdminConstants.AppSettingsSectionNames.ExternalConfigurationSource).Get<string>();
57-
if (!string.IsNullOrEmpty(externalConfigurationSource))
58-
{
59-
builder.AddExternalConfiguration(options =>
60-
{
61-
options.ExternalConfigurationSource = externalConfigurationSource;
62-
options.ExternalConfigurationConnectionString = builder.Configuration.GetConnectionString("AzureAppConfiguration");
63-
options.Environment = builder.Environment;
64-
});
65-
}
55+
// load external configuration source (if specified)
56+
builder.AddExternalConfiguration(LinkAdminConstants.ServiceName);
6657

6758
// Logging using Serilog
6859
builder.Logging.AddSerilog();

‎DotNet/Admin.BFF/Settings/LinkAdminConstants.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ public class LinkAdminConstants
66

77
public static class AppSettingsSectionNames
88
{
9-
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
109
public const string ServiceInformation = "ServiceInformation";
11-
public const string IdentityProvider = "IdentityProviderConfig";
1210
public const string CORS = "CORS";
13-
public const string Telemetry = "Telemetry";
1411
public const string Serilog = "Serilog";
1512
}
1613

‎DotNet/Audit/Audit.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PackageReference Include="Azure.Identity" Version="1.12.0" />
2626
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
2727
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
28-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.1.0" />
2928
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
3029
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
3130
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)