eas-cli 12.5.2 → 12.5.4

package/build/utils/prompts.js

@@ -1,20 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = exports.promptVariableVisibilityAsync = void 0;
+exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = exports.promptVariableVisibilityAsync = exports.parseVisibility = exports.promptVariableTypeAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const capitalize_1 = tslib_1.__importDefault(require("./expodash/capitalize"));
 const generated_1 = require("../graphql/generated");
 const prompts_1 = require("../prompts");
+async function promptVariableTypeAsync(nonInteractive, initialType) {
+    if (nonInteractive) {
+        throw new Error('The `--type` flag must be set when running in `--non-interactive` mode.');
+    }
+    const options = [
+        {
+            title: 'String',
+            value: generated_1.EnvironmentSecretType.String,
+        },
+        {
+            title: 'File',
+            value: generated_1.EnvironmentSecretType.FileBase64,
+        },
+    ];
+    return await (0, prompts_1.selectAsync)('Select the type of variable', options, {
+        initial: initialType,
+    });
+}
+exports.promptVariableTypeAsync = promptVariableTypeAsync;
+function parseVisibility(stringVisibility) {
+    switch (stringVisibility) {
+        case 'plaintext':
+            return generated_1.EnvironmentVariableVisibility.Public;
+        case 'sensitive':
+            return generated_1.EnvironmentVariableVisibility.Sensitive;
+        case 'encrypted':
+            return generated_1.EnvironmentVariableVisibility.Secret;
+        default:
+            throw new Error(`Invalid visibility: ${stringVisibility}`);
+    }
+}
+exports.parseVisibility = parseVisibility;
 async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility) {
     if (nonInteractive) {
         throw new Error('The `--visibility` flag must be set when running in `--non-interactive` mode.');
     }
-    return await (0, prompts_1.selectAsync)('Select visibility:', Object.values(generated_1.EnvironmentVariableVisibility).map(visibility => ({
-        title: (0, capitalize_1.default)(visibility),
-        value: visibility,
-        selected: visibility === selectedVisibility,
-    })));
+    return await (0, prompts_1.selectAsync)('Select visibility:', [
+        {
+            title: 'Plain text',
+            value: generated_1.EnvironmentVariableVisibility.Public,
+            selected: selectedVisibility === generated_1.EnvironmentVariableVisibility.Public,
+        },
+        {
+            title: 'Sensitive',
+            value: generated_1.EnvironmentVariableVisibility.Sensitive,
+            selected: selectedVisibility === generated_1.EnvironmentVariableVisibility.Sensitive,
+        },
+        {
+            title: 'Encrypted',
+            value: generated_1.EnvironmentVariableVisibility.Secret,
+            selected: selectedVisibility === generated_1.EnvironmentVariableVisibility.Secret,
+        },
+    ]);
 }
 exports.promptVariableVisibilityAsync = promptVariableVisibilityAsync;
 async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironments, multiple = false, availableEnvironments, }) {
@@ -23,7 +66,7 @@ async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironm
     }
     if (!multiple) {
         return await (0, prompts_1.selectAsync)('Select environment:', (availableEnvironments ?? Object.values(generated_1.EnvironmentVariableEnvironment)).map(environment => ({
-            title: environment,
+            title: environment.toLocaleLowerCase(),
             value: environment,
         })));
     }
@@ -32,7 +75,7 @@ async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironm
         name: 'environments',
         type: 'multiselect',
         choices: Object.values(generated_1.EnvironmentVariableEnvironment).map(environment => ({
-            title: environment,
+            title: environment.toLocaleLowerCase(),
             value: environment,
             selected: selectedEnvironments?.includes(environment),
         })),
@@ -40,14 +83,14 @@ async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironm
     return environments;
 }
 exports.promptVariableEnvironmentAsync = promptVariableEnvironmentAsync;
-async function promptVariableValueAsync({ nonInteractive, required = true, hidden = false, initial, }) {
+async function promptVariableValueAsync({ nonInteractive, required = true, hidden = false, filePath = false, initial, }) {
     if (nonInteractive && required) {
         throw new Error(`Environment variable needs 'value' to be specified when running in non-interactive mode. Run the command with ${chalk_1.default.bold('--value VARIABLE_VALUE')} flag to fix the issue`);
     }
     const { variableValue } = await (0, prompts_1.promptAsync)({
-        type: hidden ? 'password' : 'text',
+        type: hidden && !filePath ? 'password' : 'text',
         name: 'variableValue',
-        message: 'Variable value:',
+        message: filePath ? 'File path:' : 'Variable value:',
         initial: initial ?? '',
         validate: variableValue => {
             if (!required) {

package/build/utils/variableUtils.d.ts

@@ -1,4 +1,6 @@
 import { EnvironmentVariableEnvironment, EnvironmentVariableFragment } from '../graphql/generated';
+import { EnvironmentVariableWithFileContent } from '../graphql/queries/EnvironmentVariablesQuery';
 export declare function formatVariableName(variable: EnvironmentVariableFragment): string;
+export declare function formatVariableValue(variable: EnvironmentVariableWithFileContent): string;
 export declare function performForEnvironmentsAsync(environments: EnvironmentVariableEnvironment[] | null, fun: (environment: EnvironmentVariableEnvironment | undefined) => Promise<any>): Promise<any[]>;
-export declare function formatVariable(variable: EnvironmentVariableFragment): string;
+export declare function formatVariable(variable: EnvironmentVariableWithFileContent): string;

package/build/utils/variableUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableName = void 0;
+exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = void 0;
 const tslib_1 = require("tslib");
 const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
 const formatFields_1 = tslib_1.__importDefault(require("./formatFields"));
@@ -10,9 +10,31 @@ function formatVariableName(variable) {
     const scope = variable.scope === generated_1.EnvironmentVariableScope.Project ? 'project' : 'shared';
     const environments = variable.environments?.join(', ') ?? '';
     const updatedAt = variable.updatedAt ? new Date(variable.updatedAt).toLocaleString() : '';
-    return `${name} | ${scope} | ${environments} | Updated at: ${updatedAt}`;
+    const type = variable.type === generated_1.EnvironmentSecretType.FileBase64 ? 'file' : 'string';
+    const visibility = variable.visibility;
+    return `${name} | ${scope} | ${type} | ${visibility} | ${environments} | Updated at: ${updatedAt}`;
 }
 exports.formatVariableName = formatVariableName;
+function formatVariableValue(variable) {
+    // TODO: Add Learn more link
+    if (variable.value) {
+        return variable.value;
+    }
+    if (variable.valueWithFileContent) {
+        return atob(variable.valueWithFileContent);
+    }
+    if (variable.visibility === generated_1.EnvironmentVariableVisibility.Sensitive) {
+        return '***** (This is a sensitive env variable. To access it, run command with --include-sensitive flag. Learn more.)';
+    }
+    if (variable.visibility === generated_1.EnvironmentVariableVisibility.Secret) {
+        return "***** (This is a secret env variable that can only be accessed on EAS builder and can't be read in any UI. Learn more.)";
+    }
+    if (variable.type === generated_1.EnvironmentSecretType.FileBase64) {
+        return '***** (This is a file env variable. To access it, run command with --include-file-content flag. Learn more.)';
+    }
+    return '*****';
+}
+exports.formatVariableValue = formatVariableValue;
 async function performForEnvironmentsAsync(environments, fun) {
     const selectedEnvironments = environments ?? [undefined];
     return await Promise.all(selectedEnvironments.map(env => fun(env)));
@@ -22,8 +44,17 @@ function formatVariable(variable) {
     return (0, formatFields_1.default)([
         { label: 'ID', value: variable.id },
         { label: 'Name', value: variable.name },
-        { label: 'Value', value: variable.value ?? '(secret)' },
+        { label: 'Value', value: formatVariableValue(variable) },
         { label: 'Scope', value: variable.scope },
+        { label: 'Visibility', value: variable.visibility ?? '' },
+        {
+            label: 'Environments',
+            value: variable.environments ? variable.environments.join(', ') : '-',
+        },
+        {
+            label: 'type',
+            value: variable.type === generated_1.EnvironmentSecretType.FileBase64 ? 'file' : 'string',
+        },
         { label: 'Created at', value: (0, dateformat_1.default)(variable.createdAt, 'mmm dd HH:MM:ss') },
         { label: 'Updated at', value: (0, dateformat_1.default)(variable.updatedAt, 'mmm dd HH:MM:ss') },
     ]);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "12.5.2",
+  "version": "12.5.4",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -1884,16 +1884,27 @@
           "description": "Overwrite existing variable",
           "allowNo": false
         },
+        "type": {
+          "name": "type",
+          "type": "option",
+          "description": "The type of variable",
+          "helpValue": "(string|file)",
+          "multiple": false,
+          "options": [
+            "string",
+            "file"
+          ]
+        },
         "visibility": {
           "name": "visibility",
           "type": "option",
           "description": "Visibility of the variable",
-          "helpValue": "(secret|sensitive|public)",
+          "helpValue": "(plaintext|sensitive|encrypted)",
           "multiple": false,
           "options": [
-            "secret",
+            "plaintext",
             "sensitive",
-            "public"
+            "encrypted"
           ]
         },
         "scope": {
@@ -2162,6 +2173,12 @@
           "description": "Display sensitive values in the output",
           "allowNo": false
         },
+        "include-file-content": {
+          "name": "include-file-content",
+          "type": "boolean",
+          "description": "Display files content in the output",
+          "allowNo": false
+        },
         "format": {
           "name": "format",
           "type": "option",
@@ -2262,7 +2279,7 @@
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -2364,16 +2381,27 @@
           "description": "New value or the variable",
           "multiple": false
         },
+        "type": {
+          "name": "type",
+          "type": "option",
+          "description": "The type of variable",
+          "helpValue": "(string|file)",
+          "multiple": false,
+          "options": [
+            "string",
+            "file"
+          ]
+        },
         "visibility": {
           "name": "visibility",
           "type": "option",
           "description": "Visibility of the variable",
-          "helpValue": "(secret|sensitive|public)",
+          "helpValue": "(plaintext|sensitive|encrypted)",
           "multiple": false,
           "options": [
-            "secret",
+            "plaintext",
             "sensitive",
-            "public"
+            "encrypted"
           ]
         },
         "scope": {

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "12.5.2",
+  "version": "12.5.4",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.8.0",
+    "@expo/apple-utils": "2.0.2",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "8.5.4",
     "@expo/config-plugins": "7.8.4",
-    "@expo/config-types": "50.0.0",
     "@expo/eas-build-job": "1.0.136",
     "@expo/eas-json": "12.5.2",
     "@expo/env": "^0.3.0",
@@ -228,5 +227,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "6489ddc6adb71c11999f3bb2df848ef1ce2dd136"
+  "gitHead": "d6ec3ae1063cc089194f6bc668745093465364d6"
 }