Merge branch '6.2-dev' into 6.3-dev

gomorpheus · Nov 10, 2023 · edfe114 · edfe114
2 parents f6d6218 + f66fd1c
commit edfe114
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 9 deletions.
diff --git a/components/schemas/catalogItemTypeBlueprintCreate.yaml b/components/schemas/catalogItemTypeBlueprintCreate.yaml
@@ -53,9 +53,25 @@ properties:
   appSpec: 
     type: string
     description: The appSpec for blueprint type catalog items is a string in the Scribe YAML format with fields 
+  formType: 
+    type: string
+    default: optionTypes
+    description: Form Type determines if the configuration options come from a Form (form) or a list of Inputs (optionTypes).
+    enum:
+      - optionTypes
+      - form
+  form:
+    type: object
+    description: Object containing the form id. Only applies to formType 'form'.
+    properties: 
+      id: 
+        type: integer
+        format: int64
+        description: Form ID
+    nullable: true
   optionTypes: 
     type: array
-    description: Array of option type IDs, see Inputs. Only applies to type instance and blueprint.
+    description: Array of option type IDs, see Inputs. Only applies to formType 'optionTypes'.
     items:
       type: integer
       format: int64
diff --git a/components/schemas/catalogItemTypeBlueprintUpdate.yaml b/components/schemas/catalogItemTypeBlueprintUpdate.yaml
@@ -60,9 +60,25 @@ properties:
   appSpec: 
     type: string
     description: The appSpec for blueprint type catalog items is a string in the Scribe YAML format with fields 
+  formType: 
+    type: string
+    default: optionTypes
+    description: Form Type determines if the configuration options come from a Form (form) or a list of Inputs (optionTypes).
+    enum:
+      - optionTypes
+      - form
+  form:
+    type: object
+    description: Object containing the form id. Only applies to formType 'form'.
+    properties: 
+      id: 
+        type: integer
+        format: int64
+        description: Form ID
+    nullable: true
   optionTypes: 
     type: array
-    description: Array of option type IDs, see Inputs. Only applies to type instance and blueprint.
+    description: Array of option type IDs, see Inputs. Only applies to formType 'optionTypes'.
     items:
       type: integer
       format: int64
diff --git a/components/schemas/catalogItemTypeCreate.yaml b/components/schemas/catalogItemTypeCreate.yaml
@@ -108,12 +108,13 @@ properties:
       - form
   form:
     type: object
-    description: Object containing the form id. Only applies to formType 'form' and to type instance and blueprint.
+    description: Object containing the form id. Only applies to formType 'form'.
     properties: 
       id: 
         type: integer
         format: int64
         description: Form ID
+      nullable: true
   optionTypes: 
     type: array
     items: 

diff --git a/components/schemas/catalogItemTypeInstanceCreate.yaml b/components/schemas/catalogItemTypeInstanceCreate.yaml
@@ -64,7 +64,7 @@ properties:
       - form
   form:
     type: object
-    description: Object containing the form id. Only applies to formType 'form' and to type instance and blueprint.
+    description: Object containing the form id. Only applies to formType 'form'.
     properties: 
       id: 
         type: integer
@@ -73,7 +73,7 @@ properties:
     nullable: true
   optionTypes: 
     type: array
-    description: Array of option type IDs. Only applies to formType 'optionTypes' and to type instance and blueprint.
+    description: Array of option type IDs. Only applies to formType 'optionTypes'.
     items: 
       type: integer
       format: int64

diff --git a/components/schemas/catalogItemTypeInstanceUpdate.yaml b/components/schemas/catalogItemTypeInstanceUpdate.yaml
@@ -62,7 +62,7 @@ properties:
       - form
   form:
     type: object
-    description: Object containing the form id. Only applies to formType 'form' and to type instance and blueprint.
+    description: Object containing the form id. Only applies to formType 'form'.
     properties: 
       id: 
         type: integer
@@ -71,7 +71,10 @@ properties:
     nullable: true
   optionTypes: 
     type: array
-    description: Array of option type IDs. Only applies to type instance and blueprint.
+    description: Array of option type IDs. Only applies to formType 'optionTypes'.
     items: 
       type: integer
       format: int64
+  content:
+    type: string
+    description: Documentation content for this Catalog Item. Markdown-formatted text is accepted and displayed appropriately when the item is ordered from the Service Catalog. A new Catalog Item-type Wiki entry will also be added containing this information.
diff --git a/components/schemas/catalogItemTypeWorkflowCreate.yaml b/components/schemas/catalogItemTypeWorkflowCreate.yaml
@@ -65,4 +65,29 @@ properties:
       - appliance
   workflowConfig:
     type: string
-    description: Configuration object that contains settings for the workflow.
+    description: Configuration object that contains settings for the workflow.
+  formType: 
+    type: string
+    default: optionTypes
+    description: Form Type determines if the configuration options come from a Form (form) or a list of Inputs (optionTypes).
+    enum:
+      - optionTypes
+      - form
+  form:
+    type: object
+    description: Object containing the form id. Only applies to formType 'form'.
+    properties: 
+      id: 
+        type: integer
+        format: int64
+        description: Form ID
+    nullable: true
+  optionTypes: 
+    type: array
+    description: Array of option type IDs. Only applies to formType 'optionTypes'.
+    items: 
+      type: integer
+      format: int64
+  content:
+    type: string
+    description: Documentation content for this Catalog Item. Markdown-formatted text is accepted and displayed appropriately when the item is ordered from the Service Catalog. A new Catalog Item-type Wiki entry will also be added containing this information.
diff --git a/components/schemas/catalogItemTypeWorkflowUpdate.yaml b/components/schemas/catalogItemTypeWorkflowUpdate.yaml
@@ -56,6 +56,36 @@ properties:
         format: int64
   context: 
     type: string
+    description: Context for running the workflow, determines if a target resource must be selected.
+    enum:
+      - instance
+      - server
+      - appliance
   workflowConfig:
     type: string
-    description: Configuration object that contains settings for the workflow.
+    description: Configuration object that contains settings for the workflow.
+  formType: 
+    type: string
+    default: optionTypes
+    description: Form Type determines if the configuration options come from a Form (form) or a list of Inputs (optionTypes).
+    enum:
+      - optionTypes
+      - form
+  form:
+    type: object
+    description: Object containing the form id. Only applies to formType 'form'.
+    properties: 
+      id: 
+        type: integer
+        format: int64
+        description: Form ID
+    nullable: true
+  optionTypes: 
+    type: array
+    description: Array of option type IDs. Only applies to formType 'optionTypes'.
+    items: 
+      type: integer
+      format: int64
+  content:
+    type: string
+    description: Documentation content for this Catalog Item. Markdown-formatted text is accepted and displayed appropriately when the item is ordered from the Service Catalog. A new Catalog Item-type Wiki entry will also be added containing this information.