From 4910f2502b46a3e557303f3e19f0b2bc19cdc386 Mon Sep 17 00:00:00 2001 From: terencecho Date: Mon, 25 Jul 2022 09:38:11 -0700 Subject: [PATCH] Add source type to SourceDefinitionRead (#14967) --- airbyte-api/src/main/openapi/config.yaml | 7 +++++++ .../handlers/SourceDefinitionsHandler.java | 9 +++++++++ .../api/generated-api-html/index.html | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml index 8ffbe74438c38..da65057ffdba2 100644 --- a/airbyte-api/src/main/openapi/config.yaml +++ b/airbyte-api/src/main/openapi/config.yaml @@ -2584,6 +2584,13 @@ components: description: The date when this connector was first released, in yyyy-mm-dd format. type: string format: date + sourceType: + type: string + enum: + - api + - file + - database + - custom resourceRequirements: $ref: "#/components/schemas/ActorDefinitionResourceRequirements" SourceDefinitionReadList: diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceDefinitionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceDefinitionsHandler.java index 8462d68fd2845..67ca7c9ea430b 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceDefinitionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceDefinitionsHandler.java @@ -16,6 +16,7 @@ import io.airbyte.api.model.generated.SourceDefinitionIdRequestBody; import io.airbyte.api.model.generated.SourceDefinitionIdWithWorkspaceId; import io.airbyte.api.model.generated.SourceDefinitionRead; +import io.airbyte.api.model.generated.SourceDefinitionRead.SourceTypeEnum; import io.airbyte.api.model.generated.SourceDefinitionReadList; import io.airbyte.api.model.generated.SourceDefinitionUpdate; import io.airbyte.api.model.generated.SourceRead; @@ -78,6 +79,7 @@ static SourceDefinitionRead buildSourceDefinitionRead(final StandardSourceDefini return new SourceDefinitionRead() .sourceDefinitionId(standardSourceDefinition.getSourceDefinitionId()) .name(standardSourceDefinition.getName()) + .sourceType(getSourceType(standardSourceDefinition)) .dockerRepository(standardSourceDefinition.getDockerRepository()) .dockerImageTag(standardSourceDefinition.getDockerImageTag()) .documentationUrl(new URI(standardSourceDefinition.getDocumentationUrl())) @@ -91,6 +93,13 @@ static SourceDefinitionRead buildSourceDefinitionRead(final StandardSourceDefini } } + private static SourceTypeEnum getSourceType(final StandardSourceDefinition standardSourceDefinition) { + if (standardSourceDefinition.getSourceType() == null) { + return null; + } + return SourceTypeEnum.fromValue(standardSourceDefinition.getSourceType().value()); + } + private static ReleaseStage getReleaseStage(final StandardSourceDefinition standardSourceDefinition) { if (standardSourceDefinition.getReleaseStage() == null) { return null; diff --git a/docs/reference/api/generated-api-html/index.html b/docs/reference/api/generated-api-html/index.html index 95e5d7e7f7d49..f9d3586809482 100644 --- a/docs/reference/api/generated-api-html/index.html +++ b/docs/reference/api/generated-api-html/index.html @@ -4266,6 +4266,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -6739,6 +6740,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -6823,6 +6825,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7003,6 +7006,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7090,6 +7094,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7178,6 +7183,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7256,6 +7262,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7287,6 +7294,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7371,6 +7379,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7405,6 +7414,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7478,6 +7488,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7509,6 +7520,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7592,6 +7604,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7623,6 +7636,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7753,6 +7767,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -7840,6 +7855,7 @@

Example data

"documentationUrl" : "https://openapi-generator.tech", "dockerImageTag" : "dockerImageTag", "releaseDate" : "2000-01-23", + "sourceType" : "api", "dockerRepository" : "dockerRepository", "name" : "name", "icon" : "icon", @@ -11730,6 +11746,9 @@

SourceDefinitionRead - icon (optional)
releaseStage (optional)
releaseDate (optional)
date The date when this connector was first released, in yyyy-mm-dd format. format: date
+
sourceType (optional)
+
Enum:
+
api
file
database
custom
resourceRequirements (optional)