Support File type environment variables

expo · Oct 1, 2024 · 62f3817 · 62f3817
1 parent d192343
commit 62f3817
Show file tree

Hide file tree

Showing 15 changed files with 441 additions and 148 deletions.
diff --git a/packages/eas-cli/README.md b/packages/eas-cli/README.md
@@ -55,76 +55,75 @@ eas --help COMMAND
 # Commands
 
 <!-- commands -->
-
-- [`eas account:login`](#eas-accountlogin)
-- [`eas account:logout`](#eas-accountlogout)
-- [`eas account:view`](#eas-accountview)
-- [`eas analytics [STATUS]`](#eas-analytics-status)
-- [`eas autocomplete [SHELL]`](#eas-autocomplete-shell)
-- [`eas branch:create [NAME]`](#eas-branchcreate-name)
-- [`eas branch:delete [NAME]`](#eas-branchdelete-name)
-- [`eas branch:list`](#eas-branchlist)
-- [`eas branch:rename`](#eas-branchrename)
-- [`eas branch:view [NAME]`](#eas-branchview-name)
-- [`eas build`](#eas-build)
-- [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
-- [`eas build:configure`](#eas-buildconfigure)
-- [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
-- [`eas build:inspect`](#eas-buildinspect)
-- [`eas build:list`](#eas-buildlist)
-- [`eas build:resign`](#eas-buildresign)
-- [`eas build:run`](#eas-buildrun)
-- [`eas build:submit`](#eas-buildsubmit)
-- [`eas build:version:get`](#eas-buildversionget)
-- [`eas build:version:set`](#eas-buildversionset)
-- [`eas build:version:sync`](#eas-buildversionsync)
-- [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
-- [`eas channel:create [NAME]`](#eas-channelcreate-name)
-- [`eas channel:edit [NAME]`](#eas-channeledit-name)
-- [`eas channel:list`](#eas-channellist)
-- [`eas channel:rollout [CHANNEL]`](#eas-channelrollout-channel)
-- [`eas channel:view [NAME]`](#eas-channelview-name)
-- [`eas config`](#eas-config)
-- [`eas credentials`](#eas-credentials)
-- [`eas credentials:configure-build`](#eas-credentialsconfigure-build)
-- [`eas device:create`](#eas-devicecreate)
-- [`eas device:delete`](#eas-devicedelete)
-- [`eas device:list`](#eas-devicelist)
-- [`eas device:rename`](#eas-devicerename)
-- [`eas device:view [UDID]`](#eas-deviceview-udid)
-- [`eas diagnostics`](#eas-diagnostics)
-- [`eas help [COMMAND]`](#eas-help-command)
-- [`eas init`](#eas-init)
-- [`eas init:onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-initonboarding-target_project_directory)
-- [`eas login`](#eas-login)
-- [`eas logout`](#eas-logout)
-- [`eas metadata:lint`](#eas-metadatalint)
-- [`eas metadata:pull`](#eas-metadatapull)
-- [`eas metadata:push`](#eas-metadatapush)
-- [`eas onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-onboarding-target_project_directory)
-- [`eas open`](#eas-open)
-- [`eas project:info`](#eas-projectinfo)
-- [`eas project:init`](#eas-projectinit)
-- [`eas project:onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-projectonboarding-target_project_directory)
-- [`eas secret:create`](#eas-secretcreate)
-- [`eas secret:delete`](#eas-secretdelete)
-- [`eas secret:list`](#eas-secretlist)
-- [`eas secret:push`](#eas-secretpush)
-- [`eas submit`](#eas-submit)
-- [`eas update`](#eas-update)
-- [`eas update:configure`](#eas-updateconfigure)
-- [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
-- [`eas update:list`](#eas-updatelist)
-- [`eas update:republish`](#eas-updaterepublish)
-- [`eas update:roll-back-to-embedded`](#eas-updateroll-back-to-embedded)
-- [`eas update:rollback`](#eas-updaterollback)
-- [`eas update:view GROUPID`](#eas-updateview-groupid)
-- [`eas webhook:create`](#eas-webhookcreate)
-- [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
-- [`eas webhook:list`](#eas-webhooklist)
-- [`eas webhook:update`](#eas-webhookupdate)
-- [`eas webhook:view ID`](#eas-webhookview-id)
-- [`eas whoami`](#eas-whoami)
+* [`eas account:login`](#eas-accountlogin)
+* [`eas account:logout`](#eas-accountlogout)
+* [`eas account:view`](#eas-accountview)
+* [`eas analytics [STATUS]`](#eas-analytics-status)
+* [`eas autocomplete [SHELL]`](#eas-autocomplete-shell)
+* [`eas branch:create [NAME]`](#eas-branchcreate-name)
+* [`eas branch:delete [NAME]`](#eas-branchdelete-name)
+* [`eas branch:list`](#eas-branchlist)
+* [`eas branch:rename`](#eas-branchrename)
+* [`eas branch:view [NAME]`](#eas-branchview-name)
+* [`eas build`](#eas-build)
+* [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
+* [`eas build:configure`](#eas-buildconfigure)
+* [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
+* [`eas build:inspect`](#eas-buildinspect)
+* [`eas build:list`](#eas-buildlist)
+* [`eas build:resign`](#eas-buildresign)
+* [`eas build:run`](#eas-buildrun)
+* [`eas build:submit`](#eas-buildsubmit)
+* [`eas build:version:get`](#eas-buildversionget)
+* [`eas build:version:set`](#eas-buildversionset)
+* [`eas build:version:sync`](#eas-buildversionsync)
+* [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
+* [`eas channel:create [NAME]`](#eas-channelcreate-name)
+* [`eas channel:edit [NAME]`](#eas-channeledit-name)
+* [`eas channel:list`](#eas-channellist)
+* [`eas channel:rollout [CHANNEL]`](#eas-channelrollout-channel)
+* [`eas channel:view [NAME]`](#eas-channelview-name)
+* [`eas config`](#eas-config)
+* [`eas credentials`](#eas-credentials)
+* [`eas credentials:configure-build`](#eas-credentialsconfigure-build)
+* [`eas device:create`](#eas-devicecreate)
+* [`eas device:delete`](#eas-devicedelete)
+* [`eas device:list`](#eas-devicelist)
+* [`eas device:rename`](#eas-devicerename)
+* [`eas device:view [UDID]`](#eas-deviceview-udid)
+* [`eas diagnostics`](#eas-diagnostics)
+* [`eas help [COMMAND]`](#eas-help-command)
+* [`eas init`](#eas-init)
+* [`eas init:onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-initonboarding-target_project_directory)
+* [`eas login`](#eas-login)
+* [`eas logout`](#eas-logout)
+* [`eas metadata:lint`](#eas-metadatalint)
+* [`eas metadata:pull`](#eas-metadatapull)
+* [`eas metadata:push`](#eas-metadatapush)
+* [`eas onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-onboarding-target_project_directory)
+* [`eas open`](#eas-open)
+* [`eas project:info`](#eas-projectinfo)
+* [`eas project:init`](#eas-projectinit)
+* [`eas project:onboarding [TARGET_PROJECT_DIRECTORY]`](#eas-projectonboarding-target_project_directory)
+* [`eas secret:create`](#eas-secretcreate)
+* [`eas secret:delete`](#eas-secretdelete)
+* [`eas secret:list`](#eas-secretlist)
+* [`eas secret:push`](#eas-secretpush)
+* [`eas submit`](#eas-submit)
+* [`eas update`](#eas-update)
+* [`eas update:configure`](#eas-updateconfigure)
+* [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
+* [`eas update:list`](#eas-updatelist)
+* [`eas update:republish`](#eas-updaterepublish)
+* [`eas update:roll-back-to-embedded`](#eas-updateroll-back-to-embedded)
+* [`eas update:rollback`](#eas-updaterollback)
+* [`eas update:view GROUPID`](#eas-updateview-groupid)
+* [`eas webhook:create`](#eas-webhookcreate)
+* [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
+* [`eas webhook:list`](#eas-webhooklist)
+* [`eas webhook:update`](#eas-webhookupdate)
+* [`eas webhook:view ID`](#eas-webhookview-id)
+* [`eas whoami`](#eas-whoami)
 
 ## `eas account:login`
 
@@ -1586,5 +1585,4 @@ DESCRIPTION
 ALIASES
   $ eas whoami
 ```
-
 <!-- commandsstop -->
diff --git a/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableCreate.test.ts b/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableCreate.test.ts
@@ -15,6 +15,7 @@ import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentV
 import {
   promptVariableEnvironmentAsync,
   promptVariableNameAsync,
+  promptVariableTypeAsync,
   promptVariableValueAsync,
 } from '../../../utils/prompts';
 import EnvironmentVariableCreate from '../create';
@@ -60,6 +61,7 @@ describe(EnvironmentVariableCreate, () => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         scope: EnvironmentVariableScope.Shared,
+        type: EnvironmentSecretType.String,
       }));
     jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockImplementation(async () => []);
     jest.mocked(EnvironmentVariablesQuery.sharedAsync).mockImplementation(async () => []);
@@ -322,6 +324,10 @@ describe(EnvironmentVariableCreate, () => {
 
       jest.mocked(promptVariableNameAsync).mockImplementation(async () => 'VarName');
       jest.mocked(promptVariableValueAsync).mockImplementation(async () => 'VarValue');
+      jest
+        .mocked(promptVariableTypeAsync)
+        .mockImplementation(async () => EnvironmentSecretType.String);
+
       jest
         .mocked(promptVariableEnvironmentAsync)
         // @ts-expect-error

diff --git a/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableGet.test.ts b/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableGet.test.ts
@@ -3,7 +3,9 @@ import { Config } from '@oclif/core';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
 import {
+  EnvironmentSecretType,
   EnvironmentVariableEnvironment,
+  EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
 } from '../../../graphql/generated';
@@ -20,7 +22,7 @@ jest.mock('../../../utils/prompts');
 describe(EnvironmentVariableGet, () => {
   const graphqlClient = {} as any as ExpoGraphqlClient;
   const mockConfig = {} as unknown as Config;
-  const mockVariables = [
+  const mockVariables: EnvironmentVariableFragment[] = [
     {
       id: 'var1',
       name: 'TEST_VAR_1',
@@ -30,6 +32,7 @@ describe(EnvironmentVariableGet, () => {
       updatedAt: new Date().toISOString(),
       scope: EnvironmentVariableScope.Project,
       visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
     },
   ];
 
@@ -55,6 +58,7 @@ describe(EnvironmentVariableGet, () => {
         appId: testProjectId,
         environment: undefined,
         filterNames: ['TEST_VAR_1'],
+        includeFileContent: true,
       }
     );
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
@@ -99,6 +103,7 @@ describe(EnvironmentVariableGet, () => {
         updatedAt: new Date().toISOString(),
         scope: EnvironmentVariableScope.Project,
         visibility: EnvironmentVariableVisibility.Public,
+        type: EnvironmentSecretType.String,
       },
     ]);
     await command.runAsync();

diff --git a/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableList.test.ts b/packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableList.test.ts
@@ -4,6 +4,7 @@ import { getMockAppFragment } from '../../../__tests__/commands/utils';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
 import {
+  EnvironmentSecretType,
   EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
@@ -28,6 +29,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
     visibility: EnvironmentVariableVisibility.Public,
     createdAt: undefined,
     updatedAt: undefined,
+    type: EnvironmentSecretType.String,
   },
   {
     id: 'var2',
@@ -38,6 +40,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
     visibility: EnvironmentVariableVisibility.Public,
     createdAt: undefined,
     updatedAt: undefined,
+    type: EnvironmentSecretType.String,
   },
 ];
 
@@ -65,6 +68,7 @@ describe(EnvironmentVariableList, () => {
     expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
       environment: undefined,
+      includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
@@ -85,6 +89,7 @@ describe(EnvironmentVariableList, () => {
     expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
       environment: EnvironmentVariableEnvironment.Production,
+      includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
@@ -109,6 +114,7 @@ describe(EnvironmentVariableList, () => {
       {
         appId: testProjectId,
         environment: undefined,
+        includeFileContent: false,
       }
     );
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
@@ -130,6 +136,7 @@ describe(EnvironmentVariableList, () => {
     expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
       environment: undefined,
+      includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
@@ -155,6 +162,7 @@ describe(EnvironmentVariableList, () => {
     expect(EnvironmentVariablesQuery.sharedWithSensitiveAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
       environment: undefined,
+      includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));