Merge branch '6.0-dev' into 6.2-dev

gomorpheus · Nov 28, 2023 · 2320039 · 2320039
2 parents 01ecb36 + 139f581
commit 2320039
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/components/examples/integrationSNOW.json b/components/examples/integrationSNOW.json
@@ -27,6 +27,7 @@
             "webServiceImportUrl": "/api/x_moda_morpheus_ca/morpheus_ci_bulk_insert",
             "webServiceImportSysId": "5b08034bcb3e",
             "webServiceOperationUrl": "/api/moda/morpheus_ci_bulk_insert",
+            "cmdbMode": "TABLE",
             "preparedForSync": true
         },
         "status": "ok",

diff --git a/components/examples/integrationSNOWSuccess.json b/components/examples/integrationSNOWSuccess.json
@@ -28,6 +28,7 @@
             "webServiceImportUrl": "/api/x_moda_morpheus_ca/morpheus_ci_bulk_insert",
             "webServiceImportSysId": "5b08034bcb3e",
             "webServiceOperationUrl": "/api/moda/morpheus_ci_bulk_insert",
+            "cmdbMode": "TABLE",
             "preparedForSync": true
         },
         "status": "ok",

diff --git a/components/schemas/integrationSNOW.yaml b/components/schemas/integrationSNOW.yaml
@@ -55,6 +55,12 @@ properties:
         type: string
       webServiceOperationUrl: 
         type: string
+      cmdbMode:
+        type: string
+        default: TABLE
+        enum: 
+        - TABLE
+        - IRE
       preparedForSync: 
         type: boolean
   status: 

diff --git a/components/schemas/integrationSNOWConfig.yaml b/components/schemas/integrationSNOWConfig.yaml
@@ -57,4 +57,10 @@ properties:
           ignoreCertErrors:
             type: boolean
             description: Ignore SSL Errors.
-            default: false
+            default: false
+          cmdbMode:
+            type: string 
+            default: TABLE
+            enum: 
+            - TABLE
+            - IRE