From a76a1ba36dd58d13fb0776cfff18e7a07c4e1e42 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 12:29:02 -0500 Subject: [PATCH 01/26] gradle: remove :airbyte-integrations:bases from gradle --- settings.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/settings.gradle b/settings.gradle index 4754bee55575a..563e61d79e4b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -175,9 +175,6 @@ include ':airbyte-cdk:java:airbyte-cdk:datastore-bigquery' include ':airbyte-cdk:java:airbyte-cdk:datastore-mongo' include ':airbyte-cdk:java:airbyte-cdk:datastore-postgres' -include ':airbyte-integrations:bases:base' -include ':airbyte-integrations:bases:base-java' -include ':airbyte-integrations:bases:base-normalization' include ':airbyte-integrations:connector-templates:generator' include ':airbyte-integrations:connectors-performance:source-harness' include ':airbyte-integrations:connectors-performance:destination-harness' From 9c63e1de70f3b13524db6262a0f25de127334acf Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 12:30:45 -0500 Subject: [PATCH 02/26] gradle: move code-generator to airbyte-cdk/python --- {tools => airbyte-cdk/python}/code-generator/Dockerfile | 0 {tools => airbyte-cdk/python}/code-generator/build.gradle | 0 settings.gradle | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {tools => airbyte-cdk/python}/code-generator/Dockerfile (100%) rename {tools => airbyte-cdk/python}/code-generator/build.gradle (100%) diff --git a/tools/code-generator/Dockerfile b/airbyte-cdk/python/code-generator/Dockerfile similarity index 100% rename from tools/code-generator/Dockerfile rename to airbyte-cdk/python/code-generator/Dockerfile diff --git a/tools/code-generator/build.gradle b/airbyte-cdk/python/code-generator/build.gradle similarity index 100% rename from tools/code-generator/build.gradle rename to airbyte-cdk/python/code-generator/build.gradle diff --git a/settings.gradle b/settings.gradle index 563e61d79e4b3..a40941a8e89c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -159,9 +159,9 @@ if (isCiServer || isAirbyteCI) { rootProject.name = 'airbyte' -include ':tools:code-generator' - include ':airbyte-cdk:python' +include ':airbyte-cdk:python:code-generator' + include ':airbyte-cdk:java:airbyte-cdk' include ':airbyte-cdk:java:airbyte-cdk:dependencies' include ':airbyte-cdk:java:airbyte-cdk:core' From d35994a713044046ed34ab9bb9169d3e978463e8 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 12:44:40 -0500 Subject: [PATCH 03/26] gradle: inline airbyte-python plugin in python CDK --- airbyte-cdk/python/build.gradle | 110 ++++++++++- airbyte-cdk/python/pyproject.toml | 36 ++++ .../src/main/groovy/airbyte-python.gradle | 185 ------------------ 3 files changed, 144 insertions(+), 187 deletions(-) delete mode 100644 buildSrc/src/main/groovy/airbyte-python.gradle diff --git a/airbyte-cdk/python/build.gradle b/airbyte-cdk/python/build.gradle index 63cc9992a73b6..3456d095acf13 100644 --- a/airbyte-cdk/python/build.gradle +++ b/airbyte-cdk/python/build.gradle @@ -1,6 +1,8 @@ +import ru.vyarus.gradle.plugin.python.task.PythonTask + plugins { - id 'airbyte-python' id 'airbyte-docker-legacy' + id 'ru.vyarus.use-python' } def generateComponentManifestClassFiles = tasks.register('generateComponentManifestClassFiles', Exec) { @@ -8,7 +10,7 @@ def generateComponentManifestClassFiles = tasks.register('generateComponentManif commandLine 'bin/generate-component-manifest-files.sh' } generateComponentManifestClassFiles.configure { - dependsOn project(':tools:code-generator').tasks.named('assemble') + dependsOn project(':airbyte-cdk:python:code-generator').tasks.named('assemble') } tasks.register('generate').configure { dependsOn generateComponentManifestClassFiles @@ -23,3 +25,107 @@ tasks.register('runLowCodeConnectorUnitTests', Exec) { environment 'ROOT_DIR', rootDir.absolutePath commandLine 'bin/low-code-unit-tests.sh' } + +def venvDirectoryName = '.venv' + +// Add a task that allows cleaning up venvs to every python project +def cleanPythonVenv = tasks.register('cleanPythonVenv', Exec) { + commandLine 'rm' + args '-rf', "${projectDir.absolutePath}/${venvDirectoryName}" +} + +tasks.named('clean').configure { + dependsOn cleanPythonVenv +} + +// Configure gradle python plugin. +python { + envPath = venvDirectoryName + minPythonVersion '3.10' + + // Amazon Linux support. + // The airbyte-ci tool runs gradle tasks in AL2023-based containers. + // In AL2023, `python3` is necessarily v3.9, and later pythons need to be installed and named explicitly. + // See https://github.com/amazonlinux/amazon-linux-2023/issues/459 for details. + try { + if ("python3.11 --version".execute().waitFor() == 0) { + // python3.11 definitely exists at this point, use it instead of 'python3'. + pythonBinary "python3.11" + } + } catch (IOException _) { + // Swallow exception if python3.11 is not installed. + } + // Pyenv support. + try { + def pyenvRoot = "pyenv root".execute() + def pyenvLatest = "pyenv latest ${minPythonVersion}".execute() + // Pyenv definitely exists at this point: use 'python' instead of 'python3' in all cases. + pythonBinary "python" + if (pyenvRoot.waitFor() == 0 && pyenvLatest.waitFor() == 0) { + pythonPath "${pyenvRoot.text.trim()}/versions/${pyenvLatest.text.trim()}/bin" + } + } catch (IOException _) { + // Swallow exception if pyenv is not installed. + } + + scope 'VIRTUALENV' + installVirtualenv = true + pip 'pip:23.2.1' + pip 'mccabe:0.6.1' + // https://github.com/csachs/pyproject-flake8/issues/13 + pip 'flake8:4.0.1' + // flake8 doesn't support pyproject.toml files + // and thus there is the wrapper "pyproject-flake8" for this + pip 'pyproject-flake8:0.0.1a2' + pip 'pytest:6.2.5' + pip 'coverage[toml]:6.3.1' +} + +def installLocalReqs = tasks.register('installLocalReqs', PythonTask) { + module = "pip" + command = "install .[dev,tests]" + inputs.file('setup.py') + outputs.file('build/installedlocalreqs.txt') +} + +def flakeCheck = tasks.register('flakeCheck', PythonTask) { + module = "pflake8" + command = "--config pyproject.toml ./" +} + +def installReqs = tasks.register('installReqs', PythonTask) { + module = "pip" + command = "install .[main]" + inputs.file('setup.py') + outputs.file('build/installedreqs.txt') +} +installReqs.configure { + dependsOn installLocalReqs +} + +tasks.named('check').configure { + dependsOn installReqs + dependsOn flakeCheck +} + +def installTestReqs = tasks.register('installTestReqs', PythonTask) { + module = "pip" + command = "install .[tests]" + inputs.file('setup.py') + outputs.file('build/installedtestreqs.txt') +} +installTestReqs.configure { + dependsOn installReqs +} + +def testTask = tasks.register('testPython', PythonTask) { + module = "coverage" + command = "run --data-file=unit_tests/.coverage.testPython --rcfile=pyproject.toml -m pytest -s unit_tests -c pytest.ini" +} +testTask.configure { + dependsOn installTestReqs +} + +tasks.named('check').configure { + dependsOn testTask +} diff --git a/airbyte-cdk/python/pyproject.toml b/airbyte-cdk/python/pyproject.toml index b5e8c83ca37b3..f03d6cbcbe012 100644 --- a/airbyte-cdk/python/pyproject.toml +++ b/airbyte-cdk/python/pyproject.toml @@ -6,3 +6,39 @@ requires = [ ] build-backend = "setuptools.build_meta" + +[tool.coverage.report] +fail_under = 0 +skip_empty = true +sort = "-cover" +omit = [ + ".venv/*", + "main.py", + "setup.py", + "unit_tests/*", + "integration_tests/*", + "**/generated/*", +] + +[tool.flake8] +extend-exclude = [ + "*/lib/*/site-packages", + ".venv", + "build", + "models", + ".eggs", + "airbyte-cdk/python/airbyte_cdk/models/__init__.py", + "airbyte-cdk/python/airbyte_cdk/sources/declarative/models/__init__.py", + ".tox", + "airbyte_api_client", + "**/generated/*", +] +max-complexity = 20 +max-line-length = 140 + +extend-ignore = [ + "E203", # whitespace before ':' (conflicts with Black) + "E231", # Bad trailing comma (conflicts with Black) + "E501", # line too long (conflicts with Black) + "W503", # line break before binary operator (conflicts with Black) +] \ No newline at end of file diff --git a/buildSrc/src/main/groovy/airbyte-python.gradle b/buildSrc/src/main/groovy/airbyte-python.gradle deleted file mode 100644 index 59f14890c75b2..0000000000000 --- a/buildSrc/src/main/groovy/airbyte-python.gradle +++ /dev/null @@ -1,185 +0,0 @@ -import groovy.io.FileType -import groovy.io.FileVisitResult -import org.gradle.api.GradleException -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.tasks.Exec -import ru.vyarus.gradle.plugin.python.task.PythonTask - -class Helpers { - static addTestTaskIfTestFilesFound(Project project, String testFilesDirectory, String taskName, taskDependencies) { - """ - This method verifies if there are test files in a directory before adding the pytest task to run tests on that directory. This is needed - because if there are no tests in that dir and we run pytest on it, it exits with exit code 5 which gradle takes to mean that the process - failed, since it's non-zero. This means that if a module doesn't need a unit or integration test, it still needs to add a dummy test file - like: - - ``` - def make_ci_pass_test(): - assert True - ``` - - So we use this method to leverage pytest's test discovery rules (https://docs.pytest.org/en/6.2.x/goodpractices.html#conventions-for-python-test-discovery) - to selectively run pytest based on whether there seem to be test files in that directory. - Namely, if the directory contains a file whose name is test_*.py or *_test.py then it's a test. - - See https://github.com/airbytehq/airbyte/issues/4979 for original context - """ - - boolean requiresTasks = false - if (project.file(testFilesDirectory).exists()) { - def testDir = project.projectDir.toPath().resolve(testFilesDirectory) - testDir.traverse(type: FileType.FILES, nameFilter: ~/(^test_.*|.*_test)\.py$/) {file -> - requiresTasks = true - // If a file is found, terminate the traversal, thus causing this task to be declared at most once - return FileVisitResult.TERMINATE - } - } - if (!requiresTasks) { - return - } - - def coverageTask = project.tasks.register(taskName, PythonTask) { - def dataFile = "${testFilesDirectory}/.coverage.${taskName}" - def rcFile = project.rootProject.file('pyproject.toml').absolutePath - def testConfig = project.file('pytest.ini').exists() ? 'pytest.ini' : project.rootProject.file('pyproject.toml').absolutePath - - module = "coverage" - command = "run --data-file=${dataFile} --rcfile=${rcFile} -m pytest -s ${testFilesDirectory} -c ${testConfig}" - } - coverageTask.configure { - dependsOn taskDependencies - } - } -} - -class AirbytePythonPlugin implements Plugin { - - void apply(Project project) { - - def venvDirectoryName = '.venv' - - // Add a task that allows cleaning up venvs to every python project - def cleanPythonVenv = project.tasks.register('cleanPythonVenv', Exec) { - commandLine 'rm' - args '-rf', "${project.projectDir.absolutePath}/${venvDirectoryName}" - } - project.tasks.named('clean').configure { - dependsOn cleanPythonVenv - } - - project.plugins.apply 'ru.vyarus.use-python' - - // Configure gradle python plugin. - project.python { - envPath = venvDirectoryName - minPythonVersion '3.10' - - // Amazon Linux support. - // The airbyte-ci tool runs gradle tasks in AL2023-based containers. - // In AL2023, `python3` is necessarily v3.9, and later pythons need to be installed and named explicitly. - // See https://github.com/amazonlinux/amazon-linux-2023/issues/459 for details. - try { - if ("python3.11 --version".execute().waitFor() == 0) { - // python3.11 definitely exists at this point, use it instead of 'python3'. - pythonBinary "python3.11" - } - } catch (IOException _) { - // Swallow exception if python3.11 is not installed. - } - // Pyenv support. - try { - def pyenvRoot = "pyenv root".execute() - def pyenvLatest = "pyenv latest ${minPythonVersion}".execute() - // Pyenv definitely exists at this point: use 'python' instead of 'python3' in all cases. - pythonBinary "python" - if (pyenvRoot.waitFor() == 0 && pyenvLatest.waitFor() == 0) { - pythonPath "${pyenvRoot.text.trim()}/versions/${pyenvLatest.text.trim()}/bin" - } - } catch (IOException _) { - // Swallow exception if pyenv is not installed. - } - - scope 'VIRTUALENV' - installVirtualenv = true - pip 'pip:23.2.1' - pip 'mccabe:0.6.1' - // https://github.com/csachs/pyproject-flake8/issues/13 - pip 'flake8:4.0.1' - // flake8 doesn't support pyproject.toml files - // and thus there is the wrapper "pyproject-flake8" for this - pip 'pyproject-flake8:0.0.1a2' - pip 'pytest:6.2.5' - pip 'coverage[toml]:6.3.1' - } - - // Attempt to install anything in requirements.txt. - // By convention this should only be dependencies whose source is located in the project. - if (project.file('requirements.txt').exists()) { - project.tasks.register('installLocalReqs', PythonTask) { - module = "pip" - command = "install -r requirements.txt" - inputs.file('requirements.txt') - outputs.file('build/installedlocalreqs.txt') - } - } else if (project.file('setup.py').exists()) { - // If requirements.txt does not exists, install from setup.py instead, assume a dev or "tests" profile exists. - // In this case, there is no need to depend on the base python modules since everything should be contained in the setup.py. - project.tasks.register('installLocalReqs', PythonTask) { - module = "pip" - command = "install .[dev,tests]" - inputs.file('setup.py') - outputs.file('build/installedlocalreqs.txt') - } - } else { - return - } - - def installLocalReqs = project.tasks.named('installLocalReqs') - - def flakeCheck = project.tasks.register('flakeCheck', PythonTask) { - module = "pflake8" - command = "--config ${project.rootProject.file('pyproject.toml').absolutePath} ./" - } - - def installReqs = project.tasks.register('installReqs', PythonTask) { - module = "pip" - command = "install .[main]" - inputs.file('setup.py') - outputs.file('build/installedreqs.txt') - } - installReqs.configure { - dependsOn installLocalReqs - } - - project.tasks.named('check').configure { - dependsOn installReqs - dependsOn flakeCheck - } - - def installTestReqs = project.tasks.register('installTestReqs', PythonTask) { - module = "pip" - command = "install .[tests]" - inputs.file('setup.py') - outputs.file('build/installedtestreqs.txt') - } - installTestReqs.configure { - dependsOn installReqs - } - - Helpers.addTestTaskIfTestFilesFound(project, 'unit_tests', 'testPython', installTestReqs) - project.tasks.named('check').configure { - dependsOn project.tasks.matching { it.name == 'testPython' } - } - - Helpers.addTestTaskIfTestFilesFound(project, 'integration_tests', 'integrationTestPython', installTestReqs) - def integrationTestTasks = project.tasks.matching { it.name == 'integrationTestPython' } - integrationTestTasks.configureEach { - dependsOn project.tasks.named('assemble') - mustRunAfter project.tasks.named('check') - } - project.tasks.named('build').configure { - dependsOn integrationTestTasks - } - } -} From 51430f856708df658fa2df8722cf7a9c6bad29c4 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:02:47 -0500 Subject: [PATCH 04/26] gradle: inline docker plugin usage in python CDK --- airbyte-cdk/python/bin/build_code_generator_image.sh | 11 +++++++++++ airbyte-cdk/python/build.gradle | 6 ++++-- airbyte-cdk/python/code-generator/build.gradle | 3 --- settings.gradle | 1 - 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100755 airbyte-cdk/python/bin/build_code_generator_image.sh delete mode 100644 airbyte-cdk/python/code-generator/build.gradle diff --git a/airbyte-cdk/python/bin/build_code_generator_image.sh b/airbyte-cdk/python/bin/build_code_generator_image.sh new file mode 100755 index 0000000000000..f73c318317c5a --- /dev/null +++ b/airbyte-cdk/python/bin/build_code_generator_image.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -e + +DOCKER_BUILD_ARCH="${DOCKER_BUILD_ARCH:-amd64}" +# https://docs.docker.com/develop/develop-images/build_enhancements/ +export DOCKER_BUILDKIT=1 + +CODE_GENERATOR_DOCKERFILE="$(dirname $0)/../code-generator/Dockerfile" +test -f $CODE_GENERATOR_DOCKERFILE +docker build --build-arg DOCKER_BUILD_ARCH="$DOCKER_BUILD_ARCH" -t "airbyte/code-generator:dev" - < $CODE_GENERATOR_DOCKERFILE diff --git a/airbyte-cdk/python/build.gradle b/airbyte-cdk/python/build.gradle index 3456d095acf13..9eb30b0f59f3b 100644 --- a/airbyte-cdk/python/build.gradle +++ b/airbyte-cdk/python/build.gradle @@ -1,16 +1,18 @@ import ru.vyarus.gradle.plugin.python.task.PythonTask plugins { - id 'airbyte-docker-legacy' id 'ru.vyarus.use-python' } +def generateCodeGeneratorImage = tasks.register('generateCodeGeneratorImage', Exec) { + commandLine 'bin/build_code_generator_image.sh' +} def generateComponentManifestClassFiles = tasks.register('generateComponentManifestClassFiles', Exec) { environment 'ROOT_DIR', rootDir.absolutePath commandLine 'bin/generate-component-manifest-files.sh' } generateComponentManifestClassFiles.configure { - dependsOn project(':airbyte-cdk:python:code-generator').tasks.named('assemble') + dependsOn generateCodeGeneratorImage } tasks.register('generate').configure { dependsOn generateComponentManifestClassFiles diff --git a/airbyte-cdk/python/code-generator/build.gradle b/airbyte-cdk/python/code-generator/build.gradle deleted file mode 100644 index 0c2de175e2cc9..0000000000000 --- a/airbyte-cdk/python/code-generator/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -plugins { - id 'airbyte-docker-legacy' -} diff --git a/settings.gradle b/settings.gradle index a40941a8e89c4..b2fd6f31698cf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -160,7 +160,6 @@ if (isCiServer || isAirbyteCI) { rootProject.name = 'airbyte' include ':airbyte-cdk:python' -include ':airbyte-cdk:python:code-generator' include ':airbyte-cdk:java:airbyte-cdk' include ':airbyte-cdk:java:airbyte-cdk:dependencies' From d0fd5f14e1bf01bbfbef1b8ae131edd5366cc849 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:24:56 -0500 Subject: [PATCH 05/26] gradle: move python CDK to its own gradle structure --- airbyte-cdk/python/build.gradle | 9 +- airbyte-cdk/python/gradle.properties | 11 + .../python/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + airbyte-cdk/python/gradlew | 249 ++++++++++++++++++ airbyte-cdk/python/gradlew.bat | 92 +++++++ airbyte-cdk/python/settings.gradle | 29 ++ settings.gradle | 2 - 8 files changed, 393 insertions(+), 6 deletions(-) create mode 100644 airbyte-cdk/python/gradle.properties create mode 100644 airbyte-cdk/python/gradle/wrapper/gradle-wrapper.jar create mode 100644 airbyte-cdk/python/gradle/wrapper/gradle-wrapper.properties create mode 100755 airbyte-cdk/python/gradlew create mode 100644 airbyte-cdk/python/gradlew.bat create mode 100644 airbyte-cdk/python/settings.gradle diff --git a/airbyte-cdk/python/build.gradle b/airbyte-cdk/python/build.gradle index 9eb30b0f59f3b..61f355742382a 100644 --- a/airbyte-cdk/python/build.gradle +++ b/airbyte-cdk/python/build.gradle @@ -1,14 +1,15 @@ import ru.vyarus.gradle.plugin.python.task.PythonTask plugins { - id 'ru.vyarus.use-python' + id 'base' + id 'ru.vyarus.use-python' version '2.3.0' } def generateCodeGeneratorImage = tasks.register('generateCodeGeneratorImage', Exec) { commandLine 'bin/build_code_generator_image.sh' } def generateComponentManifestClassFiles = tasks.register('generateComponentManifestClassFiles', Exec) { - environment 'ROOT_DIR', rootDir.absolutePath + environment 'ROOT_DIR', rootDir.parentFile.parentFile.absolutePath commandLine 'bin/generate-component-manifest-files.sh' } generateComponentManifestClassFiles.configure { @@ -19,12 +20,12 @@ tasks.register('generate').configure { } tasks.register('validateSourceYamlManifest', Exec) { - environment 'ROOT_DIR', rootDir.absolutePath + environment 'ROOT_DIR', rootDir.parentFile.parentFile.absolutePath commandLine 'bin/validate-yaml-schema.sh' } tasks.register('runLowCodeConnectorUnitTests', Exec) { - environment 'ROOT_DIR', rootDir.absolutePath + environment 'ROOT_DIR', rootDir.parentFile.parentFile.absolutePath commandLine 'bin/low-code-unit-tests.sh' } diff --git a/airbyte-cdk/python/gradle.properties b/airbyte-cdk/python/gradle.properties new file mode 100644 index 0000000000000..a458cfe27eb92 --- /dev/null +++ b/airbyte-cdk/python/gradle.properties @@ -0,0 +1,11 @@ +# NOTE: some of these values are overwritten in CI! +# NOTE: if you want to override this for your local machine, set overrides in ~/.gradle/gradle.properties + +org.gradle.parallel=true +org.gradle.caching=true + +# Note, this might have issues on the normal Github runner. +org.gradle.vfs.watch=true + +# Tune # of cores Gradle uses. +# org.gradle.workers.max=3 diff --git a/airbyte-cdk/python/gradle/wrapper/gradle-wrapper.jar b/airbyte-cdk/python/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/airbyte-cdk/python/gradle/wrapper/gradle-wrapper.properties b/airbyte-cdk/python/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000..a80b22ce5cffe --- /dev/null +++ b/airbyte-cdk/python/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/airbyte-cdk/python/gradlew b/airbyte-cdk/python/gradlew new file mode 100755 index 0000000000000..1aa94a4269074 --- /dev/null +++ b/airbyte-cdk/python/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/airbyte-cdk/python/gradlew.bat b/airbyte-cdk/python/gradlew.bat new file mode 100644 index 0000000000000..6689b85beecde --- /dev/null +++ b/airbyte-cdk/python/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/airbyte-cdk/python/settings.gradle b/airbyte-cdk/python/settings.gradle new file mode 100644 index 0000000000000..02e3dd9a67242 --- /dev/null +++ b/airbyte-cdk/python/settings.gradle @@ -0,0 +1,29 @@ +import com.gradle.scan.plugin.PublishedBuildScan + +pluginManagement { + repositories { + // # Gradle looks for dependency artifacts in repositories listed in 'repositories' blocks in descending order. + gradlePluginPortal() + } +} + +// Configure the gradle enterprise plugin to enable build scans. Enabling the plugin at the top of the settings file allows the build scan to record +// as much information as possible. +plugins { + id "com.gradle.enterprise" version "3.15.1" +} + +ext.isCiServer = System.getenv().containsKey("CI") + +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + uploadInBackground = !isCiServer // Disable in CI or scan URLs may not work. + buildScanPublished { PublishedBuildScan scan -> + file("scan-journal.log") << "${new Date()} - ${scan.buildScanId} - ${scan.buildScanUri}\n" + } + } +} + +rootProject.name = 'airbyte-cdk-python' diff --git a/settings.gradle b/settings.gradle index b2fd6f31698cf..fb56a14df9073 100644 --- a/settings.gradle +++ b/settings.gradle @@ -159,8 +159,6 @@ if (isCiServer || isAirbyteCI) { rootProject.name = 'airbyte' -include ':airbyte-cdk:python' - include ':airbyte-cdk:java:airbyte-cdk' include ':airbyte-cdk:java:airbyte-cdk:dependencies' include ':airbyte-cdk:java:airbyte-cdk:core' From a8a9b3fcec6af71a0ccb08adf5795d6802182020 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:34:13 -0500 Subject: [PATCH 06/26] gradle: remove airbyte-docker-legacy plugin --- .../destination-harness/build.gradle | 1 - .../source-harness/build.gradle | 1 - buildSrc/src/main/groovy/DockerHelpers.groovy | 23 -- .../main/groovy/airbyte-docker-legacy.gradle | 331 ------------------ 4 files changed, 356 deletions(-) delete mode 100644 buildSrc/src/main/groovy/DockerHelpers.groovy delete mode 100644 buildSrc/src/main/groovy/airbyte-docker-legacy.gradle diff --git a/airbyte-integrations/connectors-performance/destination-harness/build.gradle b/airbyte-integrations/connectors-performance/destination-harness/build.gradle index e5a3c4ca264ae..fd6bb54d0aed3 100644 --- a/airbyte-integrations/connectors-performance/destination-harness/build.gradle +++ b/airbyte-integrations/connectors-performance/destination-harness/build.gradle @@ -1,6 +1,5 @@ plugins { id 'application' - id 'airbyte-docker-legacy' } application { diff --git a/airbyte-integrations/connectors-performance/source-harness/build.gradle b/airbyte-integrations/connectors-performance/source-harness/build.gradle index abfeaa794b418..667e5af0a9a5f 100644 --- a/airbyte-integrations/connectors-performance/source-harness/build.gradle +++ b/airbyte-integrations/connectors-performance/source-harness/build.gradle @@ -1,6 +1,5 @@ plugins { id 'application' - id 'airbyte-docker-legacy' } application { diff --git a/buildSrc/src/main/groovy/DockerHelpers.groovy b/buildSrc/src/main/groovy/DockerHelpers.groovy deleted file mode 100644 index 875f6320de9e2..0000000000000 --- a/buildSrc/src/main/groovy/DockerHelpers.groovy +++ /dev/null @@ -1,23 +0,0 @@ -import java.nio.file.Paths - -class DockerHelpers { - static String extractLabelValue(String dockerFile, String labelName) { - def file = dockerFile instanceof File ? dockerFile : new File(dockerFile) - return file.readLines() - .grep({ it.startsWith('LABEL') && it.contains(labelName) }) - .get(0) - .split('=')[1] - } - - static String extractImageName(String dockerFile) { - return extractLabelValue(dockerFile, "io.airbyte.name") - } - - static String extractImageVersion(String dockerFile) { - return extractLabelValue(dockerFile, "io.airbyte.version") - } - - static String getDevTaggedImage(projectDir, dockerfileName) { - return "${extractImageName(Paths.get(projectDir.absolutePath, dockerfileName).toString())}:dev" - } -} diff --git a/buildSrc/src/main/groovy/airbyte-docker-legacy.gradle b/buildSrc/src/main/groovy/airbyte-docker-legacy.gradle deleted file mode 100644 index e323cf7c95cc5..0000000000000 --- a/buildSrc/src/main/groovy/airbyte-docker-legacy.gradle +++ /dev/null @@ -1,331 +0,0 @@ -import java.nio.file.Paths -import java.security.MessageDigest -import java.util.concurrent.ConcurrentHashMap -import org.apache.commons.text.StringSubstitutor -import org.gradle.api.DefaultTask -import org.gradle.api.GradleException -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.file.ConfigurableFileTree -import org.gradle.api.file.FileCollection -import org.gradle.api.tasks.CacheableTask -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.PathSensitive -import org.gradle.api.tasks.PathSensitivity -import org.gradle.api.tasks.TaskAction - -/** - * AirbyteDockerLegacyTask is the task which builds a docker image based on a Dockerfile. - * - * It and the other classes in this file have "Legacy" in their name because we want to get rid of this plugin in favor - * of dagger-pipeline-based tooling like `airbyte-ci`. As of the time of this writing this is already the case for - * connectors. There are still a few remaining usages outside of connectors and they are useful to support a smooth - * local java-centric development experience with gradle, especially around integration tests. - * - * Issue https://github.com/airbytehq/airbyte/issues/30708 tracks the complete removal of this plugin. - */ -@CacheableTask -abstract class AirbyteDockerLegacyTask extends DefaultTask { - - @InputFiles - @PathSensitive(PathSensitivity.RELATIVE) - FileCollection filesInDockerImage - - @Input - Map baseImageHashes - - @InputFile - @PathSensitive(PathSensitivity.RELATIVE) - File dockerFile - - @OutputFile - File idFileOutput - - @InputFile - @PathSensitive(PathSensitivity.RELATIVE) - File buildScript = project.rootProject.file('tools/bin/build_image.sh') - - @TaskAction - def dockerTask() { - project.exec { - commandLine( - buildScript.absolutePath, - project.rootDir.absolutePath, - project.projectDir.absolutePath, - dockerFile.name, - DockerHelpers.getDevTaggedImage(project.projectDir, dockerFile.name), - idFileOutput.absolutePath, - ) - } - } -} - -/** - * AirbyteDockerLegacyTaskFactory is a convenience object to avoid passing the current project around. - */ -class AirbyteDockerLegacyTaskFactory { - - private AirbyteDockerLegacyTaskFactory() {} - - Project project - String dockerFileName - - File dockerFile() { - return project.file(dockerFileName) - } - - // This hash of the full path to the Dockerfile is the name of the task's output file. - String dockerfilePathHash() { - return MessageDigest.getInstance("MD5") - .digest(dockerFile().absolutePath.getBytes()) - .encodeHex() - .toString() - } - - // A superset of the files which are COPYed into the image, defined as the project file set - // with the .dockerignore rules applied to it. - // We could be more precise by parsing the Dockerfile but this is good enough in practice. - FileCollection filteredProjectFiles() { - ConfigurableFileTree files = project.fileTree(project.projectDir) - def dockerignore = project.file('.dockerignore') - if (!dockerignore.exists()) { - return files.filter { - file -> !file.toString().contains(".venv") - } - } - for (def rule : dockerignore.readLines()) { - if (rule.startsWith("#")) { - continue - } - rule = rule.trim() - files = (rule.startsWith("!") ? files.include(rule.substring(1)) : files.exclude(rule)) as ConfigurableFileTree - } - return files - } - - // Queries docker for all images and their hashes. - static synchronized Map collectKnownImageHashes(Project project) { - def stdout = new ByteArrayOutputStream() - project.rootProject.exec { - commandLine "docker", "images", "--no-trunc", "-f", "dangling=false", "--format", "{{.Repository}}:{{.Tag}} {{.ID}}" - standardOutput = stdout - } - Map map = [:] - stdout.toString().eachLine {line -> - def splits = line.split() - map.put(splits[0], splits[1].trim()) - } - return map - } - - // Query all docker images at most once for all tasks, at task creation time. - static def lazyImageHashesAtTaskCreationTime = new LazyImageHashesCache() - - static class LazyImageHashesCache { - private Map lazyValue - - synchronized Map get(Project project) { - if (lazyValue == null) { - lazyValue = collectKnownImageHashes(project) - } - return lazyValue - } - } - - // Global mapping of tagged image name to gradle project. - // This is populated at configuration time and accessed at task creation time. - // All keys verify isTaggedImageOwnedByThisRepo. - static def taggedImageToProject = new ConcurrentHashMap() - - static boolean isTaggedImageOwnedByThisRepo(String taggedImage) { - if (!taggedImage.startsWith("airbyte/")) { - // Airbyte's docker images are all prefixed like this. - // Anything not with this prefix is therefore not owned by this repo. - return false - } - if (taggedImage.startsWith("airbyte/base-airbyte-protocol-python:")) { - // Special case: this image is not built by this repo. - return false - } - if (!taggedImage.endsWith(":dev")) { - // Special case: this image is owned by this repo but built separate. e.g. source-file-secure - return false - } - // Otherwise, assume the image is built by this repo. - return true - } - - // Returns a mapping of each base image referenced in the Dockerfile to the corresponding hash - // in the results of collectKnownImageHashes(). If no hash was found, map to "???" instead. - Map baseTaggedImagesAndHashes(Map allKnownImageHashes) { - def taggedImages = new HashSet() - - // Look for "FROM foo AS bar" directives, and add them to the map with .put("bar", "foo") - Map imageAliases = [:] - dockerFile().eachLine { line -> - def parts = line.split() - if (parts.length >= 4 && parts[0].equals("FROM") && parts[parts.length - 2].equals("AS")) { - imageAliases.put(parts[parts.length - 1], parts[1]) - } - } - - dockerFile().eachLine { line -> - if (line.startsWith("FROM ")) { - def image = line.split()[1] - assert !image.isEmpty() - taggedImages.add(image) - } else if (line.startsWith("COPY --from=")) { - def image = line.substring("COPY --from=".length()).split()[0] - assert !image.isEmpty() - if (imageAliases[image] != null) { - taggedImages.add(imageAliases[image]) - } else { - taggedImages.add(image) - } - } - } - - Map result = [:] - for (def taggedImage : taggedImages) { - // Some image tags rely on environment variables (e.g. "FROM amazoncorretto:${JDK_VERSION}"). - taggedImage = new StringSubstitutor(System.getenv()).replace(taggedImage).trim() - result.put(taggedImage, allKnownImageHashes.getOrDefault(taggedImage, "???")) - } - return result - } - - // Create the task lazily: we shouldn't invoke 'docker' unless the task is created as part of the build. - def createTask(String taskName) { - if (!dockerFile().exists()) { - // This might not actually be necessary. It doesn't seem harmful either. - return project.tasks.register(taskName) { - logger.info "Skipping ${taskName} because ${dockerFile()} does not exist." - } - } - - // Tagged name of the image to be built by this task. - def taggedImage = DockerHelpers.getDevTaggedImage(project.projectDir, dockerFileName) - // Map this project to the tagged name of the image built by this task. - taggedImageToProject.put(taggedImage, project) - // Path to the ID file to be generated by this task. - // The ID file contains the hash of the image. - def idFilePath = Paths.get(project.rootProject.rootDir.absolutePath, '.dockerversions', dockerfilePathHash()) - // Register the task (lazy creation). - def airbyteDockerTask = project.tasks.register(taskName, AirbyteDockerLegacyTask) { task -> - // Set inputs. - task.filesInDockerImage = filteredProjectFiles() - task.dockerFile = this.dockerFile() - task.baseImageHashes = baseTaggedImagesAndHashes(lazyImageHashesAtTaskCreationTime.get(project)) - // Set dependencies on base images built by this repo. - for (String taggedImageDependency : task.baseImageHashes.keySet()) { - if (isTaggedImageOwnedByThisRepo(taggedImageDependency)) { - task.logger.info("adding airbyteDocker task dependency: image ${taggedImage} is based on ${taggedImageDependency}") - def dependentProject = taggedImageToProject.get(taggedImageDependency) - if (dependentProject == null) { - throw new GradleException("no known project for image ${taggedImageDependency}") - } - // Depend on 'assemble' instead of 'airbyteDocker' or 'airbyteDockerTest', it's simpler that way. - task.dependsOn(dependentProject.tasks.named('assemble')) - } - } - // Set outputs. - task.idFileOutput = idFilePath.toFile() - task.outputs.upToDateWhen { - // Because the baseImageHashes is computed at task creation time, it may be stale - // at task execution time. Let's double-check. - - // Missing dependency declarations in the gradle build may result in the airbyteDocker tasks - // to be created in the wrong order. Not worth breaking the build over. - for (Map.Entry e : task.baseImageHashes) { - if (isTaggedImageOwnedByThisRepo(e.key) && e.value == "???") { - task.logger.info "Not up to date: missing at least one airbyte base image in docker" - return false - } - } - // Fetch the hashes of the required based images anew. - def allImageHashes = collectKnownImageHashes(task.project) - // If the image to be built by this task doesn't exist in docker, then it definitely should - // be built regardless of the status of the ID file. - // For instance, it's possible that a `docker image rm` occurred between consecutive - // identical gradle builds: the ID file remains untouched but the image still needs to be rebuilt. - if (!allImageHashes.containsKey(taggedImage)) { - task.logger.info "Not up to date: ID file exists but target image not found in docker" - return false - } - // If the depended-upon base images have changed in the meantime, then it follows that the target - // image needs to be rebuilt regardless of the status of the ID file. - def currentBaseImageHashes = baseTaggedImagesAndHashes(allImageHashes) - if (!task.baseImageHashes.equals(currentBaseImageHashes)) { - task.logger.info "Not up to date: at last one base image has changed in docker since task creation" - return false - } - // In all other cases, if the ID file hasn't been touched, then the task can be skipped. - return true - } - } - - airbyteDockerTask.configure { - // Images for java projects always rely on the distribution tarball. - dependsOn project.tasks.matching { it.name == 'distTar' } - // Ensure that all files exist beforehand. - dependsOn project.tasks.matching { it.name == 'generate' } - } - project.tasks.named('assemble').configure { - // We may revisit the dependency on assemble but the dependency should always be on a base task. - dependsOn airbyteDockerTask - } - // Add a task to clean up when doing a gradle clean. - // Don't actually mess with docker, just delete the output file. - def airbyteDockerCleanTask = project.tasks.register(taskName + "Clean", Delete) { - delete idFilePath - } - project.tasks.named('clean').configure { - dependsOn airbyteDockerCleanTask - } - return airbyteDockerTask - } - - static def build(Project project, String taskName, String dockerFileName) { - def f = new AirbyteDockerLegacyTaskFactory() - f.project = project - f.dockerFileName = dockerFileName - f.createTask(taskName) - } -} - -/** - * AirbyteDockerLegacyPlugin creates an airbyteDocker task for the project when a Dockerfile is present. - * - * Following the same logic, it creates airbyteDockerTest when Dockerfile.test is present, though - * that behavior is not used anywhere except in the source-mongo connector and is therefore deprecated - * through the use of airbyte-ci. - */ -class AirbyteDockerLegacyPlugin implements Plugin { - - void apply(Project project) { - AirbyteDockerLegacyTaskFactory.build(project, 'airbyteDocker', 'Dockerfile') - - // Used only for source-mongodb. Consider removing entirely. - if (project.name.endsWith('source-mongodb')) { - AirbyteDockerLegacyTaskFactory.build(project, 'airbyteDockerTest', 'Dockerfile.test') - } - - // Used for base-normalization. - if (project.name.endsWith('base-normalization')) { - ['airbyteDockerMSSql' : 'mssql', - 'airbyteDockerMySql' : 'mysql', - 'airbyteDockerOracle' : 'oracle', - 'airbyteDockerClickhouse': 'clickhouse', - 'airbyteDockerSnowflake' : 'snowflake', - 'airbyteDockerRedshift' : 'redshift', - 'airbyteDockerTiDB' : 'tidb', - 'airbyteDockerDuckDB' : 'duckdb' - ].forEach {taskName, customConnector -> - AirbyteDockerLegacyTaskFactory.build(project, taskName, "${customConnector}.Dockerfile") - } - } - } -} From ed2548929997f4845cceebd5ae0a4dddd911edcb Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 17:03:28 -0500 Subject: [PATCH 07/26] .github: fix python CDK publish workflow --- .github/workflows/publish-cdk-command-manually.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-cdk-command-manually.yml b/.github/workflows/publish-cdk-command-manually.yml index afce576b72d0c..4f206f609bab4 100644 --- a/.github/workflows/publish-cdk-command-manually.yml +++ b/.github/workflows/publish-cdk-command-manually.yml @@ -73,7 +73,7 @@ jobs: repository: ${{ github.event.inputs.repo }} ref: ${{ github.event.inputs.gitref }} - name: Build CDK Package - run: ./gradlew --no-daemon --no-build-cache :airbyte-cdk:python:build + run: (cd airbyte-cdk/python; ./gradlew --no-daemon --no-build-cache :build) - name: Post failure to Slack channel dev-connectors-extensibility if: ${{ failure() }} uses: slackapi/slack-github-action@v1.23.0 From 666d542baed1f8d7047cb5f252a6f7863af02652 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:41:01 -0500 Subject: [PATCH 08/26] gradle: fold integration and performance test plugins into connector plugin --- airbyte-cdk/java/airbyte-cdk/build.gradle | 16 ++- .../airbyte-integration-test-java.gradle | 62 ----------- .../main/groovy/airbyte-java-connector.gradle | 100 +++++++++++++++++- .../airbyte-performance-test-java.gradle | 48 --------- 4 files changed, 104 insertions(+), 122 deletions(-) delete mode 100644 buildSrc/src/main/groovy/airbyte-integration-test-java.gradle delete mode 100644 buildSrc/src/main/groovy/airbyte-performance-test-java.gradle diff --git a/airbyte-cdk/java/airbyte-cdk/build.gradle b/airbyte-cdk/java/airbyte-cdk/build.gradle index 1523d78df648e..c303bd8997322 100644 --- a/airbyte-cdk/java/airbyte-cdk/build.gradle +++ b/airbyte-cdk/java/airbyte-cdk/build.gradle @@ -1,10 +1,8 @@ allprojects { apply plugin: 'java-library' apply plugin: 'maven-publish' - apply plugin: 'airbyte-java-cdk' - apply plugin: 'airbyte-integration-test-java' - apply plugin: 'airbyte-performance-test-java' apply plugin: 'java-test-fixtures' + apply plugin: 'airbyte-java-cdk' group 'io.airbyte.cdk' version = getCdkTargetVersion() @@ -53,12 +51,12 @@ subprojects { subproject -> description = "Airbyte Connector Development Kit (CDK) for Java." def recursiveTasks = [ - 'assemble', - 'build', - 'integrationTestJava', - 'publish', - 'publishToMavenLocal', - 'test', + 'assemble', + 'build', + 'integrationTestJava', + 'publish', + 'publishToMavenLocal', + 'test', ] recursiveTasks.each { taskName -> tasks.named(taskName).configure { diff --git a/buildSrc/src/main/groovy/airbyte-integration-test-java.gradle b/buildSrc/src/main/groovy/airbyte-integration-test-java.gradle deleted file mode 100644 index ba5dab9a405ca..0000000000000 --- a/buildSrc/src/main/groovy/airbyte-integration-test-java.gradle +++ /dev/null @@ -1,62 +0,0 @@ -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.tasks.testing.Test - -class AirbyteIntegrationTestJavaPlugin implements Plugin { - void apply(Project project) { - project.sourceSets { - integrationTestJava { - java { - srcDir 'src/test-integration/java' - } - resources { - srcDir 'src/test-integration/resources' - } - } - } - project.tasks.named('check').configure { - dependsOn project.tasks.matching { it.name == 'compileIntegrationTestJavaJava' } - dependsOn project.tasks.matching { it.name == 'spotbugsIntegrationTestJava' } - } - - project.configurations { - integrationTestJavaImplementation.extendsFrom testImplementation - integrationTestJavaRuntimeOnly.extendsFrom testRuntimeOnly - } - - def integrationTestJava = project.tasks.register('integrationTestJava', Test) { - testClassesDirs = project.sourceSets.integrationTestJava.output.classesDirs - classpath += project.sourceSets.integrationTestJava.runtimeClasspath - - useJUnitPlatform() - testLogging() { - events 'skipped', 'started', 'passed', 'failed' - exceptionFormat 'full' - // Swallow the logs when running in airbyte-ci, rely on test reports instead. - showStandardStreams = !System.getenv().containsKey("RUN_IN_AIRBYTE_CI") - } - - jvmArgs = project.test.jvmArgs - systemProperties = project.test.systemProperties - maxParallelForks = project.test.maxParallelForks - maxHeapSize = project.test.maxHeapSize - - // Tone down the JIT when running the containerized connector to improve overall performance. - // The JVM default settings are optimized for long-lived processes in steady-state operation. - // Unlike in production, the connector containers in these tests are always short-lived. - // It's very much worth injecting a JAVA_OPTS environment variable into the container with - // flags which will reduce startup time at the detriment of long-term performance. - environment 'JOB_DEFAULT_ENV_JAVA_OPTS', '-XX:TieredStopAtLevel=1' - - // Always re-run integration tests no matter what. - outputs.upToDateWhen { false } - } - integrationTestJava.configure { - mustRunAfter project.tasks.named('check') - dependsOn project.tasks.matching { it.name == 'assemble' } - } - project.tasks.named('build').configure { - dependsOn integrationTestJava - } - } -} diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle index 1e35a61293161..31062531f15f3 100644 --- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle +++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle @@ -5,6 +5,7 @@ Also facilitates importing and working with the Java CDK. import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.tasks.testing.Test class AirbyteJavaConnectorExtension { @@ -125,9 +126,102 @@ class AirbyteJavaConnectorPlugin implements Plugin { void apply(Project project) { project.plugins.apply('application') - project.plugins.apply('java-test-fixtures') - project.plugins.apply(AirbyteIntegrationTestJavaPlugin) - project.plugins.apply(AirbytePerformanceTestJavaPlugin) + + project.sourceSets { + integrationTestJava { + java { + srcDir 'src/test-integration/java' + } + resources { + srcDir 'src/test-integration/resources' + } + } + } + project.tasks.named('check').configure { + dependsOn project.tasks.matching { it.name == 'compileIntegrationTestJavaJava' } + dependsOn project.tasks.matching { it.name == 'spotbugsIntegrationTestJava' } + } + + project.configurations { + integrationTestJavaImplementation.extendsFrom testImplementation + integrationTestJavaRuntimeOnly.extendsFrom testRuntimeOnly + } + + def integrationTestJava = project.tasks.register('integrationTestJava', Test) { + testClassesDirs = project.sourceSets.integrationTestJava.output.classesDirs + classpath += project.sourceSets.integrationTestJava.runtimeClasspath + + useJUnitPlatform() + testLogging() { + events 'skipped', 'started', 'passed', 'failed' + exceptionFormat 'full' + // Swallow the logs when running in airbyte-ci, rely on test reports instead. + showStandardStreams = !System.getenv().containsKey("RUN_IN_AIRBYTE_CI") + } + + jvmArgs = project.test.jvmArgs + systemProperties = project.test.systemProperties + maxParallelForks = project.test.maxParallelForks + maxHeapSize = project.test.maxHeapSize + + // Tone down the JIT when running the containerized connector to improve overall performance. + // The JVM default settings are optimized for long-lived processes in steady-state operation. + // Unlike in production, the connector containers in these tests are always short-lived. + // It's very much worth injecting a JAVA_OPTS environment variable into the container with + // flags which will reduce startup time at the detriment of long-term performance. + environment 'JOB_DEFAULT_ENV_JAVA_OPTS', '-XX:TieredStopAtLevel=1' + + // Always re-run integration tests no matter what. + outputs.upToDateWhen { false } + } + integrationTestJava.configure { + mustRunAfter project.tasks.named('check') + dependsOn project.tasks.matching { it.name == 'assemble' } + } + project.tasks.named('build').configure { + dependsOn integrationTestJava + } + + project.sourceSets { + performanceTestJava { + java { + srcDir 'src/test-performance/java' + } + resources { + srcDir 'src/test-performance/resources' + } + } + } + project.tasks.named('check').configure { + dependsOn project.tasks.matching { it.name == 'compilePerformanceTestJavaJava' } + dependsOn project.tasks.matching { it.name == 'spotbugsPerformanceTestJava' } + } + + project.configurations { + performanceTestJavaImplementation.extendsFrom testImplementation + performanceTestJavaRuntimeOnly.extendsFrom testRuntimeOnly + } + + def performanceTestJava = project.tasks.register('performanceTestJava', Test) { + testClassesDirs = project.sourceSets.performanceTestJava.output.classesDirs + classpath += project.sourceSets.performanceTestJava.runtimeClasspath + + systemProperty "cpuLimit", System.getProperty("cpuLimit") + systemProperty "memoryLimit", System.getProperty("memoryLimit") + useJUnitPlatform() + testLogging() { + events "passed", "failed" + exceptionFormat "full" + showStandardStreams = true + } + + outputs.upToDateWhen { false } + maxHeapSize = '3g' + } + performanceTestJava.configure { + mustRunAfter project.tasks.named('check') + dependsOn project.tasks.matching { it.name == 'assemble' } + } project.configurations { testFixturesImplementation.extendsFrom implementation diff --git a/buildSrc/src/main/groovy/airbyte-performance-test-java.gradle b/buildSrc/src/main/groovy/airbyte-performance-test-java.gradle deleted file mode 100644 index d5ccbbbd0bea8..0000000000000 --- a/buildSrc/src/main/groovy/airbyte-performance-test-java.gradle +++ /dev/null @@ -1,48 +0,0 @@ -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.tasks.testing.Test - -class AirbytePerformanceTestJavaPlugin implements Plugin { - void apply(Project project) { - project.sourceSets { - performanceTestJava { - java { - srcDir 'src/test-performance/java' - } - resources { - srcDir 'src/test-performance/resources' - } - } - } - project.tasks.named('check').configure { - dependsOn project.tasks.matching { it.name == 'compilePerformanceTestJavaJava' } - dependsOn project.tasks.matching { it.name == 'spotbugsPerformanceTestJava' } - } - - project.configurations { - performanceTestJavaImplementation.extendsFrom testImplementation - performanceTestJavaRuntimeOnly.extendsFrom testRuntimeOnly - } - - def performanceTestJava = project.tasks.register('performanceTestJava', Test) { - testClassesDirs = project.sourceSets.performanceTestJava.output.classesDirs - classpath += project.sourceSets.performanceTestJava.runtimeClasspath - - systemProperty "cpuLimit", System.getProperty("cpuLimit") - systemProperty "memoryLimit", System.getProperty("memoryLimit") - useJUnitPlatform() - testLogging() { - events "passed", "failed" - exceptionFormat "full" - showStandardStreams = true - } - - outputs.upToDateWhen { false } - maxHeapSize = '3g' - } - performanceTestJava.configure { - mustRunAfter project.tasks.named('check') - dependsOn project.tasks.matching { it.name == 'assemble' } - } - } -} From cd9eb270baf066f42c79bfe5881c89f77032d5e3 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:47:17 -0500 Subject: [PATCH 09/26] gradle: refactor airbyte-java-connector --- .../main/groovy/airbyte-java-connector.gradle | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle index 31062531f15f3..6c00347f725b2 100644 --- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle +++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle @@ -136,15 +136,27 @@ class AirbyteJavaConnectorPlugin implements Plugin { srcDir 'src/test-integration/resources' } } + performanceTestJava { + java { + srcDir 'src/test-performance/java' + } + resources { + srcDir 'src/test-performance/resources' + } + } } + project.tasks.named('check').configure { - dependsOn project.tasks.matching { it.name == 'compileIntegrationTestJavaJava' } - dependsOn project.tasks.matching { it.name == 'spotbugsIntegrationTestJava' } + dependsOn project.tasks.matching { it.name ==~ /(compile|spotbugs)[a-zA-Z]*Java/ } } project.configurations { + testFixturesImplementation.extendsFrom implementation + testFixturesRuntimeOnly.extendsFrom runtimeOnly integrationTestJavaImplementation.extendsFrom testImplementation integrationTestJavaRuntimeOnly.extendsFrom testRuntimeOnly + performanceTestJavaImplementation.extendsFrom testImplementation + performanceTestJavaRuntimeOnly.extendsFrom testRuntimeOnly } def integrationTestJava = project.tasks.register('integrationTestJava', Test) { @@ -182,26 +194,6 @@ class AirbyteJavaConnectorPlugin implements Plugin { dependsOn integrationTestJava } - project.sourceSets { - performanceTestJava { - java { - srcDir 'src/test-performance/java' - } - resources { - srcDir 'src/test-performance/resources' - } - } - } - project.tasks.named('check').configure { - dependsOn project.tasks.matching { it.name == 'compilePerformanceTestJavaJava' } - dependsOn project.tasks.matching { it.name == 'spotbugsPerformanceTestJava' } - } - - project.configurations { - performanceTestJavaImplementation.extendsFrom testImplementation - performanceTestJavaRuntimeOnly.extendsFrom testRuntimeOnly - } - def performanceTestJava = project.tasks.register('performanceTestJava', Test) { testClassesDirs = project.sourceSets.performanceTestJava.output.classesDirs classpath += project.sourceSets.performanceTestJava.runtimeClasspath @@ -223,11 +215,6 @@ class AirbyteJavaConnectorPlugin implements Plugin { dependsOn project.tasks.matching { it.name == 'assemble' } } - project.configurations { - testFixturesImplementation.extendsFrom implementation - testFixturesRuntimeOnly.extendsFrom runtimeOnly - } - project.dependencies { // Integration and performance tests should automatically // have access to the project's own main source sets. From fa8dbf4174ea2af22c33ab8acbeb511379cf09fe Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 13:56:10 -0500 Subject: [PATCH 10/26] gradle: plugin dependency cleanup --- build.gradle | 2 +- buildSrc/build.gradle | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index b45507cfbfa82..e654c98f88e0c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'base' id 'com.github.spotbugs' version '6.0.7' id 'version-catalog' - id 'ru.vyarus.use-python' + id 'ru.vyarus.use-python' version '2.3.0' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0e2dd4d1f2488..c5161cf5103f6 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -11,13 +11,6 @@ repositories { // ## Look into other, public repos. // Gradle plugin portal. gradlePluginPortal() - // Maven Central has most of everything. - mavenCentral() -} - -dependencies { - implementation 'ru.vyarus:gradle-use-python-plugin:2.3.0' - implementation 'org.apache.commons:commons-text:1.10.0' } tasks.withType(Jar).configureEach { From e49290710e35cb64248d076212b894e20f954510 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:31:28 -0500 Subject: [PATCH 11/26] gradle: remove integration/performance test tasks from root build.gradle --- build.gradle | 21 ------------------- .../main/groovy/airbyte-java-connector.gradle | 6 ++++++ 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index e654c98f88e0c..5cc6457562e68 100644 --- a/build.gradle +++ b/build.gradle @@ -324,27 +324,6 @@ subprojects { subproj -> javadoc.options.addStringOption('Xdoclint:none', '-quiet') } -// integration and performance test tasks per project -allprojects { - tasks.register('integrationTest') { - dependsOn tasks.matching { - [ - 'integrationTestJava', - 'integrationTestPython', - ].contains(it.name) - } - } - - tasks.register('performanceTest') { - dependsOn tasks.matching { - [ - 'performanceTestJava', - ].contains(it.name) - } - } -} - - // convenience task to list all dependencies per project subprojects { tasks.register('listAllDependencies', DependencyReportTask) {} diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle index 6c00347f725b2..16171d17b9f78 100644 --- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle +++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle @@ -190,6 +190,9 @@ class AirbyteJavaConnectorPlugin implements Plugin { mustRunAfter project.tasks.named('check') dependsOn project.tasks.matching { it.name == 'assemble' } } + project.tasks.register('integrationTest').configure { + dependsOn integrationTestJava + } project.tasks.named('build').configure { dependsOn integrationTestJava } @@ -214,6 +217,9 @@ class AirbyteJavaConnectorPlugin implements Plugin { mustRunAfter project.tasks.named('check') dependsOn project.tasks.matching { it.name == 'assemble' } } + project.tasks.register('performanceTest').configure { + dependsOn performanceTestJava + } project.dependencies { // Integration and performance tests should automatically From 9214c548edef2c4170ab5cd3cfa8f77c3f7fb856 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:27:17 -0500 Subject: [PATCH 12/26] gradle: push airbyte-ci python support down to connectors parent --- airbyte-integrations/connectors/build.gradle | 112 ++++++++++++++++++ build.gradle | 118 ------------------- 2 files changed, 112 insertions(+), 118 deletions(-) create mode 100644 airbyte-integrations/connectors/build.gradle diff --git a/airbyte-integrations/connectors/build.gradle b/airbyte-integrations/connectors/build.gradle new file mode 100644 index 0000000000000..57f20e679aeb7 --- /dev/null +++ b/airbyte-integrations/connectors/build.gradle @@ -0,0 +1,112 @@ +plugins { + id 'base' + id 'ru.vyarus.use-python' version '2.3.0' +} + +// Pyenv support. +try { + def pyenvRoot = "pyenv root".execute() + if (pyenvRoot.waitFor() == 0) { + ext.pyenvRoot = pyenvRoot.text.trim() + } +} catch (IOException _) { + // Swallow exception if pyenv is not installed. +} + +def pythonBin = layout.buildDirectory.file('.venv/bin/python').get().asFile.absolutePath + +// python is required by the connectors project to run airbyte-ci from source to build connector images. +python { + envPath = layout.buildDirectory.file('.venv').get().asFile + minPythonVersion = '3.10' // should be 3.10 for local development + + // Amazon Linux support. + // The airbyte-ci tool runs gradle tasks in AL2023-based containers. + // In AL2023, `python3` is necessarily v3.9, and later pythons need to be installed and named explicitly. + // See https://github.com/amazonlinux/amazon-linux-2023/issues/459 for details. + try { + if ("python3.11 --version".execute().waitFor() == 0) { + // python3.11 definitely exists at this point, use it instead of 'python3'. + pythonBinary "python3.11" + } + } catch (IOException _) { + // Swallow exception if python3.11 is not installed. + } + // Pyenv support. + try { + def pyenvRoot = "pyenv root".execute() + def pyenvLatest = "pyenv latest ${minPythonVersion}".execute() + // Pyenv definitely exists at this point: use 'python' instead of 'python3' in all cases. + pythonBinary "python" + if (pyenvRoot.waitFor() == 0 && pyenvLatest.waitFor() == 0) { + pythonPath "${pyenvRoot.text.trim()}/versions/${pyenvLatest.text.trim()}/bin" + } + } catch (IOException _) { + // Swallow exception if pyenv is not installed. + } + + scope = 'VIRTUALENV' + installVirtualenv = true + // poetry is required for installing and running airbyte-ci + pip 'poetry:1.5.1' +} + +def poetryInstallAirbyteCI = tasks.register('poetryInstallAirbyteCI', Exec) { + workingDir rootProject.file('airbyte-ci/connectors/pipelines') + commandLine pythonBin + args "-m", "poetry", "install", "--no-cache" +} +poetryInstallAirbyteCI.configure { + dependsOn tasks.named('pipInstall') +} +def poetryCleanVirtualenv = tasks.register('cleanPoetryVirtualenv', Exec) { + workingDir rootProject.file('airbyte-ci/connectors/pipelines') + commandLine pythonBin + args "-m", "poetry", "env", "remove", "--all" + onlyIf { + layout.buildDirectory.file('venv/bin/python').get().asFile.exists() + } +} +tasks.named('clean').configure { + dependsOn poetryCleanVirtualenv +} + +allprojects { + def airbyteCIConnectorsTask = { String taskName, String... connectorsArgs -> + def task = tasks.register(taskName, Exec) { + workingDir rootDir + environment "CI", "1" // set to use more suitable logging format + commandLine pythonBin + args "-m", "poetry" + args "--directory", "${rootProject.file('airbyte-ci/connectors/pipelines').absolutePath}" + args "run" + args "airbyte-ci", "connectors", "--name=${project.name}" + args connectorsArgs + // Forbid these kinds of tasks from running concurrently. + // We can induce serial execution by giving them all a common output directory. + outputs.dir rootProject.file("${rootProject.buildDir}/airbyte-ci-lock") + outputs.upToDateWhen { false } + } + task.configure { dependsOn poetryInstallAirbyteCI } + return task + } + + // Build connector image as part of 'assemble' task. + // This is required for local 'integrationTest' execution. + def buildConnectorImage = airbyteCIConnectorsTask( + 'buildConnectorImage', '--disable-report-auto-open', 'build', '--use-host-gradle-dist-tar') + buildConnectorImage.configure { + // Images for java projects always rely on the distribution tarball. + dependsOn tasks.matching { it.name == 'distTar' } + // Ensure that all files exist beforehand. + dependsOn tasks.matching { it.name == 'generate' } + } + tasks.named('assemble').configure { + // We may revisit the dependency on assemble but the dependency should always be on a base task. + dependsOn buildConnectorImage + } + + // Convenience tasks for local airbyte-ci execution. + airbyteCIConnectorsTask('airbyteCIConnectorBuild', 'build') + airbyteCIConnectorsTask('airbyteCIConnectorTest', 'test') +} diff --git a/build.gradle b/build.gradle index 5cc6457562e68..ba634d8506a2b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ plugins { id 'base' id 'com.github.spotbugs' version '6.0.7' id 'version-catalog' - id 'ru.vyarus.use-python' version '2.3.0' } @@ -26,15 +25,6 @@ ext { image_tag = System.getenv("VERSION") ?: 'dev' skipSlowTests = (System.getProperty('skipSlowTests', 'false') != 'false') } -// Pyenv support. -try { - def pyenvRoot = "pyenv root".execute() - if (pyenvRoot.waitFor() == 0) { - ext.pyenvRoot = pyenvRoot.text.trim() - } -} catch (IOException _) { - // Swallow exception if pyenv is not installed. -} def isConnectorProject = { Project project -> if (project.parent == null || project.parent.name != 'connectors') { @@ -55,50 +45,6 @@ allprojects { version = rootProject.ext.version } -// python is required by the root project to run CAT tests for connectors -python { - envPath = '.venv' - minPythonVersion = '3.10' // should be 3.10 for local development - - // Amazon Linux support. - // The airbyte-ci tool runs gradle tasks in AL2023-based containers. - // In AL2023, `python3` is necessarily v3.9, and later pythons need to be installed and named explicitly. - // See https://github.com/amazonlinux/amazon-linux-2023/issues/459 for details. - try { - if ("python3.11 --version".execute().waitFor() == 0) { - // python3.11 definitely exists at this point, use it instead of 'python3'. - pythonBinary "python3.11" - } - } catch (IOException _) { - // Swallow exception if python3.11 is not installed. - } - // Pyenv support. - try { - def pyenvRoot = "pyenv root".execute() - def pyenvLatest = "pyenv latest ${minPythonVersion}".execute() - // Pyenv definitely exists at this point: use 'python' instead of 'python3' in all cases. - pythonBinary "python" - if (pyenvRoot.waitFor() == 0 && pyenvLatest.waitFor() == 0) { - pythonPath "${pyenvRoot.text.trim()}/versions/${pyenvLatest.text.trim()}/bin" - } - } catch (IOException _) { - // Swallow exception if pyenv is not installed. - } - - scope = 'VIRTUALENV' - installVirtualenv = true - // poetry is required for installing and running airbyte-ci - pip 'poetry:1.5.1' -} - -def cleanPythonVenv = rootProject.tasks.register('cleanPythonVenv', Exec) { - commandLine 'rm' - args '-rf', "${rootProject.projectDir.absolutePath}/.venv" -} -rootProject.tasks.named('clean').configure { - dependsOn cleanPythonVenv -} - def getCDKTargetVersion() { def props = new Properties() @@ -329,70 +275,6 @@ subprojects { tasks.register('listAllDependencies', DependencyReportTask) {} } -// airbyte-ci tasks for local development -def poetryInstallAirbyteCI = tasks.register('poetryInstallAirbyteCI', Exec) { - workingDir rootProject.file('airbyte-ci/connectors/pipelines') - commandLine rootProject.file('.venv/bin/python').absolutePath - args "-m", "poetry", "install", "--no-cache" -} -poetryInstallAirbyteCI.configure { - dependsOn tasks.named('pipInstall') -} -def poetryCleanVirtualenv = tasks.register('cleanVirtualenv', Exec) { - workingDir rootProject.file('airbyte-ci/connectors/pipelines') - commandLine rootProject.file('.venv/bin/python').absolutePath - args "-m", "poetry", "env", "remove", "--all" - onlyIf { - rootProject.file('.venv/bin/python').exists() - } -} -cleanPythonVenv.configure { - dependsOn poetryCleanVirtualenv -} - -subprojects { - if (!isConnectorProject(project)) { - return - } - def airbyteCIConnectorsTask = { String taskName, String... connectorsArgs -> - def task = tasks.register(taskName, Exec) { - workingDir rootDir - environment "CI", "1" // set to use more suitable logging format - commandLine rootProject.file('.venv/bin/python').absolutePath - args "-m", "poetry" - args "--directory", "${rootProject.file('airbyte-ci/connectors/pipelines').absolutePath}" - args "run" - args "airbyte-ci", "connectors", "--name=${project.name}" - args connectorsArgs - // Forbid these kinds of tasks from running concurrently. - // We can induce serial execution by giving them all a common output directory. - outputs.dir rootProject.file("${rootProject.buildDir}/airbyte-ci-lock") - outputs.upToDateWhen { false } - } - task.configure { dependsOn poetryInstallAirbyteCI } - return task - } - - // Build connector image as part of 'assemble' task. - // This is required for local 'integrationTest' execution. - def buildConnectorImage = airbyteCIConnectorsTask( - 'buildConnectorImage', '--disable-report-auto-open', 'build', '--use-host-gradle-dist-tar') - buildConnectorImage.configure { - // Images for java projects always rely on the distribution tarball. - dependsOn tasks.matching { it.name == 'distTar' } - // Ensure that all files exist beforehand. - dependsOn tasks.matching { it.name == 'generate' } - } - tasks.named('assemble').configure { - // We may revisit the dependency on assemble but the dependency should always be on a base task. - dependsOn buildConnectorImage - } - - // Convenience tasks for local airbyte-ci execution. - airbyteCIConnectorsTask('airbyteCIConnectorBuild', 'build') - airbyteCIConnectorsTask('airbyteCIConnectorTest', 'test') -} - // produce reproducible archives // (see https://docs.gradle.org/current/userguide/working_with_files.html#sec:reproducible_archives) tasks.withType(AbstractArchiveTask).configureEach { From 4c9f1293fe90f612e98334e4817844536305db3d Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:36:08 -0500 Subject: [PATCH 13/26] gradle: push down CDK evaluation rule further down --- airbyte-integrations/connectors/build.gradle | 4 ++++ build.gradle | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/build.gradle b/airbyte-integrations/connectors/build.gradle index 57f20e679aeb7..a4b8711e90def 100644 --- a/airbyte-integrations/connectors/build.gradle +++ b/airbyte-integrations/connectors/build.gradle @@ -72,6 +72,10 @@ tasks.named('clean').configure { } allprojects { + // Evaluate CDK project before evaluating the connector. + evaluationDependsOn(':airbyte-cdk:java:airbyte-cdk') + + // Adds airbyte-ci task. def airbyteCIConnectorsTask = { String taskName, String... connectorsArgs -> def task = tasks.register(taskName, Exec) { workingDir rootDir diff --git a/build.gradle b/build.gradle index ba634d8506a2b..8159c96e6afdd 100644 --- a/build.gradle +++ b/build.gradle @@ -149,9 +149,6 @@ subprojects { subproj -> if (isConnectorProject(subproj)) { // This is a Java connector project. - // Evaluate CDK project before evaluating the connector. - evaluationDependsOn(':airbyte-cdk:java:airbyte-cdk') - if (!gradle.startParameter.taskNames.any { it.contains(':airbyte-cdk:') } && gradle.startParameter.taskNames.any { it.contains(':source-') || it.contains(':destination-') }) { // We are building a connector. Warn if the CDK JAR is missing or out of date. From 57243b99a30ab024899296f1c98a154fa75ba68c Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:41:28 -0500 Subject: [PATCH 14/26] gradle: remove VERSION dependency --- build.gradle | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/build.gradle b/build.gradle index 8159c96e6afdd..5895f64b7688e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,20 +9,7 @@ plugins { } -Properties env = new Properties() -rootProject.file('gradle.properties').withInputStream { env.load(it) } - -if (!env.containsKey('VERSION')) { - throw new Exception('Version not specified in .env file...') -} - -// `version` is used as the application build version for artifacts like jars -// `image_tag` is used as the docker tag applied to built images. -// These values are the same for building an specific Airbyte release or branch via the 'VERSION' environment variable. -// For local development builds, the 'VERSION' environment variable is unset, and built images are tagged with 'dev'. ext { - version = System.getenv("VERSION") ?: env.VERSION - image_tag = System.getenv("VERSION") ?: 'dev' skipSlowTests = (System.getProperty('skipSlowTests', 'false') != 'false') } @@ -42,7 +29,6 @@ allprojects { group = "io.${rootProject.name}${sub.isEmpty() ? '' : ".$sub"}" project.base.archivesName = "${project.group}-${project.name}" - version = rootProject.ext.version } From 3adf723b3f2b4f8fa2d364c7b301420a3b582ed1 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:46:05 -0500 Subject: [PATCH 15/26] gradle: less CDK tasks --- airbyte-cdk/java/airbyte-cdk/build.gradle | 77 ++++-------------- build.gradle | 78 ------------------- .../src/main/groovy/airbyte-java-cdk.gradle | 70 ----------------- 3 files changed, 17 insertions(+), 208 deletions(-) delete mode 100644 buildSrc/src/main/groovy/airbyte-java-cdk.gradle diff --git a/airbyte-cdk/java/airbyte-cdk/build.gradle b/airbyte-cdk/java/airbyte-cdk/build.gradle index c303bd8997322..18b8028bc0950 100644 --- a/airbyte-cdk/java/airbyte-cdk/build.gradle +++ b/airbyte-cdk/java/airbyte-cdk/build.gradle @@ -2,14 +2,10 @@ allprojects { apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'java-test-fixtures' - apply plugin: 'airbyte-java-cdk' group 'io.airbyte.cdk' - version = getCdkTargetVersion() -} -subprojects { subproject -> - def artifactBaseName = 'airbyte-cdk-' + subproject.name + def artifactBaseName = 'airbyte-cdk-' + project.name // E.g. airbyte-cdk-core, airbyte-cdk-db-sources, airbyte-cdk-db-destinations, etc. publishing { @@ -23,7 +19,7 @@ subprojects { subproject -> groupId = 'io.airbyte.cdk' artifactId = artifactBaseName + '-test-fixtures' version = project.version - artifact subproject.tasks.testFixturesJar + artifact project.tasks.testFixturesJar } } // This repository is only defined and used in the context of an artifact publishing @@ -50,69 +46,30 @@ subprojects { subproject -> description = "Airbyte Connector Development Kit (CDK) for Java." -def recursiveTasks = [ - 'assemble', - 'build', - 'integrationTestJava', - 'publish', - 'publishToMavenLocal', - 'test', -] -recursiveTasks.each { taskName -> - tasks.named(taskName).configure { - dependsOn subprojects.collect { it.tasks.named(taskName) } - } -} - -// The `publishSnapshotIfNeeded` task will be a no-op if CDK version does not end with '-SNAPSHOT'. -task publishSnapshotIfNeeded {} - -if (version.endsWith("-SNAPSHOT")) { - logger.lifecycle("Version ${version} ends with '-SNAPSHOT'. Enqueing 'publishToMavenLocal'...") - publishSnapshotIfNeeded.dependsOn publishToMavenLocal -} else { - // Uncomment as needed for debugging: - // logger.lifecycle("Version ${version} does not end with '-SNAPSHOT'. Skipping task 'publishToMavenLocal'.") -} - -task assertCdkVersionNotPublished { +tasks.register('assertCdkVersionNotPublished') { doLast { - def checkGroupId = "io.airbyte.cdk" - def checkArtifactId = "airbyte-cdk-core" - def checkVersion = getCdkTargetVersion() - def repoUrl = "https://airbyte.mycloudrepo.io/public/repositories/airbyte-public-jars" - def groupIdUrl = checkGroupId.replace('.', '/') - def artifactUrl = "${repoUrl}/${groupIdUrl}/${checkArtifactId}/${checkVersion}/${checkArtifactId}-${checkVersion}.pom" + var props = new Properties() + file("core/src/main/resources/version.properties").withInputStream(props::load) - def connection = artifactUrl.toURL().openConnection() as HttpURLConnection + var checkGroupId = "io.airbyte.cdk" + var checkArtifactId = "airbyte-cdk-core" + var checkVersion = props.getProperty('version') ?: 'undefined' + var repoUrl = "https://airbyte.mycloudrepo.io/public/repositories/airbyte-public-jars" + var groupIdUrl = "${repoUrl}/${checkGroupId.replace('.', '/')}" + var artifactUrl = "${groupIdUrl}/${checkArtifactId}/${checkVersion}/${checkArtifactId}-${checkVersion}.pom" + + var connection = artifactUrl.toURL().openConnection() as HttpURLConnection connection.setRequestMethod("HEAD") connection.connect() - def responseCode = connection.getResponseCode() + var responseCode = connection.getResponseCode() if (responseCode == 200) { - throw new GradleException("Assert failed. Java CDK '${checkVersion}' already published at: ${artifactUrl}") + throw new GradleException("Java CDK '${checkVersion}' already published at ${groupIdUrl}") } else if (responseCode == 404) { - logger.lifecycle( - "Assert succeeded. Version ${checkVersion} of ${checkArtifactId} has not been published. " + - "Checked: ${artifactUrl}" - ) + logger.lifecycle("Java CDK '${checkVersion}' not yet published at ${groupIdUrl}.") } else { - logger.error("Received unexpected HTTP response code ${responseCode}. Ensure the repository is accessible.") - throw new GradleException("Error during assertion. Received unexpected HTTP response code ${responseCode}.") + throw new GradleException("Unexpected HTTP response code ${responseCode} from ${artifactUrl}, expected either 200 or 404.") } } } - -def cleanLocalCache = tasks.register('cleanLocalCache') { - def userHome = System.getProperty("user.home") - doLast { - delete '.gradle' - delete '${userHome}/.m2/repository/io/airbyte/' - delete '${userHome}/.gradle/caches/modules-2/files-2.1/io.airbyte.cdk/' - } -} -cleanLocalCache.configure { - dependsOn tasks.named('clean') - dependsOn subprojects.collect { it.tasks.named('clean') } -} diff --git a/build.gradle b/build.gradle index 5895f64b7688e..0208c286964ad 100644 --- a/build.gradle +++ b/build.gradle @@ -13,12 +13,6 @@ ext { skipSlowTests = (System.getProperty('skipSlowTests', 'false') != 'false') } -def isConnectorProject = { Project project -> - if (project.parent == null || project.parent.name != 'connectors') { - return false - } - return project.name.startsWith("source-") || project.name.startsWith("destination-") -} allprojects { apply plugin: 'base' @@ -32,64 +26,6 @@ allprojects { } -def getCDKTargetVersion() { - def props = new Properties() - file("airbyte-cdk/java/airbyte-cdk/src/main/resources/version.properties").withInputStream { props.load(it) } - return props.getProperty('version') -} -static def getLatestFileModifiedTimeFromFiles(files) { - if (files.isEmpty()) { - return null - } - return files.findAll { it.isFile() } - .collect { it.lastModified() } - .max() -} -def checkCDKJarExists(requiredSnapshotVersion) { - if (requiredSnapshotVersion == null) { - // Connector does not require CDK snapshot. - return - } - final boolean checkFileChanges = true - final cdkTargetVersion = getCDKTargetVersion() - if (requiredSnapshotVersion != cdkTargetVersion) { - if (!cdkTargetVersion.contains("-SNAPSHOT")) { - throw new GradleException( - "CDK JAR version is not publishing snapshot but connector requires version ${requiredSnapshotVersion}.\n" + - "Please check that the version in the CDK properties file matches the connector build.gradle." - ) - } - throw new GradleException( - "CDK JAR version ${cdkTargetVersion} does not match connector's required version ${requiredSnapshotVersion}.\n" + - "Please check that the version in the CDK properties file matches the connector build.gradle." - ) - } - - def cdkJar = file("${System.properties['user.home']}/.m2/repository/io/airbyte/airbyte-cdk/${cdkTargetVersion}/airbyte-cdk-${cdkTargetVersion}.jar") - if (!cdkJar.exists()) { - println("WARNING: CDK JAR does not exist at ${cdkJar.path}.\nPlease run './gradlew :airbyte-cdk:java:airbyte-cdk:build'.") - } - if (checkFileChanges) { - def latestJavaFileTimestamp = getLatestFileModifiedTimeFromFiles(file("${rootDir}/airbyte-cdk/java/airbyte-cdk/src").listFiles().findAll { it.isFile() }) - if (cdkJar.lastModified() < latestJavaFileTimestamp) { - throw new GradleException("CDK JAR is out of date. Please run './gradlew :airbyte-cdk:java:airbyte-cdk:build'.") - } - } -} -static def getCDKSnapshotRequirement(dependenciesList) { - def cdkSnapshotRequirement = dependenciesList.find { - it.requested instanceof ModuleComponentSelector && - it.requested.group == 'io.airbyte' && - it.requested.module == 'airbyte-cdk' && - it.requested.version.endsWith('-SNAPSHOT') - } - if (cdkSnapshotRequirement == null) { - return null - } else { - return cdkSnapshotRequirement.requested.version - } -} - // Common configurations for 'assemble'. allprojects { @@ -132,20 +68,6 @@ subprojects { subproj -> } } - if (isConnectorProject(subproj)) { - // This is a Java connector project. - - if (!gradle.startParameter.taskNames.any { it.contains(':airbyte-cdk:') } && - gradle.startParameter.taskNames.any { it.contains(':source-') || it.contains(':destination-') }) { - // We are building a connector. Warn if the CDK JAR is missing or out of date. - final String cdkRelativePath = 'airbyte-cdk/java/airbyte-cdk' - afterEvaluate { - def cdkVersionNeeded = getCDKSnapshotRequirement(configurations.compileClasspath.incoming.resolutionResult.allDependencies) - checkCDKJarExists(cdkVersionNeeded) - } - } - } - spotbugs { ignoreFailures = false effort = Effort.valueOf(rootProject.ext.skipSlowTests ? 'MIN' : 'MAX') diff --git a/buildSrc/src/main/groovy/airbyte-java-cdk.gradle b/buildSrc/src/main/groovy/airbyte-java-cdk.gradle deleted file mode 100644 index 68f1c95fdeb65..0000000000000 --- a/buildSrc/src/main/groovy/airbyte-java-cdk.gradle +++ /dev/null @@ -1,70 +0,0 @@ -/* -This class facilites detecting the Java CDK target version via readCdkTargetVersion(). -*/ - -import java.util.Properties -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.tasks.testing.Test - -class AirbyteJavaCdkPlugin implements Plugin { - - static String CDK_VERSION_FILE = "airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties" - - String readCdkTargetVersion(Project project) { - Properties cdkVersionProps = new Properties() - project.file("${project.rootDir}/${CDK_VERSION_FILE}").withInputStream { - cdkVersionProps.load(it) - } - return cdkVersionProps.getProperty('version') ?: 'undefined' - } - - @Override - void apply(Project project) { - project.ext.getCdkTargetVersion = { - return readCdkTargetVersion(project) - } - project.getTasks().create("disableLocalCdkRefs", DisableLocalCdkRefsTask.class) - project.getTasks().create("assertNotUsingLocalCdk", AssertNotUsingLocalCdkTask.class) - } - - public static class DisableLocalCdkRefsTask extends DefaultTask { - @TaskAction - public void disableLocalCdkRefs() { - // Step through the project tree and set useLocalCdk to false on all connectors - getProject().rootProject.fileTree(dir: '.', include: '**/build.gradle').forEach(file -> { - String content = file.getText() - if (content.contains("useLocalCdk = true")) { - content = content.replace("useLocalCdk = true", "useLocalCdk = false") - file.setText(content) - System.out.println("Updated " + file.getPath()) - } - }) - } - } - - public static class AssertNotUsingLocalCdkTask extends DefaultTask { - @TaskAction - public void assertNotUsingLocalCdk() { - List foundPaths = new ArrayList<>() - - for (File file : getProject().rootProject.fileTree(dir: '.', include: '**/build.gradle')) { - String content = file.getText() - if (content.contains("useLocalCdk = true")) { - System.err.println("Found usage of 'useLocalCdk = true' in " + file.getPath()) - foundPaths.add(file.getPath()) - } - } - - if (!foundPaths.isEmpty()) { - String errorMessage = String.format( - "Detected usage of 'useLocalCdk = true' in the following files:\n%s\n" + - "This must be set to 'false' before merging to the main branch. \n" + - "NOTE: You can run './gradlew disableLocalCdkRefs' to automatically set it to 'false' on all projects.", - String.join("\n", foundPaths) - ) - throw new RuntimeException(errorMessage) - } - } - } -} From 1697a79799e02eb60767216457b3b306f02ff9aa Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:51:34 -0500 Subject: [PATCH 16/26] gradle: refactor root build.gradle --- build.gradle | 57 ++++++++++++++----------------------------------- settings.gradle | 1 + 2 files changed, 17 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index 0208c286964ad..07aca4334df10 100644 --- a/build.gradle +++ b/build.gradle @@ -5,51 +5,45 @@ import com.github.spotbugs.snom.SpotBugsTask plugins { id 'base' id 'com.github.spotbugs' version '6.0.7' - id 'version-catalog' } - ext { skipSlowTests = (System.getProperty('skipSlowTests', 'false') != 'false') } - allprojects { apply plugin: 'base' + apply plugin: 'java' + apply plugin: 'java-test-fixtures' + apply plugin: 'com.github.spotbugs' - // by default gradle uses directory as the project name. That works very well in a single project environment but + // By default gradle uses directory as the project name. That works very well in a single project environment but // projects clobber each other in an environments with subprojects when projects are in directories named identically. def sub = rootDir.relativePath(projectDir.parentFile).replace('/', '.') group = "io.${rootProject.name}${sub.isEmpty() ? '' : ".$sub"}" project.base.archivesName = "${project.group}-${project.name}" -} - - -// Common configurations for 'assemble'. -allprojects { + // Produce reproducible archives + // (see https://docs.gradle.org/current/userguide/working_with_files.html#sec:reproducible_archives) + tasks.withType(AbstractArchiveTask).configureEach { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + // Common configurations for 'assemble'. tasks.withType(Tar).configureEach { duplicatesStrategy DuplicatesStrategy.INCLUDE } - tasks.withType(Zip).configureEach { duplicatesStrategy DuplicatesStrategy.INCLUDE // Disabling distZip causes the build to break for some reason, so: instead of disabling it, make it fast. entryCompression ZipEntryCompression.STORED } -} - -// Java projects common configurations. -subprojects { subproj -> - if (!subproj.file('src/main/java').directory) { - return - } + // Convenience task to list all dependencies per project + tasks.register('listAllDependencies', DependencyReportTask) {} - apply plugin: 'java' - apply plugin: 'java-test-fixtures' - apply plugin: 'com.github.spotbugs' + // Common java configurations java { sourceCompatibility = JavaVersion.VERSION_21 @@ -115,7 +109,7 @@ subprojects { subproj -> // Order test classes by annotation. systemProperty 'junit.jupiter.testclass.order.default', 'org.junit.jupiter.api.ClassOrderer$OrderAnnotation' - if (!subproj.hasProperty('testExecutionConcurrency')) { + if (!project.hasProperty('testExecutionConcurrency')) { // By default, let gradle spawn as many independent workers as it wants. maxParallelForks = Runtime.runtime.availableProcessors() maxHeapSize = '3G' @@ -125,7 +119,7 @@ subprojects { subproj -> maxParallelForks = 1 maxHeapSize = '8G' // Manage test execution concurrency in JUnit. - String concurrency = subproj.property('testExecutionConcurrency').toString() + String concurrency = project.property('testExecutionConcurrency').toString() if (concurrency.isInteger() && (concurrency as int) > 0) { // Define a fixed number of threads when the property is set to a positive integer. systemProperty 'junit.jupiter.execution.parallel.config.fixed.parallelism', concurrency @@ -174,22 +168,3 @@ subprojects { subproj -> javadoc.options.addStringOption('Xdoclint:none', '-quiet') } - -// convenience task to list all dependencies per project -subprojects { - tasks.register('listAllDependencies', DependencyReportTask) {} -} - -// produce reproducible archives -// (see https://docs.gradle.org/current/userguide/working_with_files.html#sec:reproducible_archives) -tasks.withType(AbstractArchiveTask).configureEach { - preserveFileTimestamps = false - reproducibleFileOrder = true -} - -// pin dependency versions according to ./deps.toml -catalog { - versionCatalog { - from(files("deps.toml")) - } -} diff --git a/settings.gradle b/settings.gradle index fb56a14df9073..24973aed3e0d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -121,6 +121,7 @@ dependencyResolutionManagement { } } + // TODO: get rid of this versionCatalogs { libs { from(files("deps.toml")) From aaaed2e42630df3159cab89e88cfcc4d91b46969 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 16:56:53 -0500 Subject: [PATCH 17/26] .github: adjust workflows to CDK changes --- .github/workflows/legacy-test-command.yml | 3 --- .github/workflows/publish-java-cdk-command.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/legacy-test-command.yml b/.github/workflows/legacy-test-command.yml index 20e7c593d4922..3d530b81e1434 100644 --- a/.github/workflows/legacy-test-command.yml +++ b/.github/workflows/legacy-test-command.yml @@ -113,9 +113,6 @@ jobs: fi env: GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }} - - name: Build Java CDK Snapshot if Needed - # If a snapshot version is specified for the Java CDK, build publish locally. Otherwise, do nothing. - run: ./gradlew :airbyte-cdk:java:airbyte-cdk:publishSnapshotIfNeeded - name: Test ${{ github.event.inputs.connector }} id: test env: diff --git a/.github/workflows/publish-java-cdk-command.yml b/.github/workflows/publish-java-cdk-command.yml index b72a80a82b6be..bce9961372bda 100644 --- a/.github/workflows/publish-java-cdk-command.yml +++ b/.github/workflows/publish-java-cdk-command.yml @@ -122,9 +122,6 @@ jobs: run: ./gradlew :airbyte-cdk:java:airbyte-cdk:assertCdkVersionNotPublished - name: Build Java CDK run: ./gradlew --no-daemon :airbyte-cdk:java:airbyte-cdk:build - - name: Publish Java Modules to MavenLocal (Dry-Run) - if: ${{ !(env.DRY_RUN == 'false') }} - run: ./gradlew --no-daemon :airbyte-cdk:java:airbyte-cdk:publishToMavenLocal - name: Upload jars as artifacts if: ${{ !(env.DRY_RUN == 'false') }} uses: actions/upload-artifact@v2 From 198439a3adb629f685bbd2a37e5a0593186117ac Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:00:21 -0500 Subject: [PATCH 18/26] gradle: remove superfluous commentary --- buildSrc/build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index c5161cf5103f6..21109a19fa65f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,12 +4,6 @@ plugins { repositories { // # Gradle looks for dependency artifacts in repositories listed in 'repositories' blocks in descending order. - - // ## Prefer repos controlled by Airbyte. - // TODO: add airbyte-controlled proxy repos here - - // ## Look into other, public repos. - // Gradle plugin portal. gradlePluginPortal() } From 8b35e0ae3dde2b407cbf99ba3bc631fcec1730a9 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:05:20 -0500 Subject: [PATCH 19/26] gradle: remove unused al2023 support for python plugin --- airbyte-integrations/connectors/build.gradle | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/airbyte-integrations/connectors/build.gradle b/airbyte-integrations/connectors/build.gradle index a4b8711e90def..9c9abf6535f88 100644 --- a/airbyte-integrations/connectors/build.gradle +++ b/airbyte-integrations/connectors/build.gradle @@ -20,18 +20,6 @@ python { envPath = layout.buildDirectory.file('.venv').get().asFile minPythonVersion = '3.10' // should be 3.10 for local development - // Amazon Linux support. - // The airbyte-ci tool runs gradle tasks in AL2023-based containers. - // In AL2023, `python3` is necessarily v3.9, and later pythons need to be installed and named explicitly. - // See https://github.com/amazonlinux/amazon-linux-2023/issues/459 for details. - try { - if ("python3.11 --version".execute().waitFor() == 0) { - // python3.11 definitely exists at this point, use it instead of 'python3'. - pythonBinary "python3.11" - } - } catch (IOException _) { - // Swallow exception if python3.11 is not installed. - } // Pyenv support. try { def pyenvRoot = "pyenv root".execute() From 5a809b71c7e1b9c86af9ca3c38a8739771167b7a Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:18:52 -0500 Subject: [PATCH 20/26] gradle: better skipSlowTests handling --- build.gradle | 12 +----------- .../src/main/groovy/airbyte-java-connector.gradle | 7 +++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 07aca4334df10..a1f65518d678a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,6 @@ plugins { id 'com.github.spotbugs' version '6.0.7' } -ext { - skipSlowTests = (System.getProperty('skipSlowTests', 'false') != 'false') -} - allprojects { apply plugin: 'base' apply plugin: 'java' @@ -64,7 +60,7 @@ allprojects { spotbugs { ignoreFailures = false - effort = Effort.valueOf(rootProject.ext.skipSlowTests ? 'MIN' : 'MAX') + effort = Effort.valueOf(System.getProperty('skipSlowTests', 'false') == 'false' ? 'MAX' : 'MIN') excludeFilter.set rootProject.file('spotbugs-exclude-filter-file.xml') reportLevel = Confidence.valueOf('HIGH') showProgress = false @@ -128,12 +124,6 @@ allprojects { systemProperty 'junit.jupiter.execution.parallel.config.strategy', 'dynamic' } } - - // Exclude all connector unit tests upon request. - if (rootProject.ext.skipSlowTests) { - exclude '**/io/airbyte/integrations/source/**' - exclude '**/io/airbyte/integrations/destination/**' - } } dependencies { diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle index 16171d17b9f78..d7626c8e5f112 100644 --- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle +++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle @@ -159,6 +159,11 @@ class AirbyteJavaConnectorPlugin implements Plugin { performanceTestJavaRuntimeOnly.extendsFrom testRuntimeOnly } + boolean withSlowTests = System.getProperty('skipSlowTests', 'false') == 'false' + project.test { + onlyIf { withSlowTests } + } + def integrationTestJava = project.tasks.register('integrationTestJava', Test) { testClassesDirs = project.sourceSets.integrationTestJava.output.classesDirs classpath += project.sourceSets.integrationTestJava.runtimeClasspath @@ -189,6 +194,7 @@ class AirbyteJavaConnectorPlugin implements Plugin { integrationTestJava.configure { mustRunAfter project.tasks.named('check') dependsOn project.tasks.matching { it.name == 'assemble' } + onlyIf { withSlowTests } } project.tasks.register('integrationTest').configure { dependsOn integrationTestJava @@ -216,6 +222,7 @@ class AirbyteJavaConnectorPlugin implements Plugin { performanceTestJava.configure { mustRunAfter project.tasks.named('check') dependsOn project.tasks.matching { it.name == 'assemble' } + onlyIf { withSlowTests } } project.tasks.register('performanceTest').configure { dependsOn performanceTestJava From 8f327f87b2a47715126e6a161a533181a18d6b11 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:26:16 -0500 Subject: [PATCH 21/26] gradle: inline dependencies in root build.gradle --- build.gradle | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index a1f65518d678a..74ed11deef027 100644 --- a/build.gradle +++ b/build.gradle @@ -128,21 +128,29 @@ allprojects { dependencies { // Lombok dependencies - compileOnly libs.lombok - annotationProcessor libs.lombok - testCompileOnly libs.lombok - testAnnotationProcessor libs.lombok - testFixturesCompileOnly libs.lombok - testFixturesAnnotationProcessor libs.lombok + def lombok = "org.projectlombok:lombok:1.18.30" + compileOnly lombok + annotationProcessor lombok + testCompileOnly lombok + testAnnotationProcessor lombok + testFixturesCompileOnly lombok + testFixturesAnnotationProcessor lombok // JUnit dependencies - testRuntimeOnly libs.junit.jupiter.engine - testImplementation libs.bundles.junit - testImplementation libs.assertj.core - testImplementation libs.junit.pioneer - testFixturesImplementation libs.bundles.junit - testFixturesImplementation libs.assertj.core - testFixturesImplementation libs.junit.pioneer + def junit_version = "5.9.1" + testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}" + testFixturesImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" + testFixturesImplementation "org.mockito:mockito-junit-jupiter:5.10.0" + testFixturesImplementation "org.assertj:assertj-core:3.21.0" + testFixturesImplementation "org.junit-pioneer:junit-pioneer:1.7.1" + + testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}" + testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" + testImplementation "org.mockito:mockito-junit-jupiter:5.10.0" + testImplementation "org.assertj:assertj-core:3.21.0" + testImplementation "org.junit-pioneer:junit-pioneer:1.7.1" + + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}" // adds owasp plugin implementation 'com.github.spotbugs:spotbugs-annotations:4.8.3' From cab855fda0637ebb6772ef9cad05179508a8ab3e Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:32:54 -0500 Subject: [PATCH 22/26] gradle: remove unused repos --- settings.gradle | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/settings.gradle b/settings.gradle index 24973aed3e0d5..e3e66302e8af1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,9 +32,6 @@ dependencyResolutionManagement { repositories { // # Gradle looks for dependency artifacts in repositories listed in 'repositories' blocks in descending order. - // ## Start with the local filesystem. - mavenLocal() - // ## Prefer repos controlled by Airbyte. maven { @@ -105,20 +102,6 @@ dependencyResolutionManagement { includeGroup 'org.apache.kafka' } } - // Node.js download repository, required only by com.github.node-gradle.node plugin. - ivy { - name = "Node.js" - setUrl("https://nodejs.org/dist/") - patternLayout { - artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]") - } - metadataSources { - artifact() - } - content { - includeModule("org.nodejs", "node") - } - } } // TODO: get rid of this From 2f7f4ffe5d7a6c2615ca76de4cb60ad08545e3c3 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 20:45:13 -0500 Subject: [PATCH 23/26] gradle: auto-detect CDK modules --- airbyte-cdk/java/airbyte-cdk/settings.gradle | 13 --------- settings.gradle | 29 +++++++++----------- 2 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 airbyte-cdk/java/airbyte-cdk/settings.gradle diff --git a/airbyte-cdk/java/airbyte-cdk/settings.gradle b/airbyte-cdk/java/airbyte-cdk/settings.gradle deleted file mode 100644 index ed322fc863640..0000000000000 --- a/airbyte-cdk/java/airbyte-cdk/settings.gradle +++ /dev/null @@ -1,13 +0,0 @@ -rootProject.name = 'airbyte' - -include ':airbyte-cdk:java:airbyte-cdk:dependencies' -include ':airbyte-cdk:java:airbyte-cdk:core' -include ':airbyte-cdk:java:airbyte-cdk:db-sources' -include ':airbyte-cdk:java:airbyte-cdk:db-destinations' -include ':airbyte-cdk:java:airbyte-cdk:s3-destinations' -include ':airbyte-cdk:java:airbyte-cdk:typing-deduping' -include ':airbyte-cdk:java:airbyte-cdk:azure-blob-storage-destinations' -include ':airbyte-cdk:java:airbyte-cdk:gcs-destinations' -include ':airbyte-cdk:java:airbyte-cdk:datastore-bigquery' -include ':airbyte-cdk:java:airbyte-cdk:datastore-mongo' -include ':airbyte-cdk:java:airbyte-cdk:datastore-postgres' diff --git a/settings.gradle b/settings.gradle index e3e66302e8af1..0b0041b6356f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -143,22 +143,14 @@ if (isCiServer || isAirbyteCI) { rootProject.name = 'airbyte' -include ':airbyte-cdk:java:airbyte-cdk' -include ':airbyte-cdk:java:airbyte-cdk:dependencies' -include ':airbyte-cdk:java:airbyte-cdk:core' -include ':airbyte-cdk:java:airbyte-cdk:db-destinations' -include ':airbyte-cdk:java:airbyte-cdk:db-sources' -include ':airbyte-cdk:java:airbyte-cdk:s3-destinations' -include ':airbyte-cdk:java:airbyte-cdk:typing-deduping' -include ':airbyte-cdk:java:airbyte-cdk:azure-blob-storage-destinations' -include ':airbyte-cdk:java:airbyte-cdk:gcs-destinations' -include ':airbyte-cdk:java:airbyte-cdk:datastore-bigquery' -include ':airbyte-cdk:java:airbyte-cdk:datastore-mongo' -include ':airbyte-cdk:java:airbyte-cdk:datastore-postgres' - -include ':airbyte-integrations:connector-templates:generator' -include ':airbyte-integrations:connectors-performance:source-harness' -include ':airbyte-integrations:connectors-performance:destination-harness' +// Include all java CDK modules. +def cdkPath = rootDir.toPath().resolve('airbyte-cdk/java/airbyte-cdk') +cdkPath.eachDir { dir -> + def buildFiles = file(dir).list { file, name -> name == "build.gradle" } + if (buildFiles.length == 1) { + include ":airbyte-cdk:java:airbyte-cdk:${dir.getFileName()}" + } +} // Include all java connector projects. def integrationsPath = rootDir.toPath().resolve('airbyte-integrations/connectors') @@ -168,3 +160,8 @@ integrationsPath.eachDir { dir -> include ":airbyte-integrations:connectors:${dir.getFileName()}" } } + +// Include miscellaneous modules. +include ':airbyte-integrations:connector-templates:generator' +include ':airbyte-integrations:connectors-performance:source-harness' +include ':airbyte-integrations:connectors-performance:destination-harness' From c635d1343011096d00d4cfdd4b2116490a019213 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Wed, 14 Feb 2024 21:12:00 -0500 Subject: [PATCH 24/26] .github: run health check workflow on github runner --- .github/workflows/gradle.yml | 70 ++---------------------------------- 1 file changed, 2 insertions(+), 68 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 340d604990590..b560cf6b3221f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,47 +20,14 @@ on: - synchronize jobs: - # In case of self-hosted EC2 errors, remove this block. - start-check-runner: - name: Start EC2 Runner - timeout-minutes: 10 - runs-on: ubuntu-latest - outputs: - label: ${{ steps.start-ec2-runner.outputs.label }} - ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} - steps: - - name: Checkout Airbyte - uses: actions/checkout@v3 - - name: Check PAT rate limits - run: | - ./tools/bin/find_non_rate_limited_PAT \ - ${{ secrets.GH_PAT_BUILD_RUNNER_OSS }} \ - ${{ secrets.GH_PAT_BUILD_RUNNER_BACKUP }} - - name: Start AWS Runner - id: start-ec2-runner - uses: ./.github/actions/start-aws-runner - with: - aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - # Use a beefier instance type than the default c5.2xlarge, but with the same per-core cost. - # When gradle runs on this instance, it will use up all the available cores anyway. - # There should be little to no difference in total cost, however the job latency will be improved. - # At the time of this writing, the latency doesn't improve much beyond this instance size (approx 5 minutes). - # This is largely thanks to the gradle cache. - ec2-instance-type: "c5.4xlarge" - github-token: ${{ env.PAT }} - run-check: - # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest. - needs: start-check-runner # required to start the main job when the runner is ready - runs-on: ${{ needs.start-check-runner.outputs.label }} # run the job on the newly created runner + runs-on: connector-test-xxlarge name: Gradle Check timeout-minutes: 30 steps: - name: Checkout Airbyte uses: actions/checkout@v3 - - # IMPORTANT! This is nessesary to make sure that a status is reported on the PR + # IMPORTANT! This is necessary to make sure that a status is reported on the PR # even if the workflow is skipped. If we used github actions filters, the workflow # would not be reported as skipped, but instead would be forever pending. # @@ -106,39 +73,6 @@ jobs: # TODO: be able to remove the skipSlowTests property arguments: --scan --no-daemon --no-watch-fs check -DskipSlowTests=true - # In case of self-hosted EC2 errors, remove this block. - stop-check-runner: - name: Stop EC2 Runner - timeout-minutes: 10 - needs: - - start-check-runner # required to get output from the start-runner job - - run-check # required to wait when the main job is done - runs-on: ubuntu-latest - # Always is required to stop the runner even if the previous job has errors. However always() runs even if the previous step is skipped. - # Thus, we check for skipped here. - if: ${{ always() && needs.start-check-runner.result != 'skipped'}} - steps: - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-2 - - name: Checkout Airbyte - uses: actions/checkout@v3 - - name: Check PAT rate limits - run: | - ./tools/bin/find_non_rate_limited_PAT \ - ${{ secrets.GH_PAT_BUILD_RUNNER_OSS }} \ - ${{ secrets.GH_PAT_BUILD_RUNNER_BACKUP }} - - name: Stop EC2 runner - uses: supertopher/ec2-github-runner@base64v1.0.10 - with: - mode: stop - github-token: ${{ env.PAT }} - label: ${{ needs.start-check-runner.outputs.label }} - ec2-instance-id: ${{ needs.start-check-runner.outputs.ec2-instance-id }} - set-instatus-incident-on-failure: name: Create Instatus Incident on Failure runs-on: ubuntu-latest From c145aaad4733a1343bb388f0c3dee4fed60301b1 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Thu, 15 Feb 2024 12:43:56 -0500 Subject: [PATCH 25/26] address review comments round 1 --- .github/workflows/gradle.yml | 4 ++++ build.gradle | 43 ++++++++++++++++++++---------------- settings.gradle | 1 - 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b560cf6b3221f..61fc006f62f36 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,6 +21,10 @@ on: jobs: run-check: + # The gradle check task which we will run is embarrassingly parallelizable. + # We therefore run this on a machine with a maximum number of cores. + # We pay per time and per core, so there should be little difference in total cost. + # The latency overhead of setting up gradle prior to running the actual task adds up to about a minute. runs-on: connector-test-xxlarge name: Gradle Check timeout-minutes: 30 diff --git a/build.gradle b/build.gradle index 74ed11deef027..befdc9deaa134 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ allprojects { } dependencies { - // Lombok dependencies + // Lombok dependencies. def lombok = "org.projectlombok:lombok:1.18.30" compileOnly lombok annotationProcessor lombok @@ -136,24 +136,29 @@ allprojects { testFixturesCompileOnly lombok testFixturesAnnotationProcessor lombok - // JUnit dependencies - def junit_version = "5.9.1" - testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}" - testFixturesImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" - testFixturesImplementation "org.mockito:mockito-junit-jupiter:5.10.0" - testFixturesImplementation "org.assertj:assertj-core:3.21.0" - testFixturesImplementation "org.junit-pioneer:junit-pioneer:1.7.1" - - testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}" - testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" - testImplementation "org.mockito:mockito-junit-jupiter:5.10.0" - testImplementation "org.assertj:assertj-core:3.21.0" - testImplementation "org.junit-pioneer:junit-pioneer:1.7.1" - - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}" - - // adds owasp plugin - implementation 'com.github.spotbugs:spotbugs-annotations:4.8.3' + // JUnit dependencies. + def vAssertJ = "3.21.0" + def vJUnit = "5.9.1" + def vJUnitJupiter = "5.10.0" + def vJUnitPioneer = "1.7.1" + + testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:${vJUnit}" + testFixturesImplementation "org.junit.jupiter:junit-jupiter-params:${vJUnit}" + testFixturesImplementation "org.mockito:mockito-junit-jupiter:${vJUnitJupiter}" + testFixturesImplementation "org.assertj:assertj-core:${vAssertJ}" + testFixturesImplementation "org.junit-pioneer:junit-pioneer:${vJUnitPioneer}" + + testImplementation "org.junit.jupiter:junit-jupiter-api:${vJUnit}" + testImplementation "org.junit.jupiter:junit-jupiter-params:${vJUnit}" + testImplementation "org.mockito:mockito-junit-jupiter:${vJUnitJupiter}" + testImplementation "org.assertj:assertj-core:${vAssertJ}" + testImplementation "org.junit-pioneer:junit-pioneer:${vJUnitPioneer}" + + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${vJUnit}" + + // Spotbugs dependencies. + def vSpotbugs = "4.8.3" + implementation "com.github.spotbugs:spotbugs-annotations:${vSpotbugs}" } tasks.withType(SpotBugsTask).configureEach { diff --git a/settings.gradle b/settings.gradle index 0b0041b6356f7..17f8450c9a957 100644 --- a/settings.gradle +++ b/settings.gradle @@ -104,7 +104,6 @@ dependencyResolutionManagement { } } - // TODO: get rid of this versionCatalogs { libs { from(files("deps.toml")) From 8b700f962841a63c9ddde93b4925764bbd33ea0b Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Thu, 15 Feb 2024 13:08:34 -0500 Subject: [PATCH 26/26] rename gradle workflow --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 61fc006f62f36..732f0e506695a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,4 +1,4 @@ -name: Airbyte CI - Repository Health Check +name: Connector Ops CI - Gradle Check concurrency: group: ${{ github.workflow }}-${{ github.ref }}