Merge pull request #1148 from gperdomor/feature/fix-secret-files

fix(nx-container): fix secret-files interpolation
gperdomor · Oct 6, 2024 · 196ccf1 · 196ccf1
2 parents fb7adcd + 08b8f10
commit 196ccf1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/plugins/nx-container/jest.config.ts b/plugins/nx-container/jest.config.ts
@@ -19,10 +19,10 @@ if (swcJestConfig.swcrc === undefined) {
 export default {
   displayName: 'nx-container',
   preset: '../../jest.preset.js',
-  testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
+  testEnvironment: 'node',
   coverageDirectory: '../../coverage/plugins/nx-container',
 };
diff --git a/plugins/nx-container/src/executors/build/engines/docker/buildx.ts b/plugins/nx-container/src/executors/build/engines/docker/buildx.ts
@@ -1,10 +1,10 @@
 import * as core from '@nx-tools/core';
+import { interpolate } from '@nx-tools/core';
 import { parse } from 'csv-parse/sync';
 import fs from 'node:fs';
 import path from 'node:path';
 import * as semver from 'semver';
 import * as context from '../../context';
-import { interpolate } from '@nx-tools/core';
 
 export async function getImageIDFile(): Promise<string> {
   return path.join(context.tmpDir(), 'iidfile').split(path.sep).join(path.posix.sep);
@@ -61,13 +61,15 @@ export async function getSecret(kvp: string, file: boolean): Promise<string> {
     throw new Error(`${kvp} is not a valid secret`);
   }
 
+  const interpolated = interpolate(value);
+
   if (file) {
-    if (!fs.existsSync(value)) {
-      throw new Error(`secret file ${value} not found`);
+    if (!fs.existsSync(interpolated)) {
+      throw new Error(`secret file ${interpolated} not found`);
     }
-    value = fs.readFileSync(value, { encoding: 'utf-8' });
+    value = fs.readFileSync(interpolated, { encoding: 'utf-8' });
   } else {
-    value = interpolate(value);
+    value = interpolated;
   }
 
   const secretFile = context.tmpNameSync({

diff --git a/plugins/nx-container/src/executors/build/engines/podman/podman.ts b/plugins/nx-container/src/executors/build/engines/podman/podman.ts
@@ -1,10 +1,10 @@
 import * as core from '@nx-tools/core';
+import { interpolate } from '@nx-tools/core';
 import { parse } from 'csv-parse/sync';
 import fs from 'node:fs';
 import path from 'node:path';
 import * as semver from 'semver';
 import * as context from '../../context';
-import { interpolate } from '@nx-tools/core';
 
 export async function getImageIDFile(): Promise<string> {
   return path.join(context.tmpDir(), 'iidfile').split(path.sep).join(path.posix.sep);
@@ -61,13 +61,15 @@ export async function getSecret(kvp: string, file: boolean): Promise<string> {
     throw new Error(`${kvp} is not a valid secret`);
   }
 
+  const interpolated = interpolate(value);
+
   if (file) {
-    if (!fs.existsSync(value)) {
-      throw new Error(`secret file ${value} not found`);
+    if (!fs.existsSync(interpolated)) {
+      throw new Error(`secret file ${interpolated} not found`);
     }
-    value = fs.readFileSync(value, { encoding: 'utf-8' });
+    value = fs.readFileSync(interpolated, { encoding: 'utf-8' });
   } else {
-    value = interpolate(value);
+    value = interpolated;
   }
 
   const secretFile = context.tmpNameSync({