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

Finish removing azure-arm-rest-v2 #13500

Merged
merged 3 commits into from
Sep 2, 2020
Merged

Finish removing azure-arm-rest-v2 #13500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f14f76
Finish removing azure-arm-rest-v2
Sep 2, 2020
5e17318
Missed some tasks
Sep 2, 2020
f0fe651
Fix shared package
Sep 2, 2020
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
14 changes: 7 additions & 7 deletions Tasks/AzureAppServiceManageV0/Tests/L0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import * as assert from 'assert';
import * as ttm from 'azure-pipelines-task-lib/mock-test';
import tl = require('azure-pipelines-task-lib');
import * as path from 'path';
var AppServiceTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-app-service.js");
var KuduServiceTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-app-service-kudu-tests.js");
var ApplicationInsightsTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-tests.js");
var AppInsightsWebTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-webtests-tests.js");
var ResourcesTests = require("../node_modules/azure-arm-rest-v2/Tests/L0-azure-arm-resource-tests.js");
var AppServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service.js");
var KuduServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service-kudu-tests.js");
var ApplicationInsightsTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-tests.js");
var AppInsightsWebTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-webtests-tests.js");
var ResourcesTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-resource-tests.js");

describe('Azure App Service Manage Suite', function() {

this.timeout(60000);

before((done) => {
try {
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-arm-rest-v2/Tests/node_modules'))) {
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-arm-rest-v2/Tests'), '-rf', true);
if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/node_modules'))) {
tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests'), '-rf', true);
}
}
catch(error) {
Expand Down
14 changes: 7 additions & 7 deletions Tasks/AzureAppServiceManageV0/azureappservicemanage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import tl = require('azure-pipelines-task-lib/task');
import path = require('path');
import { AzureRMEndpoint, dispose } from 'azure-arm-rest-v2/azure-arm-endpoint';
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
import { AzureRmEndpointAuthenticationScheme } from 'azure-arm-rest-v2/constants';
import {AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
import { AzureApplicationInsights } from 'azure-arm-rest-v2/azure-arm-appinsights';
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
import { AzureRMEndpoint, dispose } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint';
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azure-arm-rest-v2/constants';
import {AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
import { AzureApplicationInsights } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights';
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
import { AzureAppServiceUtils } from './operations/AzureAppServiceUtils';
import { KuduServiceUtils } from './operations/KuduServiceUtils';
import { AzureResourceFilterUtils } from './operations/AzureResourceFilterUtils';
Expand Down Expand Up @@ -53,7 +53,7 @@ async function run() {

try {
tl.setResourcePath(path.join( __dirname, 'task.json'));
tl.setResourcePath(path.join( __dirname, 'node_modules/azure-arm-rest-v2/module.json'));
tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/module.json'));
action = tl.getInput('Action', true);
let connectedServiceName = tl.getInput('ConnectedServiceName', true);
let webAppName: string = tl.getInput('WebAppName', true);
Expand Down
6 changes: 0 additions & 6 deletions Tasks/AzureAppServiceManageV0/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"common": [
{
"module": "../Common/azure-arm-rest-v2",
"type": "node",
"dest": "./",
"compile": true
},
{
"module": "../Common/utility-common-v2",
"type": "node",
Expand Down
6 changes: 3 additions & 3 deletions Tasks/AzureAppServiceManageV0/operations/AzureAppServiceUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import tl = require('azure-pipelines-task-lib/task');
import { AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
import webClient = require('azure-arm-rest-v2/webClient');
import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient');
var parseString = require('xml2js').parseString;
import Q = require('q');
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';

export class AzureAppServiceUtils {
private _appService: AzureAppService;
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureAppServiceManageV0/operations/AzureApplicationInsightsWebTestsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import tl = require('azure-pipelines-task-lib/task');
import { AzureEndpoint, WebTest } from 'azure-arm-rest-v2/azureModels';
import { ApplicationInsightsWebTests } from 'azure-arm-rest-v2/azure-arm-appinsights-webtests';
import { AzureEndpoint, WebTest } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
import { ApplicationInsightsWebTests } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights-webtests';

export class AzureApplicationInsightsWebTestsUtils {

Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureAppServiceManageV0/operations/AzureResourceFilterUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import tl = require('azure-pipelines-task-lib/task');
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
import { Resources } from 'azure-arm-rest-v2/azure-arm-resource';
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
import { Resources } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-resource';

export class AzureResourceFilterUtils {
public static async getResourceGroupName(endpoint: AzureEndpoint, resourceType: string, resourceName: string): Promise<string> {
Expand Down
10 changes: 5 additions & 5 deletions Tasks/AzureAppServiceManageV0/operations/ContinuousMonitoringUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import tl = require('azure-pipelines-task-lib/task');
import { AzureEndpoint } from 'azure-arm-rest-v2/azureModels';
import {AzureAppService } from 'azure-arm-rest-v2/azure-arm-app-service';
import { AzureApplicationInsights } from 'azure-arm-rest-v2/azure-arm-appinsights';
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
import { ApplicationInsightsWebTests } from 'azure-arm-rest-v2/azure-arm-appinsights-webtests';
import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';
import {AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service';
import { AzureApplicationInsights } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights';
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
import { ApplicationInsightsWebTests } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights-webtests';
import { AzureAppServiceUtils } from './AzureAppServiceUtils';
import { AzureApplicationInsightsWebTestsUtils } from './AzureApplicationInsightsWebTestsUtils';

Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureAppServiceManageV0/operations/KuduServiceUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import tl = require('azure-pipelines-task-lib/task');
import Q = require('q');
import { Kudu } from 'azure-arm-rest-v2/azure-arm-app-service-kudu';
import webClient = require('azure-arm-rest-v2/webClient');
import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu';
import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient');
const pythonExtensionPrefix: string = "azureappservice-";

export class KuduServiceUtils {
Expand Down
87 changes: 44 additions & 43 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/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/mocha": "2.2.48",
"@types/node": "6.0.68",
"@types/q": "1.0.7",
"azure-arm-rest-v2": "file:../../_build/Tasks/Common/azure-arm-rest-v2-2.0.0.tgz",
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.3",
"q": "1.4.1",
"utility-common-v2": "file:../../_build/Tasks/Common/utility-common-v2-2.0.0.tgz",
"xml2js": "0.4.13"
Expand Down
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 @@ -19,7 +19,7 @@
"version": {
"Major": 0,
"Minor": 175,
"Patch": 0
"Patch": 1
},
"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 @@ -19,7 +19,7 @@
"version": {
"Major": 0,
"Minor": 175,
"Patch": 0
"Patch": 1
},
"minimumAgentVersion": "1.102.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down
8 changes: 4 additions & 4 deletions Tasks/AzureFileCopyV2/PreJobExecutionAzureFileCopy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import tl = require('azure-pipelines-task-lib/task');
import path = require('path');
import fs = require('fs')
import armStorage = require('azure-arm-rest-v2/azure-arm-storage');
import msRestAzure = require('azure-arm-rest-v2/azure-arm-common');
import { AzureRMEndpoint } from 'azure-arm-rest-v2/azure-arm-endpoint';
import { AzureEndpoint, StorageAccount } from 'azure-arm-rest-v2/azureModels';
import armStorage = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage');
import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common');
import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint';
import { AzureEndpoint, StorageAccount } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels';

function isNonEmpty(str: string): boolean {
return (!!str && !!str.trim());
Expand Down
6 changes: 0 additions & 6 deletions Tasks/AzureFileCopyV2/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
{
"module": "../Common/RemoteDeployer",
"type": "ps"
},
{
"module": "../Common/azure-arm-rest-v2",
"type": "node",
"dest": "./",
"compile" : true
}
],
"externals": {
Expand Down
Loading