Skip to content

Commit

Permalink
Merge branch 'master' of github.com:airbytehq/airbyte into bmoric/con…
Browse files Browse the repository at this point in the history
…vert-health-micronaut
  • Loading branch information
benmoriceau committed Dec 12, 2022
2 parents 06c0af8 + 529b589 commit ae5fad3
Show file tree
Hide file tree
Showing 129 changed files with 2,381 additions and 1,396 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ HACK_LOCAL_ROOT_PARENT=/tmp
# Set to empty values, e.g. "" to disable basic auth
BASIC_AUTH_USERNAME=airbyte
BASIC_AUTH_PASSWORD=password
BASIC_AUTH_PROXY_TIMEOUT=600

### DATABASE ###
# Airbyte Internal Job Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- uses: actions/setup-python@v4
with:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/fe-validate-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- name: Set up CI Gradle Properties
run: |
mkdir -p ~/.gradle/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gke-kube-test-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- name: Fix EC-2 Runner
run: |
Expand Down
27 changes: 8 additions & 19 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -258,14 +258,19 @@ jobs:
attempt_limit: 3
attempt_delay: 5000 # in ms

# Verify that the linter is happy
- name: Ensure no file change from code formatting
run: git --no-pager diff && test -z "$(git --no-pager diff)"

- name: Build
uses: Wandalen/wretry.action@master
with:
command: SUB_BUILD=CONNECTORS_BASE ./gradlew build --scan
attempt_limit: 3
attempt_delay: 5000 # in ms

- name: Ensure no file change
# Ensure that the connector autogenerated files are happy
- name: Ensure no file change from regenerating connector definitions/specs
run: git --no-pager diff && test -z "$(git --no-pager diff)"

- name: Publish Connectors Base Test Results
Expand Down Expand Up @@ -397,10 +402,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -456,10 +457,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -587,7 +584,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- name: Set up CI Gradle Properties
run: |
Expand Down Expand Up @@ -810,10 +807,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -1058,10 +1051,6 @@ jobs:
with:
java-version: "17"

- uses: actions/setup-node@v2
with:
node-version: "lts/gallium"

- name: Install unzip
shell: bash
run: sudo apt-get update && sudo apt-get install -y unzip
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/release-airbyte-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

# necessary to install pip
- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -83,9 +84,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/run-performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ jobs:
distribution: "zulu"
java-version: "14"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- name: Build
id: run-specific-test
run: ./gradlew allTest --tests *${{ github.event.inputs.test-name }}
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,20 @@ public List<StandardSync> listWorkspaceStandardSyncs(final UUID workspaceId, fin
return getStandardSyncsFromResult(connectionAndOperationIdsResult);
}

public List<StandardSync> listConnectionsBySource(final UUID sourceId, final boolean includeDeleted) throws IOException {
final Result<Record> connectionAndOperationIdsResult = database.query(ctx -> ctx
.select(
CONNECTION.asterisk(),
groupConcat(CONNECTION_OPERATION.OPERATION_ID).separator(OPERATION_IDS_AGG_DELIMITER).as(OPERATION_IDS_AGG_FIELD))
.from(CONNECTION)
.leftJoin(CONNECTION_OPERATION).on(CONNECTION_OPERATION.CONNECTION_ID.eq(CONNECTION.ID))
.where(CONNECTION.SOURCE_ID.eq(sourceId)
.and(includeDeleted ? noCondition() : CONNECTION.STATUS.notEqual(StatusType.deprecated)))
.groupBy(CONNECTION.ID)).fetch();

return getStandardSyncsFromResult(connectionAndOperationIdsResult);
}

private List<StandardSync> getStandardSyncsFromResult(final Result<Record> connectionAndOperationIdsResult) {
final List<StandardSync> standardSyncs = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
- name: AlloyDB for PostgreSQL
sourceDefinitionId: 1fa90628-2b9e-11ed-a261-0242ac120002
dockerRepository: airbyte/source-alloydb
dockerImageTag: 1.0.17
dockerImageTag: 1.0.32
documentationUrl: https://docs.airbyte.com/integrations/sources/alloydb
icon: alloydb.svg
sourceType: database
Expand All @@ -62,7 +62,7 @@
- name: Amazon Seller Partner
sourceDefinitionId: e55879a8-0ef8-4557-abcf-ab34c53ec460
dockerRepository: airbyte/source-amazon-seller-partner
dockerImageTag: 0.2.28
dockerImageTag: 0.2.29
sourceType: api
documentationUrl: https://docs.airbyte.com/integrations/sources/amazon-seller-partner
icon: amazonsellerpartner.svg
Expand Down Expand Up @@ -382,11 +382,11 @@
- name: Delighted
sourceDefinitionId: cc88c43f-6f53-4e8a-8c4d-b284baaf9635
dockerRepository: airbyte/source-delighted
dockerImageTag: 0.1.4
dockerImageTag: 0.2.0
documentationUrl: https://docs.airbyte.com/integrations/sources/delighted
icon: delighted.svg
sourceType: api
releaseStage: alpha
releaseStage: beta
- name: Dixa
sourceDefinitionId: 0b5c867e-1b12-4d02-ab74-97b2184ff6d7
dockerRepository: airbyte/source-dixa
Expand Down Expand Up @@ -562,7 +562,7 @@
- name: Gitlab
sourceDefinitionId: 5e6175e5-68e1-4c17-bff9-56103bbb0d80
dockerRepository: airbyte/source-gitlab
dockerImageTag: 0.1.8
dockerImageTag: 0.1.9
documentationUrl: https://docs.airbyte.com/integrations/sources/gitlab
icon: gitlab.svg
sourceType: api
Expand Down Expand Up @@ -1250,7 +1250,7 @@
- name: Postgres
sourceDefinitionId: decd338e-5647-4c0b-adf4-da0e75f5a750
dockerRepository: airbyte/source-postgres
dockerImageTag: 1.0.31
dockerImageTag: 1.0.32
documentationUrl: https://docs.airbyte.com/integrations/sources/postgres
icon: postgresql.svg
sourceType: database
Expand Down Expand Up @@ -1895,10 +1895,10 @@
- name: Zenloop
sourceDefinitionId: f1e4c7f6-db5c-4035-981f-d35ab4998794
dockerRepository: airbyte/source-zenloop
dockerImageTag: 0.1.3
dockerImageTag: 0.1.4
documentationUrl: https://docs.airbyte.com/integrations/sources/zenloop
sourceType: api
releaseStage: alpha
releaseStage: beta
- sourceDefinitionId: cdaf146a-9b75-49fd-9dd2-9d64a0bb4781
name: Sentry
dockerRepository: airbyte/source-sentry
Expand Down
Loading

0 comments on commit ae5fad3

Please sign in to comment.