factorize common part in helm port

Qovery · Sep 3, 2024 · 793f535 · 793f535
1 parent 37c7244
commit 793f535
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 109 deletions.
diff --git a/openapi.yaml b/openapi.yaml
@@ -15745,6 +15745,33 @@ components:
               description: Icon URI representing the helm service.
               x-stoplight:
                 id: 117p5u95nwx2p
+    HelmPortResponseCommonProperties:
+      type: object
+      required:
+        - id
+        - internal_port
+        - protocol
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+        internal_port:
+          type: integer
+          example: 8080
+          description: The listening port of your service.
+        external_port:
+          type: integer
+          example: 8080
+          description: The exposed port for your service. This is optional. If not set, a default port will be used.
+        namespace:
+          type: string
+        protocol:
+          $ref: '#/components/schemas/HelmPortProtocolEnum'
+        is_default:
+          type: boolean
+          description: is the default port to use for domain
     HelmResponse:
       allOf:
         - $ref: '#/components/schemas/Base'
@@ -15787,66 +15814,24 @@ components:
               type: array
               items:
                 oneOf:
-                  - type: object
-                    required:
-                      - id
-                      - internal_port
-                      - protocol
-                      - service_name
-                    properties:
-                      id:
-                        type: string
-                        format: uuid
-                      name:
-                        type: string
-                      internal_port:
-                        type: integer
-                        example: 8080
-                        description: The listening port of your service.
-                      external_port:
-                        type: integer
-                        example: 8080
-                        description: The exposed port for your service. This is optional. If not set a default port will be used.
-                      service_name:
-                        type: string
-                      namespace:
-                        type: string
-                      protocol:
-                        $ref: '#/components/schemas/HelmPortProtocolEnum'
-                      is_default:
-                        type: boolean
-                        description: is the default port to use for domain
-                  - type: object
-                    required:
-                      - id
-                      - internal_port
-                      - protocol
-                      - service_selectors
-                    properties:
-                      id:
-                        type: string
-                        format: uuid
-                      name:
-                        type: string
-                      internal_port:
-                        type: integer
-                        example: 8080
-                        description: The listening port of your service.
-                      external_port:
-                        type: integer
-                        example: 8080
-                        description: The exposed port for your service. This is optional. If not set a default port will be used.
-                      service_selectors:
-                        type: array
-                        items:
-                          $ref: '#/components/schemas/KubernetesSelector'
-                      namespace:
-                        type: string
-                      protocol:
-                        $ref: '#/components/schemas/HelmPortProtocolEnum'
-                      is_default:
-                        type: boolean
-                        description: is the default port to use for domain
+                  - allOf:
+                      - $ref: '#/components/schemas/HelmPortResponseCommonProperties'
+                      - type: object
+                        required:
+                          - service_name
+                        properties:
+                          service_name:
+                            type: string
+                  - allOf:
+                      - $ref: '#/components/schemas/HelmPortResponseCommonProperties'
+                      - type: object
+                        required:
+                          - service_selectors
+                        properties:
+                          service_selectors:
+                            type: array
+                            items:
+                              $ref: '#/components/schemas/KubernetesSelector'
             source:
               nullable: false
               oneOf:
@@ -16055,61 +16040,49 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/HelmDeploymentRestrictionResponse'
+    HelmPortRequestCommonProperties:
+      type: object
+      required:
+        - internal_port
+      properties:
+        name:
+          type: string
+        internal_port:
+          type: integer
+          example: 8080
+          description: The listening port of your service.
+        external_port:
+          type: integer
+          example: 8080
+          description: The exposed port for your service. This is optional. If not set, a default port will be used.
+        namespace:
+          type: string
+        protocol:
+          $ref: '#/components/schemas/HelmPortProtocolEnum'
+        is_default:
+          type: boolean
+          description: is the default port to use for domain
     HelmPortRequest:
       type: object
       properties:
         ports:
           type: array
           items:
             oneOf:
-              - type: object
-                required:
-                  - internal_port
-                properties:
-                  name:
-                    type: string
-                  internal_port:
-                    type: integer
-                    example: 8080
-                    description: The listening port of your service.
-                  external_port:
-                    type: integer
-                    example: 8080
-                    description: The exposed port for your service. This is optional. If not set a default port will be used.
-                  service_name:
-                    type: string
-                  namespace:
-                    type: string
-                  protocol:
-                    $ref: '#/components/schemas/HelmPortProtocolEnum'
-                  is_default:
-                    type: boolean
-                    description: is the default port to use for domain
-              - type: object
-                required:
-                  - internal_port
-                properties:
-                  name:
-                    type: string
-                  internal_port:
-                    type: integer
-                    example: 8080
-                    description: The listening port of your service.
-                  external_port:
-                    type: integer
-                    example: 8080
-                    description: The exposed port for your service. This is optional. If not set a default port will be used.
-                  service_selectors:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/KubernetesSelector'
-                  namespace:
-                    type: string
-                  protocol:
-                    $ref: '#/components/schemas/HelmPortProtocolEnum'
-                  is_default:
-                    type: boolean
-                    description: is the default port to use for domain
+              - allOf:
+                  - $ref: '#/components/schemas/HelmPortRequestCommonProperties'
+                  - type: object
+                    properties:
+                      service_name:
+                        type: string
+              - allOf:
+                  - $ref: '#/components/schemas/HelmPortRequestCommonProperties'
+                  - type: object
+                    properties:
+                      service_selectors:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/KubernetesSelector'
     HelmForceEvent:
       type: string
       enum:

diff --git a/openapitools.json b/openapitools.json
@@ -2,6 +2,6 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.0.1"
+    "version": "7.6.0"
   }
 }