Add WellKnownTypes to the Orchestrator (#21897)

* Add WellKnownTypes to the Orchestrator * Add comments
airbytehq · Jan 26, 2023 · fa24ad6 · fa24ad6
1 parent 4068bbe
commit fa24ad6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/airbyte-container-orchestrator/Dockerfile b/airbyte-container-orchestrator/Dockerfile
@@ -18,6 +18,9 @@ ENV AIRBYTE_ENTRYPOINT "/app/${APPLICATION}-${VERSION}/bin/${APPLICATION}"
 
 WORKDIR /app
 
+# Grab well-known types file
+COPY WellKnownTypes.json /app
+
 # Move orchestrator app
 ADD bin/${APPLICATION}-${VERSION}.tar /app
 

diff --git a/airbyte-container-orchestrator/build.gradle b/airbyte-container-orchestrator/build.gradle
@@ -1,3 +1,6 @@
+import groovy.json.JsonBuilder
+import groovy.yaml.YamlSlurper
+
 plugins {
     id 'application'
 }
@@ -54,6 +57,19 @@ application {
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
 
+// Duplicated from :airbyte-worker, eventually, this should be handled in :airbyte-protocol
+task generateWellKnownTypes() {
+    doLast {
+        def wellKnownTypesYaml = project(':airbyte-protocol').file('protocol-models/src/main/resources/airbyte_protocol/well_known_types.yaml').text
+        def parsedYaml = new YamlSlurper().parseText(wellKnownTypesYaml)
+        def wellKnownTypesJson = new JsonBuilder(parsedYaml).toPrettyString()
+        def targetFile = project.file("build/docker/WellKnownTypes.json")
+        targetFile.getParentFile().mkdirs()
+        targetFile.text = wellKnownTypesJson
+    }
+}
+
 tasks.named("buildDockerImage") {
     dependsOn copyGeneratedTar
+    dependsOn generateWellKnownTypes
 }
diff --git a/airbyte-workers/build.gradle b/airbyte-workers/build.gradle
@@ -130,6 +130,7 @@ task cloudStorageIntegrationTest(type: Test) {
     }
 }
 
+// Duplicated in :airbyte-container-orchestrator, eventually, this should be handled in :airbyte-protocol
 task generateWellKnownTypes() {
     doLast {
         def wellKnownTypesYaml = project(':airbyte-protocol').file('protocol-models/src/main/resources/airbyte_protocol/well_known_types.yaml').text
@@ -143,6 +144,7 @@ task generateWellKnownTypes() {
 
 tasks.named("buildDockerImage") {
     dependsOn copyGeneratedTar
+    dependsOn generateWellKnownTypes
 }
 
 // Ideally, we would have buildDockerImage depend on generateWellKnownTypes