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

Certificate support in Azure RM endpoint #7678

Merged
merged 21 commits into from
Aug 1, 2018
Merged

Certificate support in Azure RM endpoint #7678

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8e325b4
added changes
vincent1173 Jul 10, 2018
6a4d760
added node support
vincent1173 Jul 10, 2018
7d5c356
minor changes
vincent1173 Jul 11, 2018
0b16f32
remove duplicte slashes
vincent1173 Jul 11, 2018
70cf734
bug fix
vincent1173 Jul 11, 2018
32a49ae
update blob
vincent1173 Jul 12, 2018
e87d5ea
change archive name
vincent1173 Jul 12, 2018
dd76254
address review comment
vincent1173 Jul 16, 2018
9345113
minor change
vincent1173 Jul 19, 2018
dfd848b
addressed review comment
vincent1173 Jul 19, 2018
af95974
populate ADFS
vincent1173 Jul 19, 2018
f2bf981
App Service changed
vincent1173 Jul 30, 2018
8efaeda
resolve merge conflict
vincent1173 Jul 30, 2018
f902b89
package-lock updated (common)
vincent1173 Jul 30, 2018
bb9dfdc
removed jsonwebtoken
vincent1173 Jul 30, 2018
8c59a06
added node module
vincent1173 Jul 30, 2018
c6632ec
removed package (jwt) check
vincent1173 Aug 1, 2018
2bfc43e
added JSON web token module (IP scanned)
vincent1173 Aug 1, 2018
07a0a0a
Azure File copy - updated node modules
vincent1173 Aug 1, 2018
34a984b
node modules updated
vincent1173 Aug 1, 2018
1efc637
gulp build
vincent1173 Aug 1, 2018
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
5 changes: 4 additions & 1 deletion Tasks/AzureAppServiceManageV0/azureappservicemanage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import tl = require('vsts-task-lib/task');
import Q = require('q');
import path = require('path');
import { AzureRMEndpoint } from 'azure-arm-rest/azure-arm-endpoint';
import { AzureRMEndpoint, dispose } from 'azure-arm-rest/azure-arm-endpoint';
import { AzureEndpoint } from 'azure-arm-rest/azureModels';
import {AzureAppService } from 'azure-arm-rest/azure-arm-app-service';
import { AzureApplicationInsights } from 'azure-arm-rest/azure-arm-appinsights';
Expand Down Expand Up @@ -155,6 +155,9 @@ async function run() {
catch(error) {
tl.debug(error);
}
finally {
dispose();
}

if (!taskResult) {
tl.setResult(tl.TaskResult.Failed, errorMessage);
Expand Down
110 changes: 102 additions & 8 deletions Tasks/AzureAppServiceManageV0/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureAppServiceManageV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 0,
"Minor": 2,
"Patch": 39
"Patch": 40
},
"minimumAgentVersion": "1.102.0",
"instanceNameFormat": "$(Action): $(WebAppName)",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureAppServiceManageV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 0,
"Minor": 2,
"Patch": 39
"Patch": 40
},
"minimumAgentVersion": "1.102.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down
6 changes: 5 additions & 1 deletion Tasks/AzureRmWebAppDeploymentV4/azurermwebappdeployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import tl = require('vsts-task-lib/task');
import path = require('path');
import { TaskParameters, TaskParametersUtility } from './operations/TaskParameters';
import { DeploymentFactory } from './deploymentProvider/DeploymentFactory';
import * as Endpoint from 'azure-arm-rest/azure-arm-endpoint';

async function main() {
let isDeploymentSuccess: boolean = true;
Expand All @@ -26,7 +27,10 @@ async function main() {
if(deploymentProvider != null) {
await deploymentProvider.UpdateDeploymentStatus(isDeploymentSuccess);
}
tl.debug(isDeploymentSuccess ? "Deployment Succeded" : "");

Endpoint.dispose();
tl.debug(isDeploymentSuccess ? "Deployment Succeded" : "Deployment failed");

}
}

Expand Down
90 changes: 90 additions & 0 deletions Tasks/AzureRmWebAppDeploymentV4/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureRmWebAppDeploymentV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 4,
"Minor": 2,
"Patch": 7
"Patch": 9
},
"releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
"minimumAgentVersion": "2.104.1",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureRmWebAppDeploymentV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 4,
"Minor": 2,
"Patch": 7
"Patch": 9
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"minimumAgentVersion": "2.104.1",
Expand Down
Loading