@ship-et/buildatlas-cli 0.14.2-beta → 0.14.2-beta.2
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/client.d.ts +9 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +72 -1
- package/dist/client.js.map +1 -1
- package/dist/client.test.js +42 -1
- package/dist/client.test.js.map +1 -1
- package/dist/commands/build.js +2 -2
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/env.d.ts +1 -0
- package/dist/commands/env.d.ts.map +1 -1
- package/dist/commands/env.js +65 -42
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/migrate/env.d.ts +24 -9
- package/dist/commands/migrate/env.d.ts.map +1 -1
- package/dist/commands/migrate/env.js +92 -53
- package/dist/commands/migrate/env.js.map +1 -1
- package/dist/commands/migrate/env.test.d.ts +2 -0
- package/dist/commands/migrate/env.test.d.ts.map +1 -0
- package/dist/commands/migrate/env.test.js +41 -0
- package/dist/commands/migrate/env.test.js.map +1 -0
- package/dist/commands/submit.d.ts +6 -2
- package/dist/commands/submit.d.ts.map +1 -1
- package/dist/commands/submit.js +19 -9
- package/dist/commands/submit.js.map +1 -1
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -20,6 +20,15 @@ export declare class AtlasApiError extends Error {
|
|
|
20
20
|
* second set of build minutes, which is worse than an error message.
|
|
21
21
|
*/
|
|
22
22
|
export type Retry = 'safe' | 'once';
|
|
23
|
+
/**
|
|
24
|
+
* Turns a thrown `fetch` into a sentence that says what actually went wrong.
|
|
25
|
+
*
|
|
26
|
+
* Node's fetch always throws `TypeError: fetch failed` and keeps the real reason on
|
|
27
|
+
* `err.cause` (sometimes nested a level deeper). Printing only the message hides
|
|
28
|
+
* whether DNS failed, nothing was listening, or a proxy hung up halfway through a
|
|
29
|
+
* request — three failures with three different fixes.
|
|
30
|
+
*/
|
|
31
|
+
export declare function describeNetworkError(err: unknown, host: string): string;
|
|
23
32
|
/**
|
|
24
33
|
* Minimal API client over the platform fetch. Takes an explicit token rather
|
|
25
34
|
* than reading config itself, so `buildatlas login` can validate a token before it
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA6B/C,qBAAa,aAAc,SAAQ,KAAK;IAGtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YAAY,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAIxD;CACF;AAID;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAsCpC;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EACnC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAO,GACxE,OAAO,CAAC,CAAC,CAAC,CA2EZ"}
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA6B/C,qBAAa,aAAc,SAAQ,KAAK;IAGtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YAAY,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAIxD;CACF;AAID;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAsCpC;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA+DvE;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EACnC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAO,GACxE,OAAO,CAAC,CAAC,CAAC,CA2EZ"}
|
package/dist/client.js
CHANGED
|
@@ -66,6 +66,77 @@ function reportVersionSkew(res, apiUrl) {
|
|
|
66
66
|
' slow build rather than as an error. Install the current one:\n' +
|
|
67
67
|
` npm install -g ${new URL('/cli/buildatlas.tgz', apiUrl).toString()}\n`);
|
|
68
68
|
}
|
|
69
|
+
/**
|
|
70
|
+
* Turns a thrown `fetch` into a sentence that says what actually went wrong.
|
|
71
|
+
*
|
|
72
|
+
* Node's fetch always throws `TypeError: fetch failed` and keeps the real reason on
|
|
73
|
+
* `err.cause` (sometimes nested a level deeper). Printing only the message hides
|
|
74
|
+
* whether DNS failed, nothing was listening, or a proxy hung up halfway through a
|
|
75
|
+
* request — three failures with three different fixes.
|
|
76
|
+
*/
|
|
77
|
+
export function describeNetworkError(err, host) {
|
|
78
|
+
let code;
|
|
79
|
+
let detail;
|
|
80
|
+
let link = err;
|
|
81
|
+
for (let depth = 0; link && depth < 5; depth += 1) {
|
|
82
|
+
if (!code && typeof link.code === 'string')
|
|
83
|
+
code = link.code;
|
|
84
|
+
if (typeof link.message === 'string' && link.message && link.message !== 'fetch failed') {
|
|
85
|
+
detail = link.message;
|
|
86
|
+
}
|
|
87
|
+
link = link.cause;
|
|
88
|
+
}
|
|
89
|
+
const raw = [code, detail].filter(Boolean).join(': ') || err?.message || String(err);
|
|
90
|
+
let summary;
|
|
91
|
+
let hint;
|
|
92
|
+
switch (code) {
|
|
93
|
+
case 'ENOTFOUND':
|
|
94
|
+
case 'EAI_AGAIN':
|
|
95
|
+
summary = `Could not reach ${host}: the hostname did not resolve`;
|
|
96
|
+
hint = 'Check the API URL and your internet or DNS.';
|
|
97
|
+
break;
|
|
98
|
+
case 'ECONNREFUSED':
|
|
99
|
+
summary = `Could not reach ${host}: the connection was refused`;
|
|
100
|
+
hint = 'Nothing is listening there. Is the server running, and is the port right?';
|
|
101
|
+
break;
|
|
102
|
+
case 'ETIMEDOUT':
|
|
103
|
+
case 'UND_ERR_CONNECT_TIMEOUT':
|
|
104
|
+
summary = `Could not reach ${host}: the connection timed out`;
|
|
105
|
+
hint = 'The host did not answer. A firewall, a VPN or a server that is down are the usual causes.';
|
|
106
|
+
break;
|
|
107
|
+
case 'EHOSTUNREACH':
|
|
108
|
+
case 'ENETUNREACH':
|
|
109
|
+
summary = `Could not reach ${host}: no network route to it`;
|
|
110
|
+
hint = 'Check your connection or VPN.';
|
|
111
|
+
break;
|
|
112
|
+
case 'ECONNRESET':
|
|
113
|
+
case 'EPIPE':
|
|
114
|
+
case 'UND_ERR_SOCKET':
|
|
115
|
+
case 'UND_ERR_CLOSED':
|
|
116
|
+
summary = `Connected to ${host}, but it closed the connection before answering`;
|
|
117
|
+
hint =
|
|
118
|
+
'Usually a reverse proxy rejecting the request (body size limit, WAF rule) or the server ' +
|
|
119
|
+
'crashing mid-request. Check the proxy error log and the API log for this request.';
|
|
120
|
+
break;
|
|
121
|
+
case 'UND_ERR_HEADERS_TIMEOUT':
|
|
122
|
+
case 'UND_ERR_BODY_TIMEOUT':
|
|
123
|
+
summary = `Connected to ${host}, but it did not answer in time`;
|
|
124
|
+
hint = 'The server accepted the request and then hung. Check the API log for this request.';
|
|
125
|
+
break;
|
|
126
|
+
case 'CERT_HAS_EXPIRED':
|
|
127
|
+
case 'DEPTH_ZERO_SELF_SIGNED_CERT':
|
|
128
|
+
case 'SELF_SIGNED_CERT_IN_CHAIN':
|
|
129
|
+
case 'UNABLE_TO_VERIFY_LEAF_SIGNATURE':
|
|
130
|
+
case 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY':
|
|
131
|
+
case 'ERR_TLS_CERT_ALTNAME_INVALID':
|
|
132
|
+
summary = `Could not reach ${host}: its TLS certificate was not accepted`;
|
|
133
|
+
hint = 'The certificate is expired, self-signed or issued for a different name.';
|
|
134
|
+
break;
|
|
135
|
+
default:
|
|
136
|
+
return `Could not reach ${host} (${raw}).`;
|
|
137
|
+
}
|
|
138
|
+
return `${summary} (${raw}).\n ${hint}`;
|
|
139
|
+
}
|
|
69
140
|
/**
|
|
70
141
|
* Minimal API client over the platform fetch. Takes an explicit token rather
|
|
71
142
|
* than reading config itself, so `buildatlas login` can validate a token before it
|
|
@@ -103,7 +174,7 @@ export async function apiRequest(config, path, init = {}) {
|
|
|
103
174
|
// missing session produces a 401 *response*, which is handled below — so
|
|
104
175
|
// answering "Not logged in" to a refused connection names a cause that was
|
|
105
176
|
// never checked and sends people to fix the wrong thing.
|
|
106
|
-
throw new AtlasApiError(0, 'network_error',
|
|
177
|
+
throw new AtlasApiError(0, 'network_error', describeNetworkError(err, new URL(config.apiUrl).host));
|
|
107
178
|
}
|
|
108
179
|
await delay(BACKOFF_MS[attempt]);
|
|
109
180
|
continue;
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client.test.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import assert from 'node:assert/strict';
|
|
2
2
|
import { createServer } from 'node:http';
|
|
3
3
|
import { afterEach, describe, it } from 'node:test';
|
|
4
|
-
import { AtlasApiError, apiRequest } from './client.js';
|
|
4
|
+
import { AtlasApiError, apiRequest, describeNetworkError } from './client.js';
|
|
5
5
|
/**
|
|
6
6
|
* How the CLI behaves when the network between a developer and their server is the
|
|
7
7
|
* real one.
|
|
@@ -186,4 +186,45 @@ describe('a refused connection is not a missing session', () => {
|
|
|
186
186
|
}
|
|
187
187
|
});
|
|
188
188
|
});
|
|
189
|
+
describe('saying what actually happened instead of "fetch failed"', () => {
|
|
190
|
+
it('names a refused connection and its code', async () => {
|
|
191
|
+
// Not port 1: fetch refuses that one itself ("bad port") without ever connecting.
|
|
192
|
+
// A port that was just listening and is now closed refuses for real.
|
|
193
|
+
const probe = createServer();
|
|
194
|
+
await new Promise((done) => probe.listen(0, '127.0.0.1', done));
|
|
195
|
+
const { port } = probe.address();
|
|
196
|
+
await new Promise((done) => probe.close(() => done()));
|
|
197
|
+
await assert.rejects(apiRequest({ apiUrl: `http://127.0.0.1:${port}` }, '/x', { method: 'POST' }), (err) => {
|
|
198
|
+
assert.match(err.message, /connection was refused/);
|
|
199
|
+
assert.match(err.message, /ECONNREFUSED/);
|
|
200
|
+
assert.doesNotMatch(err.message, /fetch failed/);
|
|
201
|
+
return true;
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
it('tells a server that hung up mid-request apart from one that was never reached', async () => {
|
|
205
|
+
// What a reverse proxy rejecting an upload looks like from the client: the socket
|
|
206
|
+
// is accepted, then destroyed without a response.
|
|
207
|
+
const server = createServer((req) => req.socket.destroy());
|
|
208
|
+
await new Promise((done) => server.listen(0, '127.0.0.1', done));
|
|
209
|
+
const { port } = server.address();
|
|
210
|
+
try {
|
|
211
|
+
await assert.rejects(apiRequest({ apiUrl: `http://127.0.0.1:${port}` }, '/x', {
|
|
212
|
+
method: 'POST',
|
|
213
|
+
body: JSON.stringify({ a: 1 }),
|
|
214
|
+
}), (err) => {
|
|
215
|
+
assert.equal(err.code, 'network_error');
|
|
216
|
+
assert.match(err.message, /closed the connection before answering/);
|
|
217
|
+
assert.match(err.message, /reverse proxy/);
|
|
218
|
+
return true;
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
finally {
|
|
222
|
+
server.close();
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
it('falls back to the raw cause for codes it does not know', () => {
|
|
226
|
+
const err = new TypeError('fetch failed', { cause: Object.assign(new Error('weird'), { code: 'E_ODD' }) });
|
|
227
|
+
assert.equal(describeNetworkError(err, 'h'), 'Could not reach h (E_ODD: weird).');
|
|
228
|
+
});
|
|
229
|
+
});
|
|
189
230
|
//# sourceMappingURL=client.test.js.map
|
package/dist/client.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../src/client.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../src/client.test.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/build.js
CHANGED
|
@@ -5,7 +5,7 @@ import { join, resolve } from 'node:path';
|
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
6
|
import pc from 'picocolors';
|
|
7
7
|
import { decideSource, readDescriptor } from '../build-source.js';
|
|
8
|
-
import { AtlasApiError, apiRequest } from '../client.js';
|
|
8
|
+
import { AtlasApiError, apiRequest, describeNetworkError } from '../client.js';
|
|
9
9
|
import { reportProject } from '../project-hint.js';
|
|
10
10
|
import { loadConfig, resolveProject } from '../config.js';
|
|
11
11
|
import { detachOnInterrupt } from '../detach.js';
|
|
@@ -377,7 +377,7 @@ async function uploadTarball(url, path, size) {
|
|
|
377
377
|
});
|
|
378
378
|
}
|
|
379
379
|
catch (err) {
|
|
380
|
-
throw new Error(`
|
|
380
|
+
throw new Error(`Source upload to object storage failed. ${describeNetworkError(err, host)}\n` +
|
|
381
381
|
' The server hands out this address, so it has to be reachable from here.\n' +
|
|
382
382
|
' If BuildAtlas is on another machine, set S3_PUBLIC_URL on the server to an address this one can reach.');
|
|
383
383
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/env.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/commands/env.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/commands/env.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,KAAK,WAAW,EAA8B,MAAM,cAAc,CAAC;AAoD5E;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACpB,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CA2BvE;AAGD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBhE;AAmDD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAmHzD"}
|
package/dist/commands/env.js
CHANGED
|
@@ -5,6 +5,35 @@ import { AtlasApiError, apiRequest } from '../client.js';
|
|
|
5
5
|
import { loadConfig, resolveProject } from '../config.js';
|
|
6
6
|
import { readEasJson, resolveProfileEnv } from '../eas-json.js';
|
|
7
7
|
import { reportProject } from '../project-hint.js';
|
|
8
|
+
/**
|
|
9
|
+
* Store one value for some profiles, unless the name already has one there.
|
|
10
|
+
*
|
|
11
|
+
* Per profile, not per name: a key with a development value is still unset in
|
|
12
|
+
* production, and skipping it there is how `env pull -e production` used to import
|
|
13
|
+
* nothing. With `overwrite`, the API replaces a value scoped to exactly these
|
|
14
|
+
* profiles; one that also covers other profiles is refused rather than split, and
|
|
15
|
+
* reported back as a conflict.
|
|
16
|
+
*/
|
|
17
|
+
async function storeEnv(params) {
|
|
18
|
+
const { key, profiles } = params;
|
|
19
|
+
const covered = params.existing.some((row) => row.key === key &&
|
|
20
|
+
(!row.profiles.length || !profiles.length || row.profiles.some((p) => profiles.includes(p))));
|
|
21
|
+
if (covered && !params.overwrite)
|
|
22
|
+
return 'skipped';
|
|
23
|
+
try {
|
|
24
|
+
await apiRequest(params.config, `/projects/${params.slug}/env`, {
|
|
25
|
+
method: 'PUT',
|
|
26
|
+
token: params.config.token,
|
|
27
|
+
body: JSON.stringify({ key, value: params.value, profiles, visibility: params.visibility }),
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
if (err instanceof AtlasApiError && err.status === 409)
|
|
32
|
+
return 'conflict';
|
|
33
|
+
throw err;
|
|
34
|
+
}
|
|
35
|
+
return 'added';
|
|
36
|
+
}
|
|
8
37
|
/**
|
|
9
38
|
* Copies a profile's `eas.json` env block into the project's BuildAtlas env
|
|
10
39
|
* store. Add-only by default: a value someone already set (or edited) in the
|
|
@@ -21,29 +50,23 @@ export async function seedEnvFromEasJson(params) {
|
|
|
21
50
|
const profileEnv = resolveProfileEnv(easJson, params.profile);
|
|
22
51
|
const keys = Object.keys(profileEnv);
|
|
23
52
|
if (!keys.length)
|
|
24
|
-
return { added: [], skipped: [] };
|
|
53
|
+
return { added: [], skipped: [], conflicts: [] };
|
|
25
54
|
const { env: existing } = await apiRequest(params.config, `/projects/${params.slug}/env`, { token: params.config.token });
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
body: JSON.stringify({
|
|
38
|
-
key,
|
|
39
|
-
value: profileEnv[key],
|
|
40
|
-
profiles: [params.profile],
|
|
41
|
-
visibility: 'plaintext',
|
|
42
|
-
}),
|
|
55
|
+
const result = { added: [], skipped: [], conflicts: [] };
|
|
56
|
+
for (const [key, value] of Object.entries(profileEnv)) {
|
|
57
|
+
const outcome = await storeEnv({
|
|
58
|
+
config: params.config,
|
|
59
|
+
slug: params.slug,
|
|
60
|
+
existing,
|
|
61
|
+
key,
|
|
62
|
+
value,
|
|
63
|
+
profiles: [params.profile],
|
|
64
|
+
visibility: 'plaintext',
|
|
65
|
+
overwrite: params.overwrite,
|
|
43
66
|
});
|
|
44
|
-
|
|
67
|
+
result[outcome === 'conflict' ? 'conflicts' : outcome].push(key);
|
|
45
68
|
}
|
|
46
|
-
return
|
|
69
|
+
return result;
|
|
47
70
|
}
|
|
48
71
|
/**
|
|
49
72
|
* Parses a `.env` file.
|
|
@@ -96,27 +119,21 @@ async function importDotEnv(params) {
|
|
|
96
119
|
throw new Error(`No KEY=value lines found in ${params.file}.`);
|
|
97
120
|
}
|
|
98
121
|
const { env: existing } = await apiRequest(params.config, `/projects/${params.slug}/env`, { token: params.config.token });
|
|
99
|
-
const
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
body: JSON.stringify({
|
|
111
|
-
key,
|
|
112
|
-
value: parsed[key],
|
|
113
|
-
profiles: params.profile ? [params.profile] : [],
|
|
114
|
-
visibility: params.secret ? 'secret' : 'plaintext',
|
|
115
|
-
}),
|
|
122
|
+
const result = { added: [], skipped: [], conflicts: [] };
|
|
123
|
+
for (const [key, value] of Object.entries(parsed)) {
|
|
124
|
+
const outcome = await storeEnv({
|
|
125
|
+
config: params.config,
|
|
126
|
+
slug: params.slug,
|
|
127
|
+
existing,
|
|
128
|
+
key,
|
|
129
|
+
value,
|
|
130
|
+
profiles: params.profile ? [params.profile] : [],
|
|
131
|
+
visibility: params.secret ? 'secret' : 'plaintext',
|
|
132
|
+
overwrite: params.overwrite,
|
|
116
133
|
});
|
|
117
|
-
|
|
134
|
+
result[outcome === 'conflict' ? 'conflicts' : outcome].push(key);
|
|
118
135
|
}
|
|
119
|
-
return
|
|
136
|
+
return result;
|
|
120
137
|
}
|
|
121
138
|
export function registerEnvCommand(program) {
|
|
122
139
|
const env = program
|
|
@@ -135,7 +152,7 @@ export function registerEnvCommand(program) {
|
|
|
135
152
|
const config = await requireAuth();
|
|
136
153
|
const resolved = await resolveProject(opts.project);
|
|
137
154
|
reportProject(resolved);
|
|
138
|
-
const { added, skipped } = await importDotEnv({
|
|
155
|
+
const { added, skipped, conflicts } = await importDotEnv({
|
|
139
156
|
config,
|
|
140
157
|
slug: resolved.slug,
|
|
141
158
|
file: resolve(opts.file),
|
|
@@ -151,6 +168,9 @@ export function registerEnvCommand(program) {
|
|
|
151
168
|
// value someone set deliberately in the dashboard.
|
|
152
169
|
console.log(pc.dim(` left alone (already set): ${skipped.join(', ')} — use --overwrite to replace`));
|
|
153
170
|
}
|
|
171
|
+
if (conflicts.length) {
|
|
172
|
+
console.log(pc.yellow(` not replaced (an existing value also covers other profiles — edit it in the dashboard): ${conflicts.join(', ')}`));
|
|
173
|
+
}
|
|
154
174
|
if (!opts.plaintext) {
|
|
155
175
|
console.log(pc.dim(' stored as secrets, so values are not readable again. --plaintext for URLs and other non-secrets.'));
|
|
156
176
|
}
|
|
@@ -171,7 +191,7 @@ export function registerEnvCommand(program) {
|
|
|
171
191
|
const projectDir = resolve(opts.dir);
|
|
172
192
|
const resolved = await resolveProject(opts.project, projectDir);
|
|
173
193
|
reportProject(resolved);
|
|
174
|
-
const { added, skipped } = await seedEnvFromEasJson({
|
|
194
|
+
const { added, skipped, conflicts } = await seedEnvFromEasJson({
|
|
175
195
|
config,
|
|
176
196
|
slug: resolved.slug,
|
|
177
197
|
projectDir,
|
|
@@ -185,7 +205,10 @@ export function registerEnvCommand(program) {
|
|
|
185
205
|
console.log(pc.dim(` skipped ${skipped.length} already set (use --overwrite to replace): `) +
|
|
186
206
|
pc.dim(skipped.join(', ')));
|
|
187
207
|
}
|
|
188
|
-
if (
|
|
208
|
+
if (conflicts.length) {
|
|
209
|
+
console.log(pc.yellow(` not replaced (an existing value also covers other profiles — edit it in the dashboard): ${conflicts.join(', ')}`));
|
|
210
|
+
}
|
|
211
|
+
if (!added.length && !skipped.length && !conflicts.length) {
|
|
189
212
|
console.log(pc.dim(`No env vars in eas.json profile "${opts.profile}".`));
|
|
190
213
|
}
|
|
191
214
|
}
|
package/dist/commands/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/commands/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAoB,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/commands/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,29 @@
|
|
|
1
1
|
import type { AuthedConfig } from './auth.ts';
|
|
2
|
-
import { type ExpoAuth } from './eas-client.ts';
|
|
2
|
+
import { type EasEnvVar, type ExpoAuth } from './eas-client.ts';
|
|
3
3
|
import type { ProjectReport } from './report.ts';
|
|
4
|
+
/** One BuildAtlas env row to create: a value and the profiles it applies to. */
|
|
5
|
+
export interface PlannedEnvRow {
|
|
6
|
+
value: string;
|
|
7
|
+
/** Empty means every profile. */
|
|
8
|
+
profiles: string[];
|
|
9
|
+
sensitive: boolean;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Splits one EAS variable into the BuildAtlas rows that reproduce it.
|
|
13
|
+
*
|
|
14
|
+
* EAS keys a value by environment; BuildAtlas lets one key hold several rows so long
|
|
15
|
+
* as their profile sets do not overlap. So each distinct value becomes its own row,
|
|
16
|
+
* scoped to the environments that use it — production's API URL and preview's both
|
|
17
|
+
* arrive, instead of only production's. A single value used by every environment in
|
|
18
|
+
* `allEnvironments` is stored once, for all profiles.
|
|
19
|
+
*/
|
|
20
|
+
export declare function planEnvRows(readable: EasEnvVar[], allEnvironments: ReadonlySet<string>): PlannedEnvRow[];
|
|
4
21
|
/**
|
|
5
22
|
* Copies the app's EAS environment variables into BuildAtlas's env store.
|
|
6
23
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* profiles are called. When a name has different values per environment, only
|
|
11
|
-
* one fits: production's is kept, and the rest are reported so nobody discovers
|
|
12
|
-
* the missing preview value from a broken preview build.
|
|
24
|
+
* Environment names are carried over as profile names, which is what eas.json's
|
|
25
|
+
* default profiles are called. A variable whose value differs per environment
|
|
26
|
+
* becomes one row per value, each scoped to its environments (see `planEnvRows`).
|
|
13
27
|
*
|
|
14
28
|
* Never migrated, always reported:
|
|
15
29
|
* - `SECRET` variables — EAS does not return their values to anyone;
|
|
@@ -17,8 +31,9 @@ import type { ProjectReport } from './report.ts';
|
|
|
17
31
|
* --type file`) — the build sets those to a path on EAS's own machine, which
|
|
18
32
|
* has no BuildAtlas equivalent; commit the file or set it up by hand.
|
|
19
33
|
*
|
|
20
|
-
* Add-only, like `buildatlas env pull`: a
|
|
21
|
-
* there deliberately and is left alone
|
|
34
|
+
* Add-only, like `buildatlas env pull`: a row already set in BuildAtlas was put
|
|
35
|
+
* there deliberately and is left alone, so a value is skipped when its profiles
|
|
36
|
+
* overlap a row that exists for the same key.
|
|
22
37
|
*/
|
|
23
38
|
export declare function migrateEnv(config: AuthedConfig, slug: string, auth: ExpoAuth, appId: string, report: ProjectReport): Promise<void>;
|
|
24
39
|
//# sourceMappingURL=env.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/env.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/env.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAiB,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,gFAAgF;AAChF,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,SAAS,EAAE,EACrB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,GACnC,aAAa,EAAE,CAmBjB;AAQD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CA2Ff"}
|
|
@@ -1,15 +1,47 @@
|
|
|
1
1
|
import { apiRequest } from '../../client.js';
|
|
2
2
|
import { getEasEnvVars } from './eas-client.js';
|
|
3
3
|
import { withRetry } from './retry.js';
|
|
4
|
+
/**
|
|
5
|
+
* Splits one EAS variable into the BuildAtlas rows that reproduce it.
|
|
6
|
+
*
|
|
7
|
+
* EAS keys a value by environment; BuildAtlas lets one key hold several rows so long
|
|
8
|
+
* as their profile sets do not overlap. So each distinct value becomes its own row,
|
|
9
|
+
* scoped to the environments that use it — production's API URL and preview's both
|
|
10
|
+
* arrive, instead of only production's. A single value used by every environment in
|
|
11
|
+
* `allEnvironments` is stored once, for all profiles.
|
|
12
|
+
*/
|
|
13
|
+
export function planEnvRows(readable, allEnvironments) {
|
|
14
|
+
const groups = new Map();
|
|
15
|
+
for (const e of readable) {
|
|
16
|
+
const group = groups.get(e.value) ?? { environments: new Set(), sensitive: false };
|
|
17
|
+
for (const env of e.environments)
|
|
18
|
+
group.environments.add(env);
|
|
19
|
+
group.sensitive ||= e.visibility !== 'PUBLIC';
|
|
20
|
+
groups.set(e.value, group);
|
|
21
|
+
}
|
|
22
|
+
const rows = [...groups].map(([value, g]) => ({
|
|
23
|
+
value,
|
|
24
|
+
profiles: [...g.environments].sort(),
|
|
25
|
+
sensitive: g.sensitive,
|
|
26
|
+
}));
|
|
27
|
+
const only = rows.length === 1 ? rows[0] : undefined;
|
|
28
|
+
if (only && allEnvironments.size && [...allEnvironments].every((env) => only.profiles.includes(env))) {
|
|
29
|
+
return [{ ...only, profiles: [] }];
|
|
30
|
+
}
|
|
31
|
+
return rows.sort((a, b) => a.profiles.join(',').localeCompare(b.profiles.join(',')));
|
|
32
|
+
}
|
|
33
|
+
/** An empty profile list means every profile, so it overlaps anything. */
|
|
34
|
+
function profilesOverlap(a, b) {
|
|
35
|
+
if (!a.length || !b.length)
|
|
36
|
+
return true;
|
|
37
|
+
return a.some((p) => b.includes(p));
|
|
38
|
+
}
|
|
4
39
|
/**
|
|
5
40
|
* Copies the app's EAS environment variables into BuildAtlas's env store.
|
|
6
41
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* profiles are called. When a name has different values per environment, only
|
|
11
|
-
* one fits: production's is kept, and the rest are reported so nobody discovers
|
|
12
|
-
* the missing preview value from a broken preview build.
|
|
42
|
+
* Environment names are carried over as profile names, which is what eas.json's
|
|
43
|
+
* default profiles are called. A variable whose value differs per environment
|
|
44
|
+
* becomes one row per value, each scoped to its environments (see `planEnvRows`).
|
|
13
45
|
*
|
|
14
46
|
* Never migrated, always reported:
|
|
15
47
|
* - `SECRET` variables — EAS does not return their values to anyone;
|
|
@@ -17,8 +49,9 @@ import { withRetry } from './retry.js';
|
|
|
17
49
|
* --type file`) — the build sets those to a path on EAS's own machine, which
|
|
18
50
|
* has no BuildAtlas equivalent; commit the file or set it up by hand.
|
|
19
51
|
*
|
|
20
|
-
* Add-only, like `buildatlas env pull`: a
|
|
21
|
-
* there deliberately and is left alone
|
|
52
|
+
* Add-only, like `buildatlas env pull`: a row already set in BuildAtlas was put
|
|
53
|
+
* there deliberately and is left alone, so a value is skipped when its profiles
|
|
54
|
+
* overlap a row that exists for the same key.
|
|
22
55
|
*/
|
|
23
56
|
export async function migrateEnv(config, slug, auth, appId, report) {
|
|
24
57
|
const vars = await withRetry('fetching EAS environment variables', () => getEasEnvVars(auth, appId));
|
|
@@ -31,7 +64,10 @@ export async function migrateEnv(config, slug, auth, appId, report) {
|
|
|
31
64
|
return;
|
|
32
65
|
}
|
|
33
66
|
const existing = await withRetry('checking environment variables already set', () => apiRequest(config, `/projects/${slug}/env`, { token: config.token }));
|
|
34
|
-
const
|
|
67
|
+
const existingByKey = new Map();
|
|
68
|
+
for (const row of existing?.env ?? []) {
|
|
69
|
+
existingByKey.set(row.key, [...(existingByKey.get(row.key) ?? []), row.profiles ?? []]);
|
|
70
|
+
}
|
|
35
71
|
// Every environment this app uses anywhere: a variable present in all of them
|
|
36
72
|
// applies to every profile, which BuildAtlas spells as an empty list.
|
|
37
73
|
const allEnvironments = new Set(vars.flatMap((v) => v.environments));
|
|
@@ -40,60 +76,63 @@ export async function migrateEnv(config, slug, auth, appId, report) {
|
|
|
40
76
|
byName.set(v.name, [...(byName.get(v.name) ?? []), v]);
|
|
41
77
|
for (const [name, entries] of [...byName].sort(([a], [b]) => a.localeCompare(b))) {
|
|
42
78
|
const stepLabel = `env ${name}`;
|
|
43
|
-
if (existingKeys.has(name)) {
|
|
44
|
-
report.skipped(stepLabel, 'already set in BuildAtlas');
|
|
45
|
-
continue;
|
|
46
|
-
}
|
|
47
79
|
const file = entries.find((e) => e.type === 'FILE_BASE64');
|
|
48
80
|
if (file) {
|
|
49
81
|
report.warn(stepLabel, `file variable${file.fileName ? ` (${file.fileName})` : ''} — not migrated; commit the file to the repo instead`);
|
|
50
82
|
continue;
|
|
51
83
|
}
|
|
52
84
|
const readable = entries.filter((e) => e.value !== null);
|
|
85
|
+
const unreadable = [...new Set(entries.filter((e) => e.value === null).flatMap((e) => e.environments))];
|
|
86
|
+
const setEnvHint = `set it with \`buildatlas credentials set-env ${name} --project ${slug}\``;
|
|
53
87
|
if (readable.length === 0) {
|
|
54
|
-
report.warn(stepLabel, `secret on EAS, value not readable —
|
|
88
|
+
report.warn(stepLabel, `secret on EAS, value not readable — ${setEnvHint}`);
|
|
55
89
|
continue;
|
|
56
90
|
}
|
|
57
|
-
//
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
})
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
const scope = profiles.length ? `profiles: ${profiles.join(', ')}` : 'all profiles';
|
|
87
|
-
const left = [...groups.values()]
|
|
88
|
-
.filter((g) => g !== kept)
|
|
89
|
-
.flatMap((g) => g.environments)
|
|
90
|
-
.concat(entries.filter((e) => e.value === null).flatMap((e) => e.environments));
|
|
91
|
-
if (left.length) {
|
|
92
|
-
report.warn(stepLabel, `${scope}; differs on EAS for ${[...new Set(left)].join(', ')} — that value was not migrated`);
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
report.done(stepLabel, scope);
|
|
91
|
+
// With a SECRET value in some environment, "all profiles" would wrongly cover that
|
|
92
|
+
// environment too, so the readable values keep their explicit profiles.
|
|
93
|
+
const plan = planEnvRows(readable, unreadable.length ? new Set() : allEnvironments);
|
|
94
|
+
const already = existingByKey.get(name) ?? [];
|
|
95
|
+
const saved = [];
|
|
96
|
+
const kept = [];
|
|
97
|
+
const failed = [];
|
|
98
|
+
for (const row of plan) {
|
|
99
|
+
const scope = row.profiles.length ? row.profiles.join(', ') : 'all profiles';
|
|
100
|
+
if (already.some((profiles) => profilesOverlap(profiles, row.profiles))) {
|
|
101
|
+
kept.push(scope);
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
const ok = await withRetry(`setting ${name} (${scope})`, () => apiRequest(config, `/projects/${slug}/env`, {
|
|
105
|
+
method: 'PUT',
|
|
106
|
+
token: config.token,
|
|
107
|
+
body: JSON.stringify({
|
|
108
|
+
key: name,
|
|
109
|
+
value: row.value,
|
|
110
|
+
profiles: row.profiles,
|
|
111
|
+
// PUBLIC stays readable in the dashboard; anything EAS hid stays hidden.
|
|
112
|
+
visibility: row.sensitive ? 'secret' : 'plaintext',
|
|
113
|
+
}),
|
|
114
|
+
}));
|
|
115
|
+
if (ok === undefined)
|
|
116
|
+
failed.push(scope);
|
|
117
|
+
else
|
|
118
|
+
saved.push(scope);
|
|
96
119
|
}
|
|
120
|
+
const detail = [
|
|
121
|
+
saved.length ? `profiles: ${saved.join(' | ')}` : '',
|
|
122
|
+
kept.length ? `already set in BuildAtlas for ${kept.join(' | ')}` : '',
|
|
123
|
+
failed.length ? `not saved for ${failed.join(' | ')}` : '',
|
|
124
|
+
unreadable.length ? `secret on EAS for ${unreadable.join(', ')} — ${setEnvHint}` : '',
|
|
125
|
+
]
|
|
126
|
+
.filter(Boolean)
|
|
127
|
+
.join('; ');
|
|
128
|
+
if (failed.length)
|
|
129
|
+
report.failed(stepLabel, detail);
|
|
130
|
+
else if (unreadable.length)
|
|
131
|
+
report.warn(stepLabel, detail);
|
|
132
|
+
else if (!saved.length)
|
|
133
|
+
report.skipped(stepLabel, detail);
|
|
134
|
+
else
|
|
135
|
+
report.done(stepLabel, detail);
|
|
97
136
|
}
|
|
98
137
|
}
|
|
99
138
|
//# sourceMappingURL=env.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/commands/migrate/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAiC,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/commands/migrate/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.test.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/env.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { describe, it } from 'node:test';
|
|
3
|
+
import { planEnvRows } from './env.js';
|
|
4
|
+
const v = (value, environments, visibility = 'PUBLIC') => ({
|
|
5
|
+
name: 'EXPO_PUBLIC_API_BASE_URL',
|
|
6
|
+
value,
|
|
7
|
+
environments,
|
|
8
|
+
visibility,
|
|
9
|
+
type: 'STRING',
|
|
10
|
+
fileName: null,
|
|
11
|
+
});
|
|
12
|
+
const ALL = new Set(['development', 'preview', 'production']);
|
|
13
|
+
describe('splitting an EAS variable into BuildAtlas rows', () => {
|
|
14
|
+
it('stores one row for every profile when every environment shares the value', () => {
|
|
15
|
+
assert.deepEqual(planEnvRows([v('https://api', ['development', 'preview', 'production'])], ALL), [
|
|
16
|
+
{ value: 'https://api', profiles: [], sensitive: false },
|
|
17
|
+
]);
|
|
18
|
+
});
|
|
19
|
+
it('keeps a value per profile when environments differ, instead of dropping preview', () => {
|
|
20
|
+
assert.deepEqual(planEnvRows([v('https://api', ['production']), v('https://staging-api', ['preview', 'development'])], ALL), [
|
|
21
|
+
{ value: 'https://staging-api', profiles: ['development', 'preview'], sensitive: false },
|
|
22
|
+
{ value: 'https://api', profiles: ['production'], sensitive: false },
|
|
23
|
+
]);
|
|
24
|
+
});
|
|
25
|
+
it('scopes a single value to its environments when it does not cover them all', () => {
|
|
26
|
+
assert.deepEqual(planEnvRows([v('x', ['production'])], ALL), [
|
|
27
|
+
{ value: 'x', profiles: ['production'], sensitive: false },
|
|
28
|
+
]);
|
|
29
|
+
});
|
|
30
|
+
it('marks a row secret when any environment sharing it was not PUBLIC', () => {
|
|
31
|
+
const [row] = planEnvRows([v('k', ['production'], 'SENSITIVE'), v('k', ['preview'])], new Set(['production', 'preview']));
|
|
32
|
+
assert.equal(row.sensitive, true);
|
|
33
|
+
assert.deepEqual(row.profiles, []);
|
|
34
|
+
});
|
|
35
|
+
it('never widens to every profile when told no environment set is complete', () => {
|
|
36
|
+
assert.deepEqual(planEnvRows([v('x', ['production', 'preview'])], new Set()), [
|
|
37
|
+
{ value: 'x', profiles: ['preview', 'production'], sensitive: false },
|
|
38
|
+
]);
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
//# sourceMappingURL=env.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.test.js","sourceRoot":"","sources":["../../../src/commands/migrate/env.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import type { Command } from 'commander';
|
|
2
2
|
/**
|
|
3
|
-
* `buildatlas submit <buildId>` — pushes a finished
|
|
3
|
+
* `buildatlas submit <buildId>` — pushes a finished build to its store.
|
|
4
|
+
*
|
|
5
|
+
* The destination is not asked for: an .ipa goes to TestFlight and an .aab goes to
|
|
6
|
+
* Google Play's internal track, and there is no second sensible answer for either.
|
|
7
|
+
* Both reach testers only; neither puts anything in front of the public.
|
|
4
8
|
*
|
|
5
9
|
* Takes a build id rather than inferring the latest build. Submitting is an
|
|
6
|
-
* outward-facing act under the company's
|
|
10
|
+
* outward-facing act under the company's name, and "the most recent build"
|
|
7
11
|
* is exactly the kind of guess that puts the wrong binary in front of testers.
|
|
8
12
|
*/
|
|
9
13
|
export declare function registerSubmitCommand(program: Command): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBzC
|
|
1
|
+
{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBzC;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsF5D"}
|
package/dist/commands/submit.js
CHANGED
|
@@ -9,16 +9,20 @@ const STATUS_COLOR = {
|
|
|
9
9
|
};
|
|
10
10
|
const colour = (status) => (STATUS_COLOR[status] ?? pc.white)(status);
|
|
11
11
|
/**
|
|
12
|
-
* `buildatlas submit <buildId>` — pushes a finished
|
|
12
|
+
* `buildatlas submit <buildId>` — pushes a finished build to its store.
|
|
13
|
+
*
|
|
14
|
+
* The destination is not asked for: an .ipa goes to TestFlight and an .aab goes to
|
|
15
|
+
* Google Play's internal track, and there is no second sensible answer for either.
|
|
16
|
+
* Both reach testers only; neither puts anything in front of the public.
|
|
13
17
|
*
|
|
14
18
|
* Takes a build id rather than inferring the latest build. Submitting is an
|
|
15
|
-
* outward-facing act under the company's
|
|
19
|
+
* outward-facing act under the company's name, and "the most recent build"
|
|
16
20
|
* is exactly the kind of guess that puts the wrong binary in front of testers.
|
|
17
21
|
*/
|
|
18
22
|
export function registerSubmitCommand(program) {
|
|
19
23
|
program
|
|
20
24
|
.command('submit <buildId>')
|
|
21
|
-
.description('Upload a finished
|
|
25
|
+
.description('Upload a finished build to TestFlight (iOS) or Google Play internal (Android)')
|
|
22
26
|
.option('--no-wait', 'Queue it and exit instead of following the submission')
|
|
23
27
|
.action(async (buildId, opts) => {
|
|
24
28
|
const config = await loadConfig();
|
|
@@ -28,7 +32,10 @@ export function registerSubmitCommand(program) {
|
|
|
28
32
|
return;
|
|
29
33
|
}
|
|
30
34
|
try {
|
|
31
|
-
const { submission } = await apiRequest(config, `/builds/${buildId}/submissions`,
|
|
35
|
+
const { submission } = await apiRequest(config, `/builds/${buildId}/submissions`,
|
|
36
|
+
// No target: the server picks it from the build's platform, which keeps the
|
|
37
|
+
// two from disagreeing about what an .aab is for.
|
|
38
|
+
{ method: 'POST', token: config.token, body: '{}' });
|
|
32
39
|
console.log(`${pc.green('✔')} queued submission ${pc.dim(submission.id)}`);
|
|
33
40
|
if (!opts.wait) {
|
|
34
41
|
console.log(pc.dim(' buildatlas submit-status ' + submission.id));
|
|
@@ -36,11 +43,14 @@ export function registerSubmitCommand(program) {
|
|
|
36
43
|
}
|
|
37
44
|
const finished = await follow(config, submission.id);
|
|
38
45
|
if (finished.status === 'finished') {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
// testers, and nothing here can
|
|
42
|
-
// letting
|
|
43
|
-
|
|
46
|
+
const play = finished.target === 'playstore';
|
|
47
|
+
console.log(`${pc.green('✔')} accepted by ${play ? 'Google Play' : 'App Store Connect'}`);
|
|
48
|
+
// Both stores process before testers see anything, and nothing here can
|
|
49
|
+
// shorten it — said out loud rather than letting somebody conclude it
|
|
50
|
+
// failed silently.
|
|
51
|
+
console.log(pc.dim(play
|
|
52
|
+
? ' Google processes the bundle (usually a few minutes) before it reaches your internal testers.'
|
|
53
|
+
: ' Apple still has to process it (usually ~10 minutes) before it shows in TestFlight.'));
|
|
44
54
|
}
|
|
45
55
|
else {
|
|
46
56
|
console.log(`${pc.red('✖')} ${finished.errorMessage ?? 'submission failed'}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,MAAM,YAAY,GAA0C;IAC1D,QAAQ,EAAE,EAAE,CAAC,KAAK;IAClB,OAAO,EAAE,EAAE,CAAC,GAAG;IACf,OAAO,EAAE,EAAE,CAAC,IAAI;IAChB,OAAO,EAAE,EAAE,CAAC,GAAG;CAChB,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtF
|
|
1
|
+
{"version":3,"file":"submit.js","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED