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

Add new app config connection string #4946

Merged
merged 16 commits into from
Dec 14, 2022
Merged

Add new app config connection string #4946

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1e5d2f7
Add new app config connection string
praveenkuttappan Dec 12, 2022
88e1abb
Update connection string name
praveenkuttappan Dec 13, 2022
afd19e4
Set connection string
praveenkuttappan Dec 13, 2022
2422580
Set connection string
praveenkuttappan Dec 13, 2022
be33e68
Increase local app start timeout
praveenkuttappan Dec 13, 2022
018b3fd
Install .Net run time
praveenkuttappan Dec 13, 2022
0ff630c
Install .Net run time
praveenkuttappan Dec 13, 2022
2350429
Install .Net run time
praveenkuttappan Dec 13, 2022
c22294c
Debug pipeline failure with 3.1.x
praveenkuttappan Dec 13, 2022
bfc3e8a
Add skip.test option
praveenkuttappan Dec 13, 2022
96dafa3
Show list of run tiem versions
praveenkuttappan Dec 13, 2022
7c904c6
Add troubleshooting step for local app start
praveenkuttappan Dec 13, 2022
a122084
Update authentication to access configuration in KV
praveenkuttappan Dec 13, 2022
f209112
Update authentication to default auth
praveenkuttappan Dec 13, 2022
d508213
Update pipeline
praveenkuttappan Dec 13, 2022
cf93a6b
Update pipeline
praveenkuttappan Dec 13, 2022
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
6 changes: 6 additions & 0 deletions .azure-pipelines/apiview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ stages:
displayName: 'Install .NET'
inputs:
version: '$(DotNetRuntimeVersion)'

- task: UseDotNet@2
displayName: 'Install .NET runtime'
inputs:
packageType: runtime
version: '$(DotNetRuntimeVersion)'

- task: DotNetCoreCLI@2
displayName: 'Build & Test'
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/steps/apiview-ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ steps:
APIVIEW_AUTHENTICATIONSCHEME: "Test"
APIVIEW_SENDGRID__KEY: "Test"
APIVIEW_APIKEY: "$(azuresdk-apiview-apikey)"
APIVIEW_APPCONFIG: "$(apiview-appconfig-connectionstring)"

- task: Powershell@2
inputs:
Expand Down
19 changes: 15 additions & 4 deletions src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@
<li class="nav-item">
<a class="nav-link" id="help-Java" data-toggle="tab" href="#java-help">Java</a>
</li>
<li class="nav-item">
<a class="nav-link" id="help-Kotlin" data-toggle="tab" href="#java-help">Kotlin</a>
</li>
<li class="nav-item">
<a class="nav-link" id="help-JavaScript" data-toggle="tab" href="#js-help">JS/TS</a>
</li>
Expand All @@ -120,7 +123,10 @@
<a class="nav-link" id="help-Swagger" data-toggle="tab" href="#swagger-help">Swagger</a>
</li>
<li class="nav-item">
<a class="nav-link" id="help-CADL" data-toggle="tab" href="#cadl-help">CADL</a>
<a class="nav-link" id="help-Cadl" data-toggle="tab" href="#cadl-help">Cadl</a>
</li>
<li class="nav-item">
<a class="nav-link" id="help-Json" data-toggle="tab" href="#json-help">Json</a>
</li>
</ul>

Expand Down Expand Up @@ -237,9 +243,14 @@
</div>
<div class="tab-pane" id="cadl-help">
<ol>
<li>
Provide URL to cadl project root path.
</li>

Provide URL to cadl project root path.
maririos marked this conversation as resolved.
Show resolved Hide resolved

</ol>
</div>
<div class="tab-pane" id="json-help">
<ol>
Upload JSON API review token file.
</ol>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/APIView/APIViewWeb/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
config.AddEnvironmentVariables(prefix: "APIVIEW_");
config.AddUserSecrets(typeof(Program).Assembly);
IConfiguration settings = config.Build();
string connectionString = settings.GetConnectionString("AppConfig");
string connectionString = settings.GetValue<string>("AppConfig");
// Load configuration from Azure App Configuration
config.AddAzureAppConfiguration(options =>
{
Expand Down