fix: Fixed tests and bugs

Author: kevinwang5658

src/messages/import-request-data-schema.json

@@ -4,18 +4,12 @@
   "title": "Import Request Schema Data",
   "type": "object",
   "properties": {
-    "config": {
-      "type": "object",
-      "properties": {
-        "core": {
-          "$ref": "resource-schema.json"
-        },
-        "parameters": {
-          "type": "object"
-        }
-      },
-      "required": ["core", "parameters"]
+    "core": {
+      "$ref": "resource-schema.json"
+    },
+    "parameters": {
+      "type": "object"
     }
   },
-  "required": ["config"]
+  "required": ["core", "parameters"]
 }

src/messages/import-request-data-schema.test.ts

@@ -17,30 +17,34 @@ describe('Import request data schema', () => {
   it("Validates correct data", () => {
     const validate = ajv.compile(schema);
     expect(validate({
-      config: {
+      core: {
         type: "type"
       },
+      parameters: {},
     })).to.be.true;
     expect(validate({
-      config: {
+      core: {
         type: "type",
         name: "name",
+      },
+      parameters: {
         propA: "a",
         propB: { a: 'b' }
       },
     })).to.be.true;
     expect(validate({
-      config: {
+      core: {
         type: "type",
         dependsOn: ["a", "b"]
       },
+      parameters: {},
     })).to.be.true;
   })
 
   it("Errors on incorrect data", () => {
     const validate = ajv.compile(schema);
     expect(validate({
-      config: {},
+      core: {},
     })).to.be.false;
     expect(validate({})).to.be.false;
   })

src/messages/plan-request-data-schema.json

@@ -22,7 +22,7 @@
   },
   "additionalProperties": false,
   "anyOf": [
-    { "required": ["desired", "isStateful"] },
-    { "required": ["state", "isStateful"] }
+    { "required": ["core", "desired", "isStateful"] },
+    { "required": ["core", "state", "isStateful"] }
   ]
 }

src/messages/plan-request-data-schema.test.ts

@@ -17,23 +17,22 @@ describe('Plan request data schema', () => {
   it("It accepts either state, desired or both", () => {
     const validate = ajv.compile(schema);
     expect(validate({
-      desired: {
-        type: "type"
-      },
+      core: { type: "type" },
+      desired: {},
       isStateful: false
     })).to.be.true;
     expect(validate({
-      state: {
-        type: "type"
-      },
+      core: { type: "type" },
+      state: {},
       isStateful: false
     })).to.be.true;
     expect(validate({
+      core: { type: "type" },
       desired: {
-        type: "type"
+        parameter1: 'a'
       },
       state: {
-        type: "type"
+        parameter2: 'b'
       },
       isStateful: false
     })).to.be.true;
@@ -43,22 +42,34 @@ describe('Plan request data schema', () => {
   it ("name and type are alpha-numeric and follow variable naming conventions", () => {
     const validate = ajv.compile(schema);
     expect(validate({
-      desired: { type: "a234abcDEF_-" },
+      core: { type: "a234abcDEF_-" },
+      desired: { },
       isStateful: false
     })).to.be.true;
+
     expect(validate({
+      core: { type: "234" },
       desired: { type: "234" },
       isStateful: false
     })).to.be.false;
+
     expect(validate({
-      desired: { type: "ABCDEF$" },
+      core: { type: "ABCDEF$" },
+      desired: { },
       isStateful: false
     })).to.be.false;
 
     expect(validate({
-      desired: { type: "type", name: "a234abcDEF_-" },
+      core: { type: "type", name: "a234abcDEF_-" },
+      desired: {  },
       isStateful: false
     })).to.be.true;
+    expect(validate({
+      core: { type: "type", name: "ABCDEF$" },
+      desired: {},
+      isStateful: false
+    })).to.be.false;
+
     expect(validate({
       desired: { type: "type", name: "ABCDEF$" },
       isStateful: false