Skip to content

Commit

Permalink
Merge branch 'master' into twilio_stream_partition_states
Browse files Browse the repository at this point in the history
  • Loading branch information
btkcodedev authored Dec 17, 2024
2 parents 9a4ab8e + b7e25c9 commit d1d7b00
Show file tree
Hide file tree
Showing 40 changed files with 6,163 additions and 1,581 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ def get_expected_language_tag(self, connector: Connector) -> str:
connector.code_directory / consts.PYPROJECT_FILE_NAME
).exists():
return self.PYTHON_LANGUAGE_TAG
elif (connector.code_directory / consts.GRADLE_FILE_NAME).exists():
elif (connector.code_directory / consts.GRADLE_FILE_NAME).exists() or (
connector.code_directory / consts.GRADLE_KOTLIN_FILE_NAME
).exists():
return self.JAVA_LANGUAGE_TAG
else:
raise ValueError("Could not infer the language tag from the connector directory")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
DOCKERFILE_NAME = "Dockerfile"
DOCUMENTATION_STANDARDS_URL = "https://hackmd.io/Bz75cgATSbm7DjrAqgl4rw"
GRADLE_FILE_NAME = "build.gradle"
GRADLE_KOTLIN_FILE_NAME = "build.gradle.kts"
LICENSE_FAQ_URL = "https://docs.airbyte.com/developer-guides/licenses/license-faq"
LOW_CODE_MANIFEST_FILE_NAME = "manifest.yaml"
METADATA_DOCUMENTATION_URL = "https://docs.airbyte.com/connector-development/connector-metadata-file"
Expand Down
1 change: 1 addition & 0 deletions airbyte-ci/connectors/pipelines/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only

| Version | PR | Description |
|---------|------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
| 4.46.5 | [#49835](https://github.com/airbytehq/airbyte/pull/49835) | Fix connector language discovery for projects with Kotlin Gradle build scripts. |
| 4.46.4 | [#49462](https://github.com/airbytehq/airbyte/pull/49462) | Support Kotlin Gradle build scripts in connectors. |
| 4.46.3 | [#49465](https://github.com/airbytehq/airbyte/pull/49465) | Fix `--use-local-cdk` on rootless connectors. |
| 4.46.2 | [#49136](https://github.com/airbytehq/airbyte/pull/49136) | Fix failed install of python components due to non-root permissions. |
Expand Down
2 changes: 1 addition & 1 deletion airbyte-ci/connectors/pipelines/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pipelines"
version = "4.46.4"
version = "4.46.5"
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
authors = ["Airbyte <[email protected]>"]

Expand Down
91 changes: 91 additions & 0 deletions airbyte-integrations/connectors/destination-mssql-v2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Microsoft SQL Server V2 (Bulk CDK) Destination

## Build

### airbyte-ci

To build the connector via the [Airbyte CI CLI tool](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md), navigate to the root of the [Airbyte repository](https://github.com/airbytehq/airbyte) and execute the following command:

```shell
> airbyte-ci connectors --name=destination-mssql-v2 build
```

### Gradle

To build the connector via [Gradle](https://gradle.org/), navigate to the root of the [Airbyte repository](https://github.com/airbytehq/airbyte) and execute the following command:

```shell
> ./gradlew :airbyte-integrations:connectors:destination-mssql-v2:build
```
## Execute

### Local Execution via Docker

In order to run the connector image locally, first either build the connector's [Docker](https://www.docker.com/) image using the commands found
in this section of this document OR build the image using the following command:

```shell
> ./gradlew :airbyte-integrations:connectors:destination-mssql-v2:buildConnectorImage
```

The built image will automatically be tagged with the `dev` label. To run the connector image, use the following commands:

```shell
docker run --rm airbyte/destination-mssql-v2:dev spec
docker run --rm -v $(pwd)/secrets:/secrets airbyte/destination-mssql-v2:dev check --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets airbyte/destination-mssql-v2:dev discover --config /secrets/config.json
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/destination-mssql-v2:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
```

## Test

The connector contains both unit and acceptance tests which can each be executed from the local environment.

### Unit Tests

The connector uses a combination of [Kotlin](https://kotlinlang.org/), [JUnit 5](https://junit.org/junit5/) and [MockK](https://mockk.io/)
to implement unit tests. Existing tests can be found within the destination-mssql-v2 module in the conventional `src/test/kotlin` source folder. New tests should also be added to this location.

The unit tests can be executed either via the [Airbyte CI CLI tool](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) or [Gradle](https://gradle.org/):

###### Airbyte CI CLI
```shell
> airbyte-ci connectors --name=destination-mssql-v2 test
```

###### Gradle
```shell
> ./gradlew :airbyte-integrations:connectors:destination-mssql-v2:test
```

### Acceptance Tests

The [Airbyte project](https://github.com/airbytehq/airbyte) a standard test suite that all destination connectors must pass. The tests require specific implementations of a few components in order to connect the acceptance test suite with the connector's specific logic. The existing acceptance test scaffolding can be found in the conventional `src/test-integration/kotlin` source folder.

The acceptance tests can be executed either via the [Airbyte CI CLI tool](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) or [Gradle](https://gradle.org/):

###### Airbyte CI CLI
```shell
> airbyte-ci connectors --name=destination-mssql-v2 test
```

###### Gradle
```shell
> ./gradlew :airbyte-integrations:connectors:destination-mssql-v2:integrationTest
```

## Release

### Publishing a new version of the connector

You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?

1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=destination-mssql-v2 test`
2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
3. Make sure the `metadata.yaml` content is up to date.
4. Make the connector documentation and its changelog is up to date (`docs/integrations/destinations/mssql-v2.md`).
5. Create a Pull Request: use [our PR naming conventions](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#pull-request-title-convention).
6. Pat yourself on the back for being an awesome contributor.
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.


Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
*/

plugins {
id("application")
id("airbyte-bulk-connector")
}

airbyteBulkConnector {
core = "load"
toolkits = listOf()
cdk = "local"
}

application {
mainClass = "io.airbyte.integrations.destination.mssql.v2.MSSQLDestination"

applicationDefaultJvmArgs = listOf("-XX:+ExitOnOutOfMemoryError", "-XX:MaxRAMPercentage=75.0")

// Uncomment and replace to run locally
//applicationDefaultJvmArgs = listOf("-XX:+ExitOnOutOfMemoryError", "-XX:MaxRAMPercentage=75.0", "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", "java.base/sun.security.action=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED")
}

val junitVersion = "5.11.3"

configurations.configureEach {
// Exclude additional SLF4J providers from all classpaths
exclude(mapOf("group" to "org.slf4j", "module" to "slf4j-reload4j"))
}

// Uncomment to run locally
//tasks.run.configure {
// standardInput = System.`in`
//}

dependencies {
implementation("com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11")
implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
implementation("jakarta.inject:jakarta.inject-api:2.0.1")
implementation("com.github.spotbugs:spotbugs-annotations:4.8.6")
implementation("io.micronaut:micronaut-inject:4.6.1")

testImplementation("io.mockk:mockk:1.13.13")
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
}

tasks.named<Test>("test") {
systemProperties(mapOf("mockk.junit.extension.keepmocks" to "true", "mockk.junit.extension.requireParallelTesting" to "true"))
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
testExecutionConcurrency=-1
Loading

0 comments on commit d1d7b00

Please sign in to comment.