@catladder/cli 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-c65e5318 → 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +30 -21
- package/dist/bundles/cli/index.js +49 -40
- package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.d.ts +3 -1
- package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.js +7 -7
- package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.d.ts +3 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js +6 -6
- package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.d.ts +3 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +6 -6
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.d.ts +1 -0
- package/dist/cli/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.js +16 -1
- package/dist/cli/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.js.map +1 -1
- package/dist/cli/src/utils/gitlab-without-vorpal/gitLabVariables.js +2 -6
- package/dist/cli/src/utils/gitlab-without-vorpal/gitLabVariables.js.map +1 -1
- package/dist/cli/src/utils/gitlab.d.ts +6 -3
- package/dist/cli/src/utils/gitlab.js +9 -14
- package/dist/cli/src/utils/gitlab.js.map +1 -1
- package/dist/cli/src/utils/preferences/CatladderPreferences.d.ts +4 -0
- package/dist/cli/src/utils/preferences/CatladderPreferences.js +3 -0
- package/dist/cli/src/utils/preferences/CatladderPreferences.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/commandGitlabCi.ts +16 -12
- package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +12 -7
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +14 -9
- package/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.ts +18 -0
- package/src/utils/gitlab-without-vorpal/gitLabVariables.ts +5 -7
- package/src/utils/gitlab.ts +19 -22
- package/src/utils/preferences/CatladderPreferences.ts +4 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitLabProjectByGitPath.js","sourceRoot":"","sources":["../../../../../src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.ts"],"names":[],"mappings":";;;AACA,qDAAkD;AAClD,qEAAkE;AAuB3D,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAkC,EAAE,EACpC,SAA4B,OAAO,EACnC,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,+CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7E,OAAO,IAAA,+BAAc,EACnB;QACE,YAAY,EAAE,YAAY,kBAAkB,CAAC,IAAI,CAAC,EAAE;QACpD,IAAI;QACJ,KAAK;KACN,EACD,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,sBAAsB,0BAajC"}
|
|
1
|
+
{"version":3,"file":"gitLabProjectByGitPath.js","sourceRoot":"","sources":["../../../../../src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.ts"],"names":[],"mappings":";;;AACA,gDAAmE;AACnE,qDAAkD;AAClD,qEAAkE;AAuB3D,MAAM,sBAAsB,GAAG,KAAK,EACzC,WAAkC,EAAE,EACpC,SAA4B,OAAO,EACnC,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,+CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7E,OAAO,IAAA,+BAAc,EACnB;QACE,YAAY,EAAE,YAAY,kBAAkB,CAAC,IAAI,CAAC,EAAE;QACpD,IAAI;QACJ,KAAK;KACN,EACD,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,sBAAsB,0BAajC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EACrC,WAAkC,EAAE,EACpC,SAA4B,OAAO,EACnC,EAAE;IACF,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7D,IAAA,4BAAc,EAAC,MAAM,CAAC;QACtB,IAAA,+CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC;KACzC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;IACtC,IAAI,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9C,OAAO,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5E,MAAM,IAAA,+BAAiB,EAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7E,OAAO,OAAO,CAAC,EAAE,CAAC;AACpB,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B"}
|
|
@@ -61,9 +61,7 @@ const getAllVariables = (0, memoizee_1.default)(async ({ logger = console, paral
|
|
|
61
61
|
if (!(token === null || token === void 0 ? void 0 : token.length)) {
|
|
62
62
|
throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
|
|
63
63
|
}
|
|
64
|
-
const {
|
|
65
|
-
? { id: projectId }
|
|
66
|
-
: await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
|
|
64
|
+
const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
|
|
67
65
|
let all = [];
|
|
68
66
|
let result = [];
|
|
69
67
|
let page = 1;
|
|
@@ -83,9 +81,7 @@ const getAllCatladderEnvVars = async ({ logger = console, projectId, ...existing
|
|
|
83
81
|
if (!(token === null || token === void 0 ? void 0 : token.length)) {
|
|
84
82
|
throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
|
|
85
83
|
}
|
|
86
|
-
const {
|
|
87
|
-
? { id: projectId }
|
|
88
|
-
: await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
|
|
84
|
+
const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
|
|
89
85
|
const fetchResults = await exports.gitLabVariable.getAll({
|
|
90
86
|
projectId: id,
|
|
91
87
|
host,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitLabVariables.js","sourceRoot":"","sources":["../../../../../src/utils/gitlab-without-vorpal/gitLabVariables.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,mCAA+B;AAG/B,qDAAkD;AAElD,qEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"gitLabVariables.js","sourceRoot":"","sources":["../../../../../src/utils/gitlab-without-vorpal/gitLabVariables.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,10 @@ export declare const doGitlabRequest: <T = any>(vorpal: CommandInstance | null,
|
|
|
9
9
|
host?: string;
|
|
10
10
|
token?: string;
|
|
11
11
|
}) => Promise<T>;
|
|
12
|
-
export declare const
|
|
13
|
-
|
|
12
|
+
export declare const getVariableValueByRawName: (vorpal: CommandInstance, rawName: string, { projectId, ...existing }?: GitLabApiDataOptional & {
|
|
13
|
+
projectId?: number | string;
|
|
14
|
+
}) => Promise<string>;
|
|
14
15
|
export declare const clearBackups: (vorpal: CommandInstance, keep: number, existing?: GitLabApiDataOptional) => Promise<void>;
|
|
15
|
-
export declare const upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, any>, env: string, componentName: string, backup?: boolean, masked?: boolean, existing?: GitLabApiDataOptional
|
|
16
|
+
export declare const upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, any>, env: string, componentName: string, backup?: boolean, masked?: boolean, { projectId, ...existing }?: GitLabApiDataOptional & {
|
|
17
|
+
projectId?: number | string;
|
|
18
|
+
}) => Promise<void>;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.
|
|
6
|
+
exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = void 0;
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const open_1 = __importDefault(require("open"));
|
|
9
9
|
const pipeline_1 = require("../../../pipeline/src/index.js");
|
|
@@ -61,23 +61,17 @@ const getGitlabToken = async (vorpal, host) => {
|
|
|
61
61
|
exports.getGitlabToken = getGitlabToken;
|
|
62
62
|
const doGitlabRequest = async (vorpal, { path: resourcePath, ...args }) => (0, gitlab_without_vorpal_1.fetchGitLabApi)({ resourcePath, ...args }, vorpal);
|
|
63
63
|
exports.doGitlabRequest = doGitlabRequest;
|
|
64
|
-
const
|
|
65
|
-
const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
|
|
66
|
-
const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
|
|
67
|
-
return (0, gitlab_without_vorpal_1.gitLabProjectByGitPath)({ host, path, token }, vorpal);
|
|
68
|
-
};
|
|
69
|
-
exports.getProjectInfo = getProjectInfo;
|
|
70
|
-
const getVariableValueByRawName = async (vorpal, rawName, existing = {}) => {
|
|
64
|
+
const getVariableValueByRawName = async (vorpal, rawName, { projectId, ...existing } = {}) => {
|
|
71
65
|
var _a;
|
|
72
66
|
const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
|
|
73
67
|
const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
|
|
74
|
-
const
|
|
68
|
+
const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
|
|
75
69
|
const allVariables = await gitlab_without_vorpal_1.gitLabVariable.getAll({
|
|
76
70
|
logger: vorpal,
|
|
77
71
|
host,
|
|
78
72
|
path,
|
|
79
73
|
token,
|
|
80
|
-
projectId,
|
|
74
|
+
projectId: id,
|
|
81
75
|
});
|
|
82
76
|
return (_a = allVariables.find((v) => v.key === rawName)) === null || _a === void 0 ? void 0 : _a.value;
|
|
83
77
|
};
|
|
@@ -85,19 +79,20 @@ exports.getVariableValueByRawName = getVariableValueByRawName;
|
|
|
85
79
|
const getAllCatladderEnvVarsInGitlab = async (vorpal, { projectId, ...existing } = {}) => {
|
|
86
80
|
const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
|
|
87
81
|
const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
|
|
82
|
+
const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
|
|
88
83
|
return gitlab_without_vorpal_1.gitLabVariable.getAllCatladder({
|
|
89
84
|
logger: vorpal,
|
|
90
85
|
host,
|
|
91
86
|
path,
|
|
92
87
|
token,
|
|
93
|
-
projectId,
|
|
88
|
+
projectId: id,
|
|
94
89
|
});
|
|
95
90
|
};
|
|
96
91
|
const getBackupKey = (fullKey, timestamp) => `${fullKey}_backup_${timestamp}`;
|
|
97
92
|
const clearBackups = async (vorpal, keep, existing = {}) => {
|
|
98
93
|
const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
|
|
99
94
|
const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
|
|
100
|
-
const
|
|
95
|
+
const id = await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal);
|
|
101
96
|
const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
|
|
102
97
|
projectId: id,
|
|
103
98
|
host,
|
|
@@ -115,11 +110,11 @@ const clearBackups = async (vorpal, keep, existing = {}) => {
|
|
|
115
110
|
};
|
|
116
111
|
exports.clearBackups = clearBackups;
|
|
117
112
|
const upsertAllVariables = async (vorpal, variables, env, componentName, backup = true, masked = true, // FIXME: would be better to have this per variable
|
|
118
|
-
existing = {}) => {
|
|
113
|
+
{ projectId, ...existing } = {}) => {
|
|
119
114
|
var _a;
|
|
120
115
|
const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
|
|
121
116
|
const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
|
|
122
|
-
const
|
|
117
|
+
const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
|
|
123
118
|
// we list all existing variables. We also gather backup versions, but its currently unused
|
|
124
119
|
const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
|
|
125
120
|
projectId: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAuC;AACvC,gDAAwB;AAGxB,kDAAuD;AACvD,wEAAgE;AAChE,+
|
|
1
|
+
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
declare const gitlabPersonalAccessToken = "gitlab-personal-access-token";
|
|
2
2
|
declare const googleAuthUserNumber = "googleAuthUserNumber";
|
|
3
3
|
declare const gitlabTokens = "gitlabTokens";
|
|
4
|
+
declare const gitLabProjectIds = "gitLabProjectIds";
|
|
4
5
|
export type CatladderPreferences = {
|
|
5
6
|
/**
|
|
6
7
|
* @deprecated Use the hostname based `gitlabTokens` instead.
|
|
@@ -13,6 +14,9 @@ export type CatladderPreferences = {
|
|
|
13
14
|
[gitlabTokens]: {
|
|
14
15
|
[instanceHostname in string]: string;
|
|
15
16
|
};
|
|
17
|
+
[gitLabProjectIds]: {
|
|
18
|
+
[hostnameProjectPath in string]: number;
|
|
19
|
+
};
|
|
16
20
|
};
|
|
17
21
|
/**
|
|
18
22
|
* Merges a partial configuration object with a fallback configuration object.
|
|
@@ -4,15 +4,18 @@ exports.mergeWithFallback = void 0;
|
|
|
4
4
|
const gitlabPersonalAccessToken = "gitlab-personal-access-token";
|
|
5
5
|
const googleAuthUserNumber = "googleAuthUserNumber";
|
|
6
6
|
const gitlabTokens = "gitlabTokens";
|
|
7
|
+
const gitLabProjectIds = "gitLabProjectIds";
|
|
7
8
|
const preferenceKeys = [
|
|
8
9
|
gitlabPersonalAccessToken,
|
|
9
10
|
googleAuthUserNumber,
|
|
10
11
|
gitlabTokens,
|
|
12
|
+
gitLabProjectIds,
|
|
11
13
|
];
|
|
12
14
|
const perfFallback = {
|
|
13
15
|
[gitlabPersonalAccessToken]: undefined,
|
|
14
16
|
[googleAuthUserNumber]: undefined,
|
|
15
17
|
[gitlabTokens]: {},
|
|
18
|
+
[gitLabProjectIds]: {},
|
|
16
19
|
};
|
|
17
20
|
/**
|
|
18
21
|
* Merges a partial configuration object with a fallback configuration object.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CatladderPreferences.js","sourceRoot":"","sources":["../../../../../src/utils/preferences/CatladderPreferences.ts"],"names":[],"mappings":";;;AAAA,MAAM,yBAAyB,GAAG,8BAA8B,CAAC;AACjE,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AACpD,MAAM,YAAY,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"CatladderPreferences.js","sourceRoot":"","sources":["../../../../../src/utils/preferences/CatladderPreferences.ts"],"names":[],"mappings":";;;AAAA,MAAM,yBAAyB,GAAG,8BAA8B,CAAC;AACjE,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AACpD,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAE5C,MAAM,cAAc,GAAG;IACrB,yBAAyB;IACzB,oBAAoB;IACpB,YAAY;IACZ,gBAAgB;CACR,CAAC;AAeX,MAAM,YAAY,GAAyB;IACzC,CAAC,yBAAyB,CAAC,EAAE,SAAS;IACtC,CAAC,oBAAoB,CAAC,EAAE,SAAS;IACjC,CAAC,YAAY,CAAC,EAAE,EAAE;IAClB,CAAC,gBAAgB,CAAC,EAAE,EAAE;CACvB,CAAC;AAEF;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAC/B,SAAwC,EAAE,EAC1C,QAAQ,GAAG,YAAY,EACD,EAAE,CACxB,cAAc,CAAC,MAAM,CACnB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;IACX,OAAA,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;QACjB,CAAC,GAAG,CAAC,EACH,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,QAAQ;YAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;YACjD,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,GAAG,CAAC,mCAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;KACrC,CAAC,CAAA;CAAA,EACJ,EAA0B,CAC3B,CAAC;AAbS,QAAA,iBAAiB,qBAa1B"}
|