Merge remote-tracking branch 'internal/main'

CHANGELOG.md

@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 ### Fixes
 
 - Fixed an issue causing the VPN Server page to crash when opening the creation modal
+- Fixed an issue causing Secrets Manager data sources to always be invalid on validation
 
 ## 1.12.0
 

client/src/components/pages/ImportJson.js

@@ -69,7 +69,7 @@ class ImportJson extends React.Component {
   }
 
   handleSubmit() {
-    this.props.craig.hardSetJson(this.state.validJson, this.props.slz);
+    this.props.craig.hardSetJson(this.state.validJson, true);
     this.toggleModal();
     window.location.pathname = contains(window.location.pathname, "/v2")
       ? "/v2/services"

client/src/lib/docs/release-notes.json

@@ -3,7 +3,8 @@
     "version": "1.12.1",
     "features": ["Users can now use the `Trial` plan for secrets manager"],
     "fixes": [
-      "Fixed an issue causing the VPN Server page to crash when opening the creation modal"
+      "Fixed an issue causing the VPN Server page to crash when opening the creation modal",
+      "Fixed an issue causing Secrets Manager data sources to always be invalid on validation"
     ],
     "upgrade_notes": []
   },

client/src/lib/validate.js

@@ -348,8 +348,6 @@ const validate = function (json) {
     nullResourceGroupTest("Secrets Manager", instance, {
       overrideName: "Secrets Manager Resource Group",
     });
-    nullEncryptionKeyTest("Secrets Manager", instance, {}, "encryption_key");
-    validationTest("Secrets Manager", instance, "Key Management", "kms"); // check for null kms
   });
 
   // event streams

unit-tests/validate.test.js

@@ -1137,44 +1137,6 @@ describe("validate", () => {
       };
       assert.doesNotThrow(task);
     });
-    it("should throw an error if no encryption key", () => {
-      let testData = minimumValidJson({
-        secrets_manager: [
-          {
-            name: "asdf",
-            resource_group: "hi",
-            use_secrets_manager: true,
-            kms: "kms",
-          },
-        ],
-      });
-      let task = () => {
-        validate(testData);
-      };
-      assert.throws(
-        task,
-        "Secrets Manager requires a encryption key, encryption_key missing from JSON."
-      );
-    });
-    it("should throw an error if no kms", () => {
-      let testData = minimumValidJson({
-        secrets_manager: [
-          {
-            name: "asdf",
-            resource_group: "hi",
-            encryption_key: "key",
-            use_secrets_manager: true,
-          },
-        ],
-      });
-      let task = () => {
-        validate(testData);
-      };
-      assert.throws(
-        task,
-        "Secrets Manager requires a Key Management, kms missing from JSON."
-      );
-    });
   });
   describe("event_streams", () => {
     it("should throw an error if no resource group", () => {