-
Notifications
You must be signed in to change notification settings - Fork 276
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 30509-add-minio-resources
- Loading branch information
Showing
544 changed files
with
15,683 additions
and
8,458 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| plugins { | ||
| id("io.airbyte.gradle.jvm.lib") | ||
| id("io.airbyte.gradle.publish") | ||
| id("org.jetbrains.kotlin.jvm") | ||
| id("org.jetbrains.kotlin.kapt") | ||
| id("io.airbyte.gradle.jvm.lib") | ||
| id("io.airbyte.gradle.publish") | ||
| id("org.jetbrains.kotlin.jvm") | ||
| id("org.jetbrains.kotlin.kapt") | ||
| } | ||
|
|
||
| dependencies { | ||
| kapt(platform(libs.micronaut.platform)) | ||
| kapt(libs.bundles.micronaut.annotation.processor) | ||
| kapt(platform(libs.micronaut.platform)) | ||
| kapt(libs.bundles.micronaut.annotation.processor) | ||
|
|
||
| api(libs.segment.java.analytics) | ||
| api(libs.micronaut.http) | ||
| api(libs.micronaut.cache.caffeine) | ||
| api(libs.bundles.micronaut.annotation) | ||
| api(libs.bundles.micronaut.kotlin) | ||
| api(libs.kotlin.logging) | ||
| api(project(":airbyte-commons")) | ||
| api(project(":airbyte-config:config-models")) | ||
| api(project(":airbyte-api")) | ||
| api(libs.segment.java.analytics) | ||
| api(libs.micronaut.http) | ||
| api(libs.micronaut.cache.caffeine) | ||
| api(libs.bundles.micronaut.annotation) | ||
| api(libs.bundles.micronaut.kotlin) | ||
| api(libs.kotlin.logging) | ||
| api(project(":airbyte-commons")) | ||
| api(project(":airbyte-config:config-models")) | ||
| api(project(":airbyte-api")) | ||
|
|
||
|
|
||
| testAnnotationProcessor(platform(libs.micronaut.platform)) | ||
| testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor) | ||
| testImplementation(libs.bundles.junit) | ||
| testImplementation(libs.assertj.core) | ||
| testImplementation(libs.junit.pioneer) | ||
| testImplementation(libs.mockk) | ||
| testImplementation(libs.kotlin.test.runner.junit5) | ||
| testRuntimeOnly(libs.junit.jupiter.engine) | ||
| testAnnotationProcessor(platform(libs.micronaut.platform)) | ||
| testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor) | ||
| testImplementation(libs.bundles.junit) | ||
| testImplementation(libs.assertj.core) | ||
| testImplementation(libs.junit.pioneer) | ||
| testImplementation(libs.mockk) | ||
| testImplementation(libs.kotlin.test.runner.junit5) | ||
| testRuntimeOnly(libs.junit.jupiter.engine) | ||
| } | ||
|
|
||
| // This is a workaround related to kaptBuild errors. | ||
| // TODO: this should be removed when we move to kotlin 1.9.20 | ||
| // TODO: we should write tests | ||
| afterEvaluate { | ||
| tasks.named("kaptGenerateStubsTestKotlin") { | ||
| enabled = false | ||
| } | ||
| tasks.named("kaptGenerateStubsTestKotlin") { | ||
| enabled = false | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,106 @@ | ||
| import java.util.Properties | ||
|
|
||
| plugins { | ||
| id("io.airbyte.gradle.jvm.app") | ||
| id("io.airbyte.gradle.jvm.lib") | ||
| id("io.airbyte.gradle.publish") | ||
| id("io.airbyte.gradle.docker") | ||
| kotlin("jvm") | ||
| kotlin("kapt") | ||
| id("io.airbyte.gradle.jvm.app") | ||
| id("io.airbyte.gradle.jvm.lib") | ||
| id("io.airbyte.gradle.publish") | ||
| id("io.airbyte.gradle.docker") | ||
| kotlin("jvm") | ||
| kotlin("kapt") | ||
| } | ||
|
|
||
| dependencies { | ||
| kapt(platform(libs.micronaut.platform)) | ||
| kapt(libs.bundles.micronaut.annotation.processor) | ||
| kapt(libs.micronaut.jaxrs.processor) | ||
| kapt(platform(libs.micronaut.platform)) | ||
| kapt(libs.bundles.micronaut.annotation.processor) | ||
| kapt(libs.micronaut.jaxrs.processor) | ||
|
|
||
| kaptTest(platform(libs.micronaut.platform)) | ||
| kaptTest(libs.bundles.micronaut.test.annotation.processor) | ||
| kaptTest(libs.micronaut.jaxrs.processor) | ||
| kaptTest(platform(libs.micronaut.platform)) | ||
| kaptTest(libs.bundles.micronaut.test.annotation.processor) | ||
| kaptTest(libs.micronaut.jaxrs.processor) | ||
|
|
||
| annotationProcessor(platform(libs.micronaut.platform)) | ||
| annotationProcessor(libs.bundles.micronaut.annotation.processor) | ||
| annotationProcessor(libs.micronaut.jaxrs.processor) | ||
| annotationProcessor(platform(libs.micronaut.platform)) | ||
| annotationProcessor(libs.bundles.micronaut.annotation.processor) | ||
| annotationProcessor(libs.micronaut.jaxrs.processor) | ||
|
|
||
| implementation(project(":airbyte-analytics")) | ||
| implementation(project(":airbyte-api")) | ||
| implementation(project(":airbyte-commons")) | ||
| implementation(project(":airbyte-config:config-models")) | ||
| implementation(platform(libs.micronaut.platform)) | ||
| implementation(libs.cron.utils) | ||
| implementation(libs.log4j.slf4j2.impl) | ||
| implementation(libs.bundles.jackson) | ||
| implementation(libs.bundles.micronaut) | ||
| implementation(libs.bundles.micronaut.cache) | ||
| implementation(libs.bundles.micronaut.data.jdbc) | ||
| implementation(libs.bundles.micronaut.metrics) | ||
| implementation(libs.micronaut.jaxrs.server) | ||
| implementation(libs.micronaut.problem.json) | ||
| implementation(libs.micronaut.security) | ||
| implementation(libs.sentry.java) | ||
| implementation(libs.swagger.annotations) | ||
| implementation(libs.jakarta.ws.rs.api) | ||
| implementation(libs.airbyte.protocol) | ||
| implementation(project(":airbyte-analytics")) | ||
| implementation(project(":airbyte-api")) | ||
| implementation(project(":airbyte-commons")) | ||
| implementation(project(":airbyte-config:config-models")) | ||
| implementation(platform(libs.micronaut.platform)) | ||
| implementation(libs.cron.utils) | ||
| implementation(libs.log4j.slf4j2.impl) | ||
| implementation(libs.bundles.jackson) | ||
| implementation(libs.bundles.micronaut) | ||
| implementation(libs.bundles.micronaut.cache) | ||
| implementation(libs.bundles.micronaut.data.jdbc) | ||
| implementation(libs.bundles.micronaut.metrics) | ||
| implementation(libs.micronaut.jaxrs.server) | ||
| implementation(libs.micronaut.problem.json) | ||
| implementation(libs.micronaut.security) | ||
| implementation(libs.sentry.java) | ||
| implementation(libs.swagger.annotations) | ||
| implementation(libs.jakarta.ws.rs.api) | ||
| implementation(libs.airbyte.protocol) | ||
|
|
||
| runtimeOnly(libs.javax.databind) | ||
| runtimeOnly(libs.snakeyaml) | ||
| runtimeOnly(libs.javax.databind) | ||
| runtimeOnly(libs.snakeyaml) | ||
|
|
||
| testAnnotationProcessor(platform(libs.micronaut.platform)) | ||
| testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor) | ||
| testAnnotationProcessor(libs.micronaut.jaxrs.processor) | ||
| testAnnotationProcessor(platform(libs.micronaut.platform)) | ||
| testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor) | ||
| testAnnotationProcessor(libs.micronaut.jaxrs.processor) | ||
|
|
||
| testImplementation(project(":airbyte-test-utils")) | ||
| testImplementation(libs.bundles.micronaut.test) | ||
| testImplementation(libs.postgresql) | ||
| testImplementation(libs.platform.testcontainers.postgresql) | ||
| testImplementation(libs.mockwebserver) | ||
| testImplementation(libs.mockito.inline) | ||
| testImplementation(project(":airbyte-test-utils")) | ||
| testImplementation(libs.bundles.micronaut.test) | ||
| testImplementation(libs.postgresql) | ||
| testImplementation(libs.platform.testcontainers.postgresql) | ||
| testImplementation(libs.mockwebserver) | ||
| testImplementation(libs.mockito.inline) | ||
| testImplementation(libs.mockk) | ||
| } | ||
|
|
||
| kapt { | ||
| correctErrorTypes = true | ||
| correctErrorTypes = true | ||
| } | ||
|
|
||
| val env = Properties().apply { | ||
| load(rootProject.file(".env.dev").inputStream()) | ||
| load(rootProject.file(".env.dev").inputStream()) | ||
| } | ||
|
|
||
| airbyte { | ||
| application { | ||
| mainClass = "io.airbyte.api.server.ApplicationKt" | ||
| defaultJvmArgs = listOf("-XX:+ExitOnOutOfMemoryError", "-XX:MaxRAMPercentage=75.0") | ||
| application { | ||
| mainClass = "io.airbyte.api.server.ApplicationKt" | ||
| defaultJvmArgs = listOf("-XX:+ExitOnOutOfMemoryError", "-XX:MaxRAMPercentage=75.0") | ||
|
|
||
| @Suppress("UNCHECKED_CAST") | ||
| localEnvVars.putAll(env.toMutableMap() as Map<String, String>) | ||
| localEnvVars.putAll(mapOf( | ||
| "AIRBYTE_ROLE" to (System.getenv("AIRBYTE_ROLE") ?: "undefined"), | ||
| "AIRBYTE_VERSION" to env["VERSION"].toString(), | ||
| "MICRONAUT_ENVIRONMENTS" to "control-plane", | ||
| "SERVICE_NAME" to project.name, | ||
| "TRACKING_STRATEGY" to env["TRACKING_STRATEGY"].toString(), | ||
| )) | ||
| } | ||
| docker { | ||
| imageName = "airbyte-api-server" | ||
| } | ||
| @Suppress("UNCHECKED_CAST") | ||
| localEnvVars.putAll(env.toMutableMap() as Map<String, String>) | ||
| localEnvVars.putAll( | ||
| mapOf( | ||
| "AIRBYTE_ROLE" to (System.getenv("AIRBYTE_ROLE") ?: "undefined"), | ||
| "AIRBYTE_VERSION" to env["VERSION"].toString(), | ||
| "MICRONAUT_ENVIRONMENTS" to "control-plane", | ||
| "SERVICE_NAME" to project.name, | ||
| "TRACKING_STRATEGY" to env["TRACKING_STRATEGY"].toString(), | ||
| ) | ||
| ) | ||
| } | ||
| docker { | ||
| imageName = "airbyte-api-server" | ||
| } | ||
| } | ||
|
|
||
| tasks.named<Test>("test") { | ||
| environment(mapOf( | ||
| "AIRBYTE_VERSION" to env["VERSION"], | ||
| "MICRONAUT_ENVIRONMENTS" to "test", | ||
| "SERVICE_NAME" to project.name, | ||
| )) | ||
| environment( | ||
| mapOf( | ||
| "AIRBYTE_VERSION" to env["VERSION"], | ||
| "MICRONAUT_ENVIRONMENTS" to "test", | ||
| "SERVICE_NAME" to project.name, | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| // Even though Kotlin is excluded on Spotbugs, this projects) | ||
| // still runs into spotbug issues. Working theory is that) | ||
| // generated code is being picked up. Disable as a short-term fix.) | ||
| tasks.named("spotbugsMain") { | ||
| enabled = false | ||
| enabled = false | ||
| } |
Oops, something went wrong.