Merge branch 'master' into daryna/source-google-search-console/missin…

…g-fields

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.64.2
+current_version = 0.64.4
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?

.github/workflows/airbyte-ci-release.yml

@@ -54,7 +54,7 @@ jobs:
         working-directory: airbyte-ci/connectors/pipelines/
         run: poetry run poe build-release-binary ${{ env.BINARY_FILE_NAME }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: airbyte-ci-${{ matrix.os }}-${{ steps.get_short_sha.outputs.sha }}
           path: airbyte-ci/connectors/pipelines/dist/${{ env.BINARY_FILE_NAME }}

.gitignore

@@ -10,6 +10,7 @@ out
 .project
 .settings
 .vscode
+.kotlin
 **/gmon.out
 static_checker_reports/
 

airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/AirbyteConnectorRunner.kt

@@ -5,6 +5,7 @@ import io.airbyte.cdk.command.ConnectorCommandLinePropertySource
 import io.airbyte.cdk.command.MetadataYamlPropertySource
 import io.micronaut.configuration.picocli.MicronautFactory
 import io.micronaut.context.ApplicationContext
+import io.micronaut.context.RuntimeBeanDefinition
 import io.micronaut.context.env.CommandLinePropertySource
 import io.micronaut.context.env.Environment
 import io.micronaut.core.cli.CommandLine as MicronautCommandLine
@@ -17,8 +18,11 @@ import picocli.CommandLine.Model.UsageMessageSpec
 
 /** Source connector entry point. */
 class AirbyteSourceRunner(
+    /** CLI args. */
     args: Array<out String>,
-) : AirbyteConnectorRunner("source", args) {
+    /** Micronaut bean definition overrides, used only for tests. */
+    vararg testBeanDefinitions: RuntimeBeanDefinition<*>,
+) : AirbyteConnectorRunner("source", args, testBeanDefinitions) {
     companion object {
         @JvmStatic
         fun run(vararg args: String) {
@@ -29,8 +33,11 @@ class AirbyteSourceRunner(
 
 /** Destination connector entry point. */
 class AirbyteDestinationRunner(
+    /** CLI args. */
     args: Array<out String>,
-) : AirbyteConnectorRunner("destination", args) {
+    /** Micronaut bean definition overrides, used only for tests. */
+    vararg testBeanDefinitions: RuntimeBeanDefinition<*>,
+) : AirbyteConnectorRunner("destination", args, testBeanDefinitions) {
     companion object {
         @JvmStatic
         fun run(vararg args: String) {
@@ -46,6 +53,7 @@ class AirbyteDestinationRunner(
 sealed class AirbyteConnectorRunner(
     val connectorType: String,
     val args: Array<out String>,
+    val testBeanDefinitions: Array<out RuntimeBeanDefinition<*>>,
 ) {
     val envs: Array<String> = arrayOf(Environment.CLI, connectorType)
 
@@ -65,11 +73,12 @@ sealed class AirbyteConnectorRunner(
                     commandLinePropertySource,
                     MetadataYamlPropertySource(),
                 )
+                .beanDefinitions(*testBeanDefinitions)
                 .start()
         val isTest: Boolean = ctx.environment.activeNames.contains(Environment.TEST)
         val picocliFactory: CommandLine.IFactory = MicronautFactory(ctx)
         val picocliCommandLine: CommandLine =
-            picocliCommandLineFactory.build<AirbyteConnectorRunnable>(picocliFactory, isTest)
+            picocliCommandLineFactory.build<AirbyteConnectorRunnable>(picocliFactory)
         val exitCode: Int = picocliCommandLine.execute(*args)
         if (!isTest) {
             // Required by the platform, otherwise syncs may hang.
@@ -82,10 +91,7 @@ sealed class AirbyteConnectorRunner(
 class PicocliCommandLineFactory(
     val runner: AirbyteConnectorRunner,
 ) {
-    inline fun <reified R : Runnable> build(
-        factory: CommandLine.IFactory,
-        isTest: Boolean,
-    ): CommandLine {
+    inline fun <reified R : Runnable> build(factory: CommandLine.IFactory): CommandLine {
         val commandSpec: CommandLine.Model.CommandSpec =
             CommandLine.Model.CommandSpec.wrapWithoutInspection(R::class.java, factory)
                 .name("airbyte-${runner.connectorType}-connector")
@@ -95,10 +101,6 @@ class PicocliCommandLineFactory(
                 .addOption(config)
                 .addOption(catalog)
                 .addOption(state)
-
-        if (isTest) {
-            commandSpec.addOption(output)
-        }
         return CommandLine(commandSpec, factory)
     }
 
@@ -168,10 +170,4 @@ class PicocliCommandLineFactory(
             "path to the json-encoded state file",
             "Required by the following commands: read",
         )
-    val output: OptionSpec =
-        fileOption(
-            "output",
-            "path to the output file",
-            "When present, the connector writes to this file instead of stdout",
-        )
 }

airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/ConnectorCommandLinePropertySource.kt

@@ -23,7 +23,6 @@ class ConnectorCommandLinePropertySource(
 const val CONNECTOR_CONFIG_PREFIX: String = "airbyte.connector.config"
 const val CONNECTOR_CATALOG_PREFIX: String = "airbyte.connector.catalog"
 const val CONNECTOR_STATE_PREFIX: String = "airbyte.connector.state"
-const val CONNECTOR_OUTPUT_FILE = "airbyte.connector.output.file"
 
 private fun resolveValues(
     commandLine: CommandLine,
@@ -39,7 +38,6 @@ private fun resolveValues(
     }
     val values: MutableMap<String, Any> = mutableMapOf()
     values[Operation.PROPERTY] = ops.first()
-    commandLine.optionValue("output")?.let { values[CONNECTOR_OUTPUT_FILE] = it }
     for ((cliOptionKey, prefix) in
         mapOf(
             "config" to CONNECTOR_CONFIG_PREFIX,

airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/output/OutputConsumer.kt

@@ -25,9 +25,7 @@ import io.micronaut.context.annotation.Value
 import io.micronaut.context.env.Environment
 import jakarta.inject.Singleton
 import java.io.ByteArrayOutputStream
-import java.io.FileOutputStream
 import java.io.PrintStream
-import java.nio.file.Path
 import java.time.Clock
 import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
@@ -104,9 +102,6 @@ interface OutputConsumer : Consumer<AirbyteMessage>, AutoCloseable {
 /** Configuration properties prefix for [StdoutOutputConsumer]. */
 const val CONNECTOR_OUTPUT_PREFIX = "airbyte.connector.output"
 
-// Used for integration tests.
-const val CONNECTOR_OUTPUT_FILE = "$CONNECTOR_OUTPUT_PREFIX.file"
-
 /** Default implementation of [OutputConsumer]. */
 @Singleton
 @Secondary
@@ -293,10 +288,4 @@ private class RecordTemplate(
 private class PrintStreamFactory {
 
     @Singleton @Requires(notEnv = [Environment.TEST]) fun stdout(): PrintStream = System.out
-
-    @Singleton
-    @Requires(env = [Environment.TEST])
-    @Requires(property = CONNECTOR_OUTPUT_FILE)
-    fun file(@Value("\${$CONNECTOR_OUTPUT_FILE}") filePath: Path): PrintStream =
-        PrintStream(FileOutputStream(filePath.toFile()), false, Charsets.UTF_8)
 }

airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/command/CliRunnable.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.cdk.command
+
+import io.airbyte.cdk.output.BufferingOutputConsumer
+import io.airbyte.protocol.models.v0.AirbyteMessage
+
+/** Convenience object for return values in [CliRunner]. */
+data class CliRunnable(
+    val runnable: Runnable,
+    val results: BufferingOutputConsumer,
+) {
+
+    /** Decorates the [BufferingOutputConsumer] with a callback, which should return quickly. */
+    fun withCallback(nonBlockingFn: (AirbyteMessage) -> Unit): CliRunnable {
+        results.callback = nonBlockingFn
+        return this
+    }
+
+    /** Runs the [Runnable]. */
+    fun run(): BufferingOutputConsumer {
+        runnable.run()
+        return results
+    }
+}

airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/command/CliRunner.kt

@@ -5,19 +5,22 @@ import io.airbyte.cdk.AirbyteConnectorRunnable
 import io.airbyte.cdk.AirbyteConnectorRunner
 import io.airbyte.cdk.AirbyteDestinationRunner
 import io.airbyte.cdk.AirbyteSourceRunner
-import io.airbyte.cdk.ClockFactory
 import io.airbyte.cdk.output.BufferingOutputConsumer
 import io.airbyte.cdk.util.Jsons
 import io.airbyte.protocol.models.v0.AirbyteMessage
 import io.airbyte.protocol.models.v0.AirbyteStateMessage
 import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog
+import io.micronaut.context.RuntimeBeanDefinition
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Path
 import kotlin.io.path.deleteIfExists
 
 data object CliRunner {
     /**
-     * Runs a source connector with the given arguments and returns the results.
+     * Builds a [CliRunnable] which runs a source connector with the given arguments.
      *
      * This is useful for writing connector integration tests:
      * - the [config], [catalog] and [state] get written to temporary files;
@@ -26,61 +29,88 @@ data object CliRunner {
      * - that file name gets passed with the test-only `--output` CLI argument;
      * - [AirbyteSourceRunner] takes the CLI arguments and runs them in a new Micronaut context;
      * - after it's done, the output file contents are read and parsed into [AirbyteMessage]s.
-     * - those are stored in a [BufferingOutputConsumer] which is returned.
+     * - those are stored in the [BufferingOutputConsumer] which is returned in the [CliRunnable].
      */
-    fun runSource(
+    fun source(
         op: String,
         config: ConfigurationJsonObjectBase? = null,
         catalog: ConfiguredAirbyteCatalog? = null,
         state: List<AirbyteStateMessage>? = null,
-    ): BufferingOutputConsumer =
-        runConnector(op, config, catalog, state) { args: Array<String> ->
-            AirbyteSourceRunner(args)
-        }
+    ): CliRunnable {
+        val out = CliRunnerOutputStream()
+        val runnable: Runnable =
+            makeRunnable(op, config, catalog, state) { args: Array<String> ->
+                AirbyteSourceRunner(args, out.beanDefinition)
+            }
+        return CliRunnable(runnable, out.results)
+    }
 
-    /** Same as [runSource] but for destinations. */
-    fun runDestination(
+    /** Same as [source] but for destinations. */
+    fun destination(
         op: String,
         config: ConfigurationJsonObjectBase? = null,
         catalog: ConfiguredAirbyteCatalog? = null,
         state: List<AirbyteStateMessage>? = null,
-    ): BufferingOutputConsumer =
-        runConnector(op, config, catalog, state) { args: Array<String> ->
-            AirbyteDestinationRunner(args)
-        }
+        inputStream: InputStream,
+    ): CliRunnable {
+        val inputBeanDefinition: RuntimeBeanDefinition<InputStream> =
+            RuntimeBeanDefinition.builder(InputStream::class.java) { inputStream }
+                .singleton(true)
+                .build()
+        val out = CliRunnerOutputStream()
+        val runnable: Runnable =
+            makeRunnable(op, config, catalog, state) { args: Array<String> ->
+                AirbyteDestinationRunner(args, inputBeanDefinition, out.beanDefinition)
+            }
+        return CliRunnable(runnable, out.results)
+    }
+
+    /** Same as the other [destination] but with [AirbyteMessage] input. */
+    fun destination(
+        op: String,
+        config: ConfigurationJsonObjectBase? = null,
+        catalog: ConfiguredAirbyteCatalog? = null,
+        state: List<AirbyteStateMessage>? = null,
+        vararg input: AirbyteMessage,
+    ): CliRunnable {
+        val inputJsonBytes: ByteArray =
+            ByteArrayOutputStream().use { baos ->
+                for (msg in input) {
+                    Jsons.writeValue(baos, msg)
+                    baos.write('\n'.code)
+                }
+                baos.toByteArray()
+            }
+        val inputStream: InputStream = ByteArrayInputStream(inputJsonBytes)
+        return destination(op, config, catalog, state, inputStream)
+    }
 
-    private fun runConnector(
+    private fun makeRunnable(
         op: String,
         config: ConfigurationJsonObjectBase?,
         catalog: ConfiguredAirbyteCatalog?,
         state: List<AirbyteStateMessage>?,
         connectorRunnerConstructor: (Array<String>) -> AirbyteConnectorRunner,
-    ): BufferingOutputConsumer {
-        val result = BufferingOutputConsumer(ClockFactory().fixed())
+    ): Runnable {
         val configFile: Path? = inputFile(config)
         val catalogFile: Path? = inputFile(catalog)
         val stateFile: Path? = inputFile(state)
-        val outputFile: Path = Files.createTempFile(null, null)
         val args: List<String> =
             listOfNotNull(
                 "--$op",
                 configFile?.let { "--config=$it" },
                 catalogFile?.let { "--catalog=$it" },
                 stateFile?.let { "--state=$it" },
-                "--output=$outputFile",
             )
-        try {
-            connectorRunnerConstructor(args.toTypedArray()).run<AirbyteConnectorRunnable>()
-            Files.readAllLines(outputFile)
-                .filter { it.isNotBlank() }
-                .map { Jsons.readValue(it, AirbyteMessage::class.java) }
-                .forEach { result.accept(it) }
-            return result
-        } finally {
-            configFile?.deleteIfExists()
-            catalogFile?.deleteIfExists()
-            stateFile?.deleteIfExists()
-            outputFile.deleteIfExists()
+        val runner: AirbyteConnectorRunner = connectorRunnerConstructor(args.toTypedArray())
+        return Runnable {
+            try {
+                runner.run<AirbyteConnectorRunnable>()
+            } finally {
+                configFile?.deleteIfExists()
+                catalogFile?.deleteIfExists()
+                stateFile?.deleteIfExists()
+            }
         }
     }
 

airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/command/CliRunnerOutputStream.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.cdk.command
+
+import io.airbyte.cdk.ClockFactory
+import io.airbyte.cdk.output.BufferingOutputConsumer
+import io.airbyte.cdk.util.Jsons
+import io.airbyte.protocol.models.v0.AirbyteMessage
+import io.micronaut.context.RuntimeBeanDefinition
+import java.io.ByteArrayOutputStream
+import java.io.OutputStream
+import java.io.PrintStream
+
+/** Used by [CliRunner] to populate a [BufferingOutputConsumer] instance. */
+class CliRunnerOutputStream : OutputStream() {
+
+    val results = BufferingOutputConsumer(ClockFactory().fixed())
+    private val lineStream = ByteArrayOutputStream()
+    private val printStream = PrintStream(this, true, Charsets.UTF_8)
+
+    val beanDefinition: RuntimeBeanDefinition<PrintStream> =
+        RuntimeBeanDefinition.builder(PrintStream::class.java) { printStream }
+            .singleton(true)
+            .build()
+
+    override fun write(b: Int) {
+        if (b == '\n'.code) {
+            readLine()
+        } else {
+            lineStream.write(b)
+        }
+    }
+
+    override fun close() {
+        readLine()
+        lineStream.close()
+        results.close()
+        super.close()
+    }
+
+    private fun readLine() {
+        val line: String = lineStream.toString(Charsets.UTF_8).trim()
+        lineStream.reset()
+        if (line.isNotBlank()) {
+            results.accept(Jsons.readValue(line, AirbyteMessage::class.java))
+        }
+    }
+}