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

KubernetesManifestV0: Updating from [email protected] to azure-pip… #10650

Merged
merged 1 commit into from
Jun 13, 2019
Merged

KubernetesManifestV0: Updating from [email protected] to azure-pip… #10650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Tasks/KubernetesManifestV0/Tests/L0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as path from 'path';
import * as assert from 'assert';
import * as ttm from 'vsts-task-lib/mock-test';
import * as tl from 'vsts-task-lib';
import * as ttm from 'azure-pipelines-task-lib/mock-test';
import * as tl from 'azure-pipelines-task-lib';
import * as shared from './TestShared';

describe('Kubernetes Manifests Suite', function () {
Expand Down
6 changes: 3 additions & 3 deletions Tasks/KubernetesManifestV0/Tests/TestSetup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ma from 'vsts-task-lib/mock-answer';
import * as tmrm from 'vsts-task-lib/mock-run';
import * as ma from 'azure-pipelines-task-lib/mock-answer';
import * as tmrm from 'azure-pipelines-task-lib/mock-run';
import * as path from 'path';

import * as shared from './TestShared';
Expand Down Expand Up @@ -250,7 +250,7 @@ if (process.env[shared.TestEnvVars.arguments]) {
}

tr.setAnswers(<any>a);
tr.registerMock('vsts-task-lib/toolrunner', require('vsts-task-lib/mock-toolrunner'));
tr.registerMock('azure-pipelines-task-lib/toolrunner', require('azure-pipelines-task-lib/mock-toolrunner'));

// Create mock for fs module
import * as fs from 'fs';
Expand Down
6 changes: 3 additions & 3 deletions Tasks/KubernetesManifestV0/ThirdPartyNotices.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The Kubernetes task for Azure Pipelines or Team Foundation Server incorporates c
45. typed-rest-client (https://github.com/Microsoft/typed-rest-client)
46. underscore (https://github.com/jashkenas/underscore)
47. vso-node-api (https://github.com/Microsoft/vsts-node-api)
48. VSTS-Task-Lib (https://github.com/Microsoft/vsts-task-lib)
48. Azure-Pipelines-Task-Lib (https://github.com/Microsoft/azure-pipelines-task-lib)
49. wrappy (https://github.com/npm/wrappy)
50. xtend (https://github.com/Raynos/xtend)

Expand Down Expand Up @@ -1596,7 +1596,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=========================================
END OF vso-node-api NOTICES, INFORMATION, AND LICENSE

%% VSTS-Task-Lib NOTICES, INFORMATION, AND LICENSE BEGIN HERE
%% Azure-Pipelines-Task-Lib NOTICES, INFORMATION, AND LICENSE BEGIN HERE
=========================================
The MIT License (MIT)

Expand All @@ -1621,7 +1621,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

=========================================
END OF VSTS-Task-Lib NOTICES, INFORMATION, AND LICENSE
END OF Azure-Pipelines-Task-Lib NOTICES, INFORMATION, AND LICENSE

%% wrappy NOTICES, INFORMATION, AND LICENSE BEGIN HERE
=========================================
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose the TPN file needs to be updated, as utility-common dependency is removed, could you check if there are references of modules here in the TPN, but not in the task?

Expand Down
15 changes: 4 additions & 11 deletions Tasks/KubernetesManifestV0/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
{
"common": [
{
"module": "../Common/utility-common",
"type": "node",
"dest" : "./",
"compile" : true
},
{
"module": "../Common/kubernetes-common",
"module": "../Common/kubernetes-common-v2",
"type": "node",
"dest" : "./",
"compile" : true
},
{
"module": "../Common/docker-common",
"module": "../Common/docker-common-v2",
"type": "node",
"dest" : "./",
"compile" : true
Expand All @@ -22,9 +16,8 @@
"rm": [
{
"items": [
"node_modules/kubernetes-common/node_modules/vsts-task-lib",
"node_modules/docker-common/node_modules/vsts-task-lib",
"node_modules/utility-common/node_modules/vsts-task-lib",
"node_modules/kubernetes-common-v2/node_modules/azure-pipelines-task-lib",
"node_modules/docker-common-v2/node_modules/azure-pipelines-task-lib",
"node_modules/vsts-task-tool-lib/node_modules/vsts-task-lib"
],
"options": "-Rf"
Expand Down
Loading