diff --git a/src/renderer/components/+config-secrets/secret-key.tsx b/src/renderer/components/+config-secrets/secret-key.tsx index d91a5dadc7..7bcc3bd87f 100644 --- a/src/renderer/components/+config-secrets/secret-key.tsx +++ b/src/renderer/components/+config-secrets/secret-key.tsx @@ -10,15 +10,15 @@ import { Icon } from "../icon"; export interface SecretKeyProps { secret: Secret; - key: string; + field: string; } -export const SecretKey = ({ secret, key }: SecretKeyProps) => { +export const SecretKey = ({ secret, field }: SecretKeyProps) => { const [showValue, setShowValue] = useState(false); const showKey = () => setShowValue(true); - const value = secret?.data?.[key]; + const value = secret?.data?.[field]; if (showValue && value) { return <>{base64.decode(value)}; @@ -26,7 +26,7 @@ export const SecretKey = ({ secret, key }: SecretKeyProps) => { return ( <> - {`secretKeyRef(${name}.${key})`} + {`secretKeyRef(${secret.getName()}.${field})`}   renders 1`] = ` `; - -exports[` renders both env and configMapRef envFrom 1`] = ` - -
-
- - Environment - - -
- - foobar - - = - https://localhost:12345 -
-
- - configFoo - - = - configBar -
- -
-
- -`; - -exports[` renders env 1`] = ` - -
-
- - Environment - - -
- - foobar - - = - https://localhost:12345 -
- -
-
- -`; - -exports[` renders env 2`] = ` - -
-
- - Environment - - -
- - foobar - - = - https://localhost:12345 -
- -
-
- -`; - -exports[` renders envFrom when given a configMapRef 1`] = ` - -
-
- - Environment - - -
- - configFoo - - = - configBar -
- -
-
- -`; - -exports[` renders envFrom when given a secretRef 1`] = ` - -
-
- - Environment - - -
-
- -`; diff --git a/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx b/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx index 471d61313c..2e054ab760 100644 --- a/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx +++ b/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx @@ -87,7 +87,7 @@ describe("", () => { }); const result = render(); - expect(result.baseElement).toMatchSnapshot(); + expect(result.getByTestId("env-foobar").innerHTML).toBe(`foobar= https://localhost:12345`); }); it("renders envFrom when given a configMapRef", () => { @@ -136,7 +136,7 @@ describe("", () => { }); const result = render(); - expect(result.baseElement).toMatchSnapshot(); + expect(result.getByTestId("envFrom-configmap-my-config-map").innerHTML).toBe(`configFoo= configBar`); }); it("renders envFrom when given a secretRef", () => { @@ -155,6 +155,9 @@ describe("", () => { uid: "237", }, type: SecretType.BasicAuth, + data: { + bar: "bat", + }, }); }); @@ -183,7 +186,7 @@ describe("", () => { }); const result = render(); - expect(result.baseElement).toMatchSnapshot(); + expect(result.getByTestId("envFrom-secret-my-secret-bar").innerHTML).toMatch(`bar= secretKeyRef(my-secret.bar)`); }); it("renders env", () => { @@ -211,7 +214,7 @@ describe("", () => { }); const result = render(); - expect(result.baseElement).toMatchSnapshot(); + expect(result.getByTestId("env-foobar").innerHTML).toBe(`foobar= https://localhost:12345`); }); it("renders both env and configMapRef envFrom", () => { @@ -264,6 +267,7 @@ describe("", () => { }); const result = render(); - expect(result.baseElement).toMatchSnapshot(); + expect(result.getByTestId("env-foobar").innerHTML).toBe(`foobar= https://localhost:12345`); + expect(result.getByTestId("envFrom-configmap-my-config-map").innerHTML).toBe(`configFoo= configBar`); }); }); diff --git a/src/renderer/components/+workloads-pods/pod-container-env.tsx b/src/renderer/components/+workloads-pods/pod-container-env.tsx index f32b562d81..336c5706e6 100644 --- a/src/renderer/components/+workloads-pods/pod-container-env.tsx +++ b/src/renderer/components/+workloads-pods/pod-container-env.tsx @@ -82,7 +82,7 @@ const NonInjectedContainerEnvironment = observer((props: ContainerEnvironmentPro secretValue = ( ); } @@ -99,7 +99,11 @@ const NonInjectedContainerEnvironment = observer((props: ContainerEnvironmentPro } return ( -
+
{name} {`= `} {secretValue} @@ -128,7 +132,11 @@ const NonInjectedContainerEnvironment = observer((props: ContainerEnvironmentPro if (!configMap) return null; return Object.entries(configMap.data).map(([name, value]) => ( -
+
{name} {`= `} {value} @@ -142,13 +150,17 @@ const NonInjectedContainerEnvironment = observer((props: ContainerEnvironmentPro if (!secret) return null; return Object.keys(secret.data) - .map(key => ( -
- {key} + .map(name => ( +
+ {name} {`= `}
));