More integration work for Image Sources (#311)

* More integration work for Image Sources - add to post/patch - add to stack spec * update hybrid identifier
cycleplatform · Feb 27, 2024 · 5383229 · 5383229
1 parent 2e23502
commit 5383229
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/components/schemas/HybridIdentifer.yml b/components/schemas/HybridIdentifer.yml
@@ -0,0 +1,5 @@
+---
+title: HybridIdentifier
+type: string
+description: Either a resource ID (objectid - i.e. 651586fca6078e98982dbd90) or a resource Identifier (human-readable)
+example: my-image-source
diff --git a/components/schemas/images/Image.yml b/components/schemas/images/Image.yml
@@ -78,7 +78,7 @@ properties:
     properties: 
       integration_id: 
         description: The ID of the Integration used to do the build.
-        $ref: ../ID.yml
+        $ref: ../HybridIdentifer.yml
   config:
     type: object
     description: Configuration settings for the image.

diff --git a/components/schemas/images/sources/ImageSource.yml b/components/schemas/images/sources/ImageSource.yml
@@ -36,8 +36,8 @@ properties:
       - integration_id
     properties:
       integration_id:
-        description: The ID of the Integration used to do the build.
-        $ref: ../../ID.yml
+        description: The ID or Identifier of the Integration used to do the build.
+        $ref: ../../HybridIdentifer.yml
   creator:
     "$ref": "../../creators/CreatorScope.yml"
   state:

diff --git a/components/schemas/stacks/spec/StackSpecContainerImage.yml b/components/schemas/stacks/spec/StackSpecContainerImage.yml
@@ -19,3 +19,11 @@ properties:
         type: object
         additionalProperties:
           type: string
+  builder:
+    type: object
+    nullable: true
+    required:
+      - integration_id
+    properties:
+      integration_id:
+        $ref: ../../../../components/schemas/HybridIdentifer.yml
diff --git a/public/paths/images/sources/source.yml b/public/paths/images/sources/source.yml
@@ -82,6 +82,14 @@ patch:
               description: A name for the image source.
             origin:
               $ref: "../../../../components/schemas/images/origins/ImageOrigin.yml"
+            builder:
+              type: object
+              nullable: true
+              required:
+                - integration_id
+              properties:
+                integration_id:
+                  $ref: ../../../../components/schemas/HybridIdentifer.yml
             about:
               type: object
               description: User defined information about the image source.

diff --git a/public/paths/images/sources/sources.yml b/public/paths/images/sources/sources.yml
@@ -100,6 +100,14 @@ post:
               description: A name for the image source.
             identifier:
               $ref: ../../../../components/schemas/Identifier.yml
+            builder:
+              type: object
+              nullable: true
+              required:
+                - integration_id
+              properties:
+                integration_id:
+                  $ref: ../../../../components/schemas/HybridIdentifer.yml
             type:
               $ref: ../../../../components/schemas/images/sources/ImageSourceType.yml
             origin: