Directory JSON actions secrets matches YAML

src/context/directory/handlers/actions.ts

@@ -43,6 +43,9 @@ function parse(context: DirectoryContext): ParsedActions {
 }
 
 function mapSecrets(secrets) {
+ if (typeof secrets === 'string') {
+ return secrets;
+ }
  if (secrets && secrets.length > 0) {
  return secrets.map((secret) => ({ name: secret.name, value: secret.value }));
  }

src/context/yaml/handlers/actions.ts

@@ -36,7 +36,10 @@ async function parse(context: YAMLContext): Promise<ParsedActions> {
  };
 }
 
-function mapSecrets(secrets: { name: string; value: string }[]): Secret[] {
+function mapSecrets(secrets) {
+ if (typeof secrets === 'string') {
+ return secrets; //Enables keyword preservation to operate on action secrets
+ }
  if (secrets && secrets.length > 0) {
  return secrets.map((secret) => ({ name: secret.name, value: secret.value }));
  }
@@ -86,8 +89,7 @@ async function dump(context: YAMLContext): Promise<ParsedActions> {
  runtime: action.runtime,
  dependencies: action.dependencies || [],
  status: action.status,
- secrets:
- typeof action.secrets === 'string' ? action.secrets : mapSecrets(action.secrets || []), //Enables keyword preservation to operate on action secrets
+ secrets: mapSecrets(action.secrets),
  supported_triggers: action.supported_triggers,
  })),
  };

test/context/directory/actions.test.js

@@ -266,4 +266,34 @@ describe('#directory context actions', () => {
 
  expect(dumpedFiles).to.have.length(0);
  });
+
+ it('should process actions secrets with AUTH0_PRESERVE_KEYWORDS: true', async () => {
+ const dir = path.join(testDataDir, 'directory', 'test6');
+ const actionsDir = path.join(dir, 'actions');
+ cleanThenMkdir(actionsDir);
+
+ const json = `{
+ "name": "action-one",
+ "secrets": "@@SECRETS@@"
+ }`;
+ const jsonFile = path.join(actionsDir, 'action-one.json');
+
+ fs.writeFileSync(jsonFile, json);
+
+ const target = [
+ {
+ name: 'action-one',
+ secrets: { name: 'SECRETNAME', value: 'SECRETVALUE' }
+ },
+ ];
+
+ const config = {
+ AUTH0_INPUT_FILE: dir,
+ AUTH0_KEYWORD_REPLACE_MAPPINGS: { SECRETS: { name: 'SECRETNAME', value: 'SECRETVALUE' } },
+ AUTH0_PRESERVE_KEYWORDS: true,
+ };
+ const context = new Context(config, mockMgmtClient());
+ await context.loadAssetsFromLocal();
+ expect(context.assets.actions).to.deep.equal(target);
+ });
 });