upgrade openapi plugin to 5.2.0 (#5039)

airbytehq · Jul 28, 2021 · 1353c82 · 1353c82
1 parent 283731b
commit 1353c82
Show file tree

Hide file tree

Showing 4 changed files with 163 additions and 122 deletions.
diff --git a/airbyte-api/build.gradle b/airbyte-api/build.gradle
@@ -1,7 +1,7 @@
 import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
 plugins {
-    id "org.openapi.generator" version "5.0.0-beta"
+    id "org.openapi.generator" version "5.2.0"
     id "java-library"
 }
 

diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml
@@ -1687,17 +1687,21 @@ components:
         connectionConfiguration:
           $ref: "#/components/schemas/SourceConfiguration"
     SourceCreate:
-      allOf:
-        - $ref: "#/components/schemas/SourceCoreConfig"
-        - type: object
-          required:
-            - workspaceId
-            - name
-          properties:
-            workspaceId:
-              $ref: "#/components/schemas/WorkspaceId"
-            name:
-              type: string
+      type: object
+      required:
+        - workspaceId
+        - name
+        - sourceDefinitionId
+        - connectionConfiguration
+      properties:
+        sourceDefinitionId:
+          $ref: "#/components/schemas/SourceDefinitionId"
+        connectionConfiguration:
+          $ref: "#/components/schemas/SourceConfiguration"
+        workspaceId:
+          $ref: "#/components/schemas/WorkspaceId"
+        name:
+          type: string
     SourceRecreate:
       type: object
       required:
@@ -1894,17 +1898,22 @@ components:
         connectionConfiguration:
           $ref: "#/components/schemas/DestinationConfiguration"
     DestinationCreate:
-      allOf:
-        - $ref: "#/components/schemas/DestinationCoreConfig"
-        - type: object
-          required:
-            - workspaceId
-            - name
-          properties:
-            workspaceId:
-              $ref: "#/components/schemas/WorkspaceId"
-            name:
-              type: string
+      type: object
+      required:
+        - workspaceId
+        - name
+        - workspaceId
+        - destinationDefinitionId
+        - connectionConfiguration
+      properties:
+        workspaceId:
+          $ref: "#/components/schemas/WorkspaceId"
+        name:
+          type: string
+        destinationDefinitionId:
+          $ref: "#/components/schemas/DestinationDefinitionId"
+        connectionConfiguration:
+          $ref: "#/components/schemas/DestinationConfiguration"
     DestinationRecreate:
       type: object
       required:
@@ -2025,14 +2034,46 @@ components:
         resourceRequirements:
           $ref: "#/components/schemas/ResourceRequirements"
     WebBackendConnectionCreate:
-      allOf:
-        - $ref: "#/components/schemas/ConnectionCreate"
-        - type: object
-          properties:
-            operations:
-              type: array
-              items:
-                $ref: "#/components/schemas/OperationCreate"
+      type: object
+      required:
+        - connection
+        - sourceId
+        - destinationId
+        - status
+      properties:
+        name:
+          type: string
+          description: Optional name of the connection
+        namespaceDefinition:
+          $ref: "#/components/schemas/NamespaceDefinitionType"
+        namespaceFormat:
+          type: string
+          description: Used when namespaceDefinition is 'customformat'. If blank then behaves like namespaceDefinition = 'destination'. If "${SOURCE_NAMESPACE}" then behaves like namespaceDefinition = 'source'.
+          default: null
+          example: "${SOURCE_NAMESPACE}"
+        prefix:
+          type: string
+          description: Prefix that will be prepended to the name of each stream when it is written to the destination.
+        sourceId:
+          $ref: "#/components/schemas/SourceId"
+        destinationId:
+          $ref: "#/components/schemas/DestinationId"
+        operationIds:
+          type: array
+          items:
+            $ref: "#/components/schemas/OperationId"
+        syncCatalog:
+          $ref: "#/components/schemas/AirbyteCatalog"
+        schedule:
+          $ref: "#/components/schemas/ConnectionSchedule"
+        status:
+          $ref: "#/components/schemas/ConnectionStatus"
+        resourceRequirements:
+          $ref: "#/components/schemas/ResourceRequirements"
+        operations:
+          type: array
+          items:
+            $ref: "#/components/schemas/OperationCreate"
     ConnectionUpdate:
       type: object
       required:
@@ -2065,16 +2106,42 @@ components:
         resourceRequirements:
           $ref: "#/components/schemas/ResourceRequirements"
     WebBackendConnectionUpdate:
-      allOf:
-        - $ref: "#/components/schemas/ConnectionUpdate"
-        - type: object
-          properties:
-            withRefreshedCatalog:
-              type: boolean
-            operations:
-              type: array
-              items:
-                $ref: "#/components/schemas/WebBackendOperationCreateOrUpdate"
+      type: object
+      required:
+        - connectionId
+        - syncCatalog
+        - status
+      properties:
+        connectionId:
+          $ref: "#/components/schemas/ConnectionId"
+        namespaceDefinition:
+          $ref: "#/components/schemas/NamespaceDefinitionType"
+        namespaceFormat:
+          type: string
+          description: Used when namespaceDefinition is 'customformat'. If blank then behaves like namespaceDefinition = 'destination'. If "${SOURCE_NAMESPACE}" then behaves like namespaceDefinition = 'source'.
+          default: null
+          example: "${SOURCE_NAMESPACE}"
+        prefix:
+          type: string
+          description: Prefix that will be prepended to the name of each stream when it is written to the destination.
+        operationIds:
+          type: array
+          items:
+            $ref: "#/components/schemas/OperationId"
+        syncCatalog:
+          $ref: "#/components/schemas/AirbyteCatalog"
+        schedule:
+          $ref: "#/components/schemas/ConnectionSchedule"
+        status:
+          $ref: "#/components/schemas/ConnectionStatus"
+        resourceRequirements:
+          $ref: "#/components/schemas/ResourceRequirements"
+        withRefreshedCatalog:
+          type: boolean
+        operations:
+          type: array
+          items:
+            $ref: "#/components/schemas/WebBackendOperationCreateOrUpdate"
     ConnectionRead:
       type: object
       required: