fix(webseal): optional namespace in dev (#127)

SocialGouv · Oct 24, 2022 · fea4890 · fea4890
1 parent 4ccd68c
commit fea4890
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 234 deletions.
diff --git a/packages/webseal/src/App.js b/packages/webseal/src/App.js
@@ -88,22 +88,25 @@ const Editor = () => {
     if (data.value && data.value !== formData.value) {
       const pemKey = certificates[data.cluster];
       const values = parseClearText(data.value);
-      const sealedSecret = await getSealedSecret({
-        pemKey,
-        namespace: data.namespace || null,
-        name: data.name || "some-secret-name",
-        scope: data.scope,
-        values,
-      });
-      if (!data.namespace || !data.name) {
+
+      if ((data.cluster === "prod" && !data.namespace) || !data.name) {
         console.log("namespace and name are mandatory");
         setYamlResult("");
         setEncrypted("");
+        return;
       } else if (!data.value) {
         console.log("value is mandatory");
         setYamlResult("");
         setEncrypted("");
+        return;
       } else {
+        const sealedSecret = await getSealedSecret({
+          pemKey,
+          namespace: data.namespace || null,
+          name: data.name || "some-secret-name",
+          scope: data.scope,
+          values,
+        });
         const keys = Object.keys(values);
         if (keys.length === 1) {
           setEncrypted(sealedSecret.spec.encryptedData[keys[0]]);

diff --git a/packages/webseal/src/Form.js b/packages/webseal/src/Form.js
@@ -99,8 +99,8 @@ export const Form = ({ onSubmit, initialFormData }) => {
                 onChange={(e) => {
                   setValue("cluster", e.target.value);
                   setValue("scope", "cluster");
-                  setValue("namespace", undefined);
-                  setValue("name", undefined);
+                  // setValue("namespace", undefined);
+                  // setValue("name", undefined);
                   trigger();
                 }}
               />
@@ -157,14 +157,16 @@ export const Form = ({ onSubmit, initialFormData }) => {
         </Col>
       </Row>
       <BsForm.Group as={Row}>
-        <BsForm.Label column>Namespace *</BsForm.Label>
+        <BsForm.Label column>
+          Namespace {cluster === "prod" ? "*" : ""}
+        </BsForm.Label>
         <Col sm="9">
           <BsForm.Control
             name="namespace"
             {...register("namespace", { required: true })}
             required
             type="text"
-            placeholder="K8s Namespace"
+            placeholder="K8s Namespace (optional in dev)"
           />
         </Col>
       </BsForm.Group>