Merge branch 'main' into margaritagomez/destination-propel-icon

airbytehq · Feb 23, 2024 · c51aa68 · c51aa68
2 parents 856cf70 + e61e089
commit c51aa68
Show file tree

Hide file tree

Showing 265 changed files with 7,325 additions and 5,461 deletions.
diff --git a/.env b/.env
@@ -71,6 +71,9 @@ WORKLOAD_API_URL=http://workload-api-server:8007
 CONNECTOR_BUILDER_API_URL=/connector-builder-api
 AIRBYTE_API_HOST=airbyte-api-server:8006
 CONNECTOR_BUILDER_SERVER_API_HOST=http://airbyte-connector-builder-server:80
+# Replace with the commented-out line below to use a locally-run connector-builder-server
+# image, e.g. when developing the CDK's builder server command runner.
+# CONNECTOR_BUILDER_SERVER_API_HOST=http://host.docker.internal:80
 
 ### JOBS ###
 # Relevant to scaling.

diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ data
 .classpath
 .project
 .settings
-.vscode
+/.vscode
 **/gmon.out
 static_checker_reports/
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/.prettierignore b/.prettierignore
diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/netty/LoggingNettyChannelHandler.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/netty/LoggingNettyChannelHandler.kt
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory
 
 class LoggingNettyChannelHandler : ChannelDuplexHandler() {
   private val droppedText = "[...dropped...]"
+
   companion object {
     private val log = LoggerFactory.getLogger(LoggingNettyChannelHandler::class.java)
   }

diff --git a/airbyte-api/build.gradle b/airbyte-api/build.gradle
@@ -11,6 +11,7 @@ plugins {
 def specFile = "$projectDir/src/main/openapi/config.yaml"
 def airbyteApiSpecFile = "$projectDir/src/main/openapi/api.yaml"
 def airbyteApiSpecTemplateDirApi = "$projectDir/src/main/resources/templates/jaxrs-spec-api"
+def publicApiSpecTemplateDirApi = "$projectDir/src/main/resources/templates/jaxrs-spec-api/public_api"
 def workloadSpecFile = "$projectDir/src/main/openapi/workload-openapi.yaml"
 def connectorBuilderServerSpecFile = project(":airbyte-connector-builder-server").file("src/main/openapi/openapi.yaml").getPath()
 
@@ -202,6 +203,45 @@ def genApiDocs = tasks.register("generateApiDocs", GenerateTask) {
     ]
 }
 
+def genPublicApiServer = tasks.register('generatePublicApiServer', GenerateTask) {
+    def serverOutputDir = "$buildDir/generated/public_api/server"
+
+    inputs.file specFile
+    outputs.dir serverOutputDir
+
+    generatorName = "jaxrs-spec"
+    inputSpec = specFile
+    outputDir = serverOutputDir
+    templateDir = publicApiSpecTemplateDirApi
+
+    apiPackage = "io.airbyte.public-api.generated"
+    invokerPackage = "io.airbyte.public-api.invoker.generated"
+    modelPackage = "io.airbyte.public-api.model.generated"
+
+    generateApiDocumentation = false
+
+    configOptions = [
+            dateLibrary                   : "java8",
+            generatePom                   : "false",
+            interfaceOnly                 : "true",
+            returnResponse                : "true",
+            useBeanValidation             : "true",
+            performBeanValidation         : "true",
+            additionalModelTypeAnnotations: "@io.micronaut.core.annotation.Introspected",
+            additionalEnumTypeAnnotations : "@io.micronaut.core.annotation.Introspected",
+            useTags                       : "true"
+    ]
+
+    schemaMappings = [
+            'SourceConfiguration'          : 'com.fasterxml.jackson.databind.JsonNode',
+            'OAuthInputConfiguration'      : 'com.fasterxml.jackson.databind.JsonNode',
+            'OAuthCredentialsConfiguration': 'com.fasterxml.jackson.databind.JsonNode',
+            'DestinationConfiguration'     : 'com.fasterxml.jackson.databind.JsonNode',
+            'ConnectorBuilderProjectTestingValues': 'com.fasterxml.jackson.databind.JsonNode',
+    ]
+
+}
+
 def genAirbyteApiServer = tasks.register('generateAirbyteApiServer', GenerateTask) {
     def serverOutputDir = "$buildDir/generated/airbyte_api/server"
 
@@ -227,7 +267,7 @@ def genAirbyteApiServer = tasks.register('generateAirbyteApiServer', GenerateTas
             useBeanValidation             : "true",
             performBeanValidation         : "true",
             additionalModelTypeAnnotations: "@io.micronaut.core.annotation.Introspected",
-            additionalEnumTypeAnnotations : "@io.micronaut.core.annotation.Introspected"
+            additionalEnumTypeAnnotations : "@io.micronaut.core.annotation.Introspected",
     ]
 
     schemaMappings = [
@@ -329,7 +369,7 @@ def genConnectorBuilderServerApiClient = tasks.register("genConnectorBuilderServ
 }
 
 
-compileJava.dependsOn genApiDocs, genApiClient, genApiServer, genAirbyteApiServer
+compileJava.dependsOn genApiDocs, genApiClient, genApiServer, genAirbyteApiServer, genPublicApiServer
 
 kapt {
     correctErrorTypes true
@@ -338,7 +378,7 @@ kapt {
 // uses afterEvaluate because at configuration time, the kaptGenerateStubsKotlin task does not exist.
 afterEvaluate {
     tasks.named('kaptGenerateStubsKotlin').configure {
-        mustRunAfter genApiDocs, genApiClient, genApiClient2, genApiServer, genAirbyteApiServer,
+        mustRunAfter genApiDocs, genApiClient, genApiClient2, genApiServer, genAirbyteApiServer, genPublicApiServer,
                 genWorkloadApiClient, genConnectorBuilderServerApiClient
     }
 }
@@ -393,6 +433,7 @@ sourceSets {
         java {
             srcDirs "$buildDir/generated/api/server/src/gen/java",
                     "$buildDir/generated/airbyte_api/server/src/gen/java",
+                    "$buildDir/generated/public_api/server/src/gen/java",
                     "$buildDir/generated/api/client/src/main/java",
                     "$buildDir/generated/api/client2/src/main/kotlin",
                     "$buildDir/generated/workloadapi/client/src/main/kotlin",