@catladder/cli 0.0.0-refactor-gcloud-api-60147713 → 0.0.0-refactor-gcloud-api-ee7f86ef
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 +1 -1
- package/dist/bundles/cli/index.js +46 -40
- package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js +1 -1
- package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js.map +1 -1
- package/dist/gcloud/enableServices.js +21 -11
- package/dist/gcloud/enableServices.js.map +1 -1
- package/dist/gcloud/serviceAccounts.js +23 -27
- package/dist/gcloud/serviceAccounts.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/gcloud/cloudRun/getCloudRunDomainSuffix.ts +1 -1
- package/src/gcloud/enableServices.ts +6 -0
- package/src/gcloud/serviceAccounts.ts +5 -4
package/package.json
CHANGED
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"node": ">=12.0.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
-
"@catladder/pipeline": "0.0.0-refactor-gcloud-api-
|
|
31
|
+
"@catladder/pipeline": "0.0.0-refactor-gcloud-api-ee7f86ef",
|
|
32
32
|
"@kubernetes/client-node": "^0.16.2",
|
|
33
33
|
"@tsconfig/node14": "^1.0.1",
|
|
34
34
|
"@types/common-tags": "^1.8.0",
|
|
@@ -61,6 +61,6 @@
|
|
|
61
61
|
"typescript": "^4.5.4",
|
|
62
62
|
"vorpal": "^1.12.0"
|
|
63
63
|
},
|
|
64
|
-
"version": "0.0.0-refactor-gcloud-api-
|
|
64
|
+
"version": "0.0.0-refactor-gcloud-api-ee7f86ef",
|
|
65
65
|
"stableVersion": "0.0.0"
|
|
66
66
|
}
|
|
@@ -24,7 +24,7 @@ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
|
|
|
24
24
|
|
|
25
25
|
const [existingService] = await runClient.listServices({ parent, pageSize: 1 }, { autoPaginate: false })
|
|
26
26
|
|
|
27
|
-
if (existingService) {
|
|
27
|
+
if (existingService.length > 0) {
|
|
28
28
|
return getSuffixFromService(existingService);
|
|
29
29
|
}
|
|
30
30
|
|
|
@@ -6,6 +6,12 @@ export const enableGCloudServices = async (
|
|
|
6
6
|
projectId: string;
|
|
7
7
|
}
|
|
8
8
|
) => {
|
|
9
|
+
const gcloudAuth = new google.auth.GoogleAuth({
|
|
10
|
+
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
|
|
11
|
+
projectId: config.projectId
|
|
12
|
+
});
|
|
13
|
+
google.options({ auth: await gcloudAuth.getClient() })
|
|
14
|
+
|
|
9
15
|
for (const service of services) {
|
|
10
16
|
await google.serviceusage({ version: 'v1' }).services.enable({
|
|
11
17
|
name: `projects/${config.projectId}/services/${service}`
|
|
@@ -83,6 +83,7 @@ const upsertGcloudServiceAccount = async (
|
|
|
83
83
|
)
|
|
84
84
|
|
|
85
85
|
await gcloudProjectsClient.setIamPolicy({
|
|
86
|
+
resource: gcloudProjectsClient.projectPath(projectId),
|
|
86
87
|
policy: {
|
|
87
88
|
bindings,
|
|
88
89
|
etag: projectIamPolicy.etag
|
|
@@ -97,12 +98,12 @@ const upsertGcloudServiceAccount = async (
|
|
|
97
98
|
keyTypes: ['USER_MANAGED'],
|
|
98
99
|
});
|
|
99
100
|
|
|
100
|
-
|
|
101
|
-
await gcloudIamClient.projects.serviceAccounts.keys.delete({ name: key.name })
|
|
102
|
-
|
|
101
|
+
keylist.data?.keys?.map(async key =>
|
|
102
|
+
await gcloudIamClient.projects.serviceAccounts.keys.delete({ name: key.name })
|
|
103
|
+
)
|
|
103
104
|
|
|
104
105
|
const key = await gcloudIamClient.projects.serviceAccounts.keys.create({ name: fullPath })
|
|
105
|
-
return key.data.privateKeyData
|
|
106
|
+
return Buffer.from(key.data.privateKeyData, "base64").toString("utf-8")
|
|
106
107
|
};
|
|
107
108
|
|
|
108
109
|
export const upsertGcloudServiceAccountAndSaveSecret = async (
|