Fix for acceptance test on discover workflow #22595

xiaohansong · 2023-02-08T19:17:07Z

What

Describe what the change is solving
It helps to add screenshots if it affects the frontend.

How

Describe the solution

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

Create a non-forked branch based on this PR and test the below items on it
Build is successful
If new credentials are required for use in CI, add them to GSM. Instructions.
/test connector=connectors/<name> command is passing
New Connector version released on Dockerhub by running the /publish command described here
After the connector is published, connector added to connector index as described here
Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here

Updating a connector

Community member or Airbyter

Grant edit access to maintainers (instructions)
Secrets in the connector's spec are annotated with airbyte_secret
Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
Code reviews completed
Documentation updated
- Connector's README.md
- Connector's bootstrap.md. See description and examples
- Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

Create a non-forked branch based on this PR and test the below items on it
Build is successful
If new credentials are required for use in CI, add them to GSM. Instructions.
/test connector=connectors/<name> command is passing
New Connector version released on Dockerhub and connector version bumped by running the /publish command described here

Connector Generator

Issue acceptance criteria met
PR name follows PR naming conventions
If adding a new generator, add it to the list of scaffold modules being tested
The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
Documentation which references the generator is updated as needed

github-actions · 2023-02-08T19:19:59Z

Affected Connector Report

NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do the following as needed:

Run integration tests
Bump connector or module version
Add changelog
Publish the new version

✅ Sources (30)

Connector	Version	Changelog	Publish
`source-alloydb`	`1.0.43`	✅	✅
`source-alloydb-strict-encrypt`	`1.0.43`	🔵 (ignored)	🔵 (ignored)
`source-bigquery`	`0.2.3`	✅	✅
`source-clickhouse`	`0.1.15`	✅	✅
`source-clickhouse-strict-encrypt`	`0.1.15`	🔵 (ignored)	🔵 (ignored)
`source-cockroachdb`	`0.1.19`	✅	✅
`source-cockroachdb-strict-encrypt`	`0.1.19`	🔵 (ignored)	🔵 (ignored)
`source-db2`	`0.1.17`	✅	✅
`source-db2-strict-encrypt`	`0.1.17`	🔵 (ignored)	🔵 (ignored)
`source-dynamodb`	`0.1.0`	✅	✅
`source-e2e-test`	`2.1.3`	✅	✅
`source-e2e-test-cloud`	`2.1.1`	🔵 (ignored)	🔵 (ignored)
`source-elasticsearch`	`0.1.1`	✅	✅
`source-jdbc`	`0.3.5`	🔵 (ignored)	🔵 (ignored)
`source-kafka`	`0.2.3`	✅	✅
`source-mongodb-strict-encrypt`	`0.1.19`	🔵 (ignored)	🔵 (ignored)
`source-mongodb-v2`	`0.1.19`	✅	✅
`source-mssql`	`0.4.28`	✅	✅
`source-mssql-strict-encrypt`	`0.4.28`	🔵 (ignored)	🔵 (ignored)
`source-mysql`	`1.0.21`	✅	✅
`source-mysql-strict-encrypt`	`1.0.21`	🔵 (ignored)	🔵 (ignored)
`source-oracle`	`0.3.22`	✅	✅
`source-oracle-strict-encrypt`	`0.3.22`	🔵 (ignored)	🔵 (ignored)
`source-postgres`	`1.0.43`	✅	✅
`source-postgres-strict-encrypt`	`1.0.43`	🔵 (ignored)	🔵 (ignored)
`source-redshift`	`0.3.16`	✅	✅
`source-scaffold-java-jdbc`	`0.1.0`	🔵 (ignored)	🔵 (ignored)
`source-sftp`	`0.1.2`	✅	✅
`source-snowflake`	`0.1.29`	✅	✅
`source-tidb`	`0.2.2`	✅	✅

See "Actionable Items" below for how to resolve warnings and errors.

✅ Destinations (0)

Connector	Version	Changelog	Publish

See "Actionable Items" below for how to resolve warnings and errors.

✅ Other Modules (0)

Actionable Items

(click to expand)

Category	Status	Actionable Item
Version	❌ mismatch	The version of the connector is different from its normal variant. Please bump the version of the connector.
	⚠ doc not found	The connector does not seem to have a documentation file. This can be normal (e.g. basic connector like `source-jdbc` is not published or documented). Please double-check to make sure that it is not a bug.
Changelog	⚠ doc not found	The connector does not seem to have a documentation file. This can be normal (e.g. basic connector like `source-jdbc` is not published or documented). Please double-check to make sure that it is not a bug.
	❌ changelog missing	There is no chnagelog for the current version of the connector. If you are the author of the current version, please add a changelog.
Publish	⚠ not in seed	The connector is not in the seed file (e.g. `source_definitions.yaml`), so its publication status cannot be checked. This can be normal (e.g. some connectors are cloud-specific, and only listed in the cloud seed file). Please double-check to make sure that it is not a bug.
	❌ diff seed version	The connector exists in the seed file, but the latest version is not listed there. This usually means that the latest version is not published. Please use the `/publish` command to publish the latest version.

sergio-ropero

I think this is not required anymore then:

  // This has to be using the protocol version of the platform in order to capture the arg
  private final ArgumentCaptor<io.airbyte.protocol.models.AirbyteCatalog> lastPersistedCatalog =
      ArgumentCaptor.forClass(io.airbyte.protocol.models.AirbyteCatalog.class);

You can just remove it 😄

xiaohansong · 2023-02-08T22:06:54Z

/test connector=connectors/source-postgres

🕑 connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4128819510
❌ connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4128819510
🐛 https://gradle.com/s/q6rpnyyqnoyyc

Build Failed

Test summary info:

Could not find result summary

xiaohansong · 2023-02-08T22:20:00Z

/test connector=connectors/source-postgres

🕑 connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4128916230
❌ connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4128916230
🐛 https://gradle.com/s/ke5x7t2v7lcsw

Build Failed

Test summary info:

=========================== short test summary info ============================
FAILED test_incremental.py::TestIncremental::test_two_sequential_reads[inputs1]
FAILED test_incremental.py::TestIncremental::test_read_sequential_slices[inputs1]
SKIPPED [2] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:98: The previous and actual specifications are identical.
SKIPPED [2] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_core.py:507: The previous and actual discovered catalogs are identical.
SKIPPED [2] ../usr/local/lib/python3.9/site-packages/connector_acceptance_test/tests/test_incremental.py:22: `future_state` has a bypass reason, skipping.
============= 2 failed, 64 passed, 6 skipped in 102.71s (0:01:42) ==============

sherifnada

@xiaohansong could you remove the files in airbyte-cdk? this is a problem we're aware of and are fixing but we shouldn't be adding these files to VCS

xiaohansong · 2023-02-08T23:13:55Z

@sherifnada will do - will clean it up before merging

sherifnada · 2023-02-08T23:40:28Z

@xiaohansong i'm gitignoring those files here #22616

pmossman

Left some more thoughts about catalog converter tech debt - I don't want to block the PR but I want to make it clear that this is definitely adding to some pre-existing tech debt and I want to make sure we're doing everything we can to contain the blast radius of tech debt wherever we can!

pmossman · 2023-02-08T23:36:19Z

...t/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java

@@ -125,11 +126,9 @@ public abstract class AbstractSourceConnectorTest {
  private ConnectorConfigUpdater mConnectorConfigUpdater;

  // This has to be using the protocol version of the platform in order to capture the arg


I don't think this comment makes sense to keep anymore

I think that meant to be AirbyteCatalog as it has to be using protocol version, but yeah definitely not used to capture the arg

pmossman · 2023-02-08T23:41:57Z

airbyte-commons-worker/src/main/java/io/airbyte/workers/helper/CatalogClientConverters.java

+   * @param catalog
+   * @return
+   */
+  public static io.airbyte.protocol.models.AirbyteCatalog toAirbyteProtocol(


It definitely makes me feel uneasy to duplicate such complicated and hard-to-maintain code. It seems like it will be very likely that this code will need to change in both places, but it will only end up being changed in a single place because it isn't obvious that there are multiple implementations of nearly the exact same thing.

I don't really have a good answer for this right now, since the conversion logic isn't actually duplicated (in one case, they are server-side java models, and here they are client-side java models, so they're technically different types).

I think it would be ideal to add very apparent comments to this class AND to the other CatalogConverter class that the logic is duplicated for now, and we should discuss and try to prioritize an issue for coming up with a better approach for these super-complicated catalog conversion methods.

I don't want to block this PR, but I want to make sure we're doing everything we can to minimize the tech debt here and come up with a solid long term solution!

I agree - conversion between those three types with added logic for stream makes it really hard to maintain.

github-actions · 2023-02-09T00:24:48Z

Airbyte Code Coverage

File	Coverage [47.3%]	❌
CatalogClientConverters.java	47.3%	❌

Total Project Coverage	24.66%	❌

sergio-ropero · 2023-02-09T00:38:56Z

/test connector=connectors/source-postgres

🕑 connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4129760109
❌ connectors/source-postgres https://github.com/airbytehq/airbyte/actions/runs/4129760109
🐛 https://gradle.com/s/linc4uqjdureq

Build Failed

Test summary info:

Could not find result summary

* fix test * remove unused var * add converter into test * use converters to convert client catalog to proto * remove cdk related changes * more cdk remove * Minor format changes * remove untrue comment * Minor format changes --------- Co-authored-by: Sergio Ropero <42538006+sergio-ropero@users.noreply.github.com> Co-authored-by: Sergio Ropero <sergio@airbyte.io>

fix test

1bf8a6b

sergio-ropero reviewed Feb 8, 2023

View reviewed changes

remove unused var

70f476f

xiaohansong requested a review from a team as a code owner February 8, 2023 19:51

octavia-squidington-iii added the CDK Connector Development Kit label Feb 8, 2023

sergio-ropero and others added 2 commits February 8, 2023 22:36

Merge branch 'master' into xiaohan/testfix

c430aba

add converter into test

274d481

xiaohansong requested a review from a team as a code owner February 8, 2023 22:06

use converters to convert client catalog to proto

4741924

xiaohansong temporarily deployed to more-secrets February 8, 2023 22:21 — with GitHub Actions Inactive

sherifnada reviewed Feb 8, 2023

View reviewed changes

xiaohansong added 2 commits February 8, 2023 15:19

remove cdk related changes

1a8289b

more cdk remove

83a53c5

octavia-squidington-iii removed the CDK Connector Development Kit label Feb 8, 2023

xiaohansong requested review from akashkulk and pmossman February 8, 2023 23:19

xiaohansong temporarily deployed to more-secrets February 8, 2023 23:21 — with GitHub Actions Inactive

pmossman approved these changes Feb 8, 2023

View reviewed changes

Sergio Ropero and others added 2 commits February 8, 2023 16:03

Minor format changes

2a42f49

remove untrue comment

3688fd8

xiaohansong temporarily deployed to more-secrets February 9, 2023 00:05 — with GitHub Actions Inactive

Minor format changes

2f17718

sergio-ropero temporarily deployed to more-secrets February 9, 2023 00:15 — with GitHub Actions Inactive

xiaohansong enabled auto-merge (squash) February 9, 2023 00:40

xiaohansong merged commit 0ba609c into master Feb 9, 2023

xiaohansong deleted the xiaohan/testfix branch February 9, 2023 00:52

github-actions bot mentioned this pull request Feb 9, 2023

Bump helm chart version reference to 0.43.34 #22684

Closed

This was referenced Feb 10, 2023

Bump Airbyte version from 0.40.32 to 0.40.33 #22689

Closed

Bump Airbyte version from 0.40.32 to 0.40.33 #22839

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix for acceptance test on discover workflow #22595

Fix for acceptance test on discover workflow #22595

xiaohansong commented Feb 8, 2023

github-actions bot commented Feb 8, 2023 •

edited

Loading

✅ Sources (30)

✅ Destinations (0)

✅ Other Modules (0)

Actionable Items

sergio-ropero left a comment

xiaohansong commented Feb 8, 2023 •

edited by github-actions bot

Loading

xiaohansong commented Feb 8, 2023 •

edited by github-actions bot

Loading

sherifnada left a comment

xiaohansong commented Feb 8, 2023

sherifnada commented Feb 8, 2023

pmossman left a comment

pmossman Feb 8, 2023

xiaohansong Feb 9, 2023

pmossman Feb 8, 2023

xiaohansong Feb 9, 2023

github-actions bot commented Feb 9, 2023

sergio-ropero commented Feb 9, 2023 •

edited by github-actions bot

Loading

		@@ -125,11 +126,9 @@ public abstract class AbstractSourceConnectorTest {
		private ConnectorConfigUpdater mConnectorConfigUpdater;

		// This has to be using the protocol version of the platform in order to capture the arg

Fix for acceptance test on discover workflow #22595

Fix for acceptance test on discover workflow #22595

Conversation

xiaohansong commented Feb 8, 2023

What

How

Recommended reading order

🚨 User Impact 🚨

Pre-merge Checklist

Community member or Airbyter

Airbyter

Community member or Airbyter

Airbyter

github-actions bot commented Feb 8, 2023 • edited Loading

Affected Connector Report

✅ Sources (30)

✅ Destinations (0)

✅ Other Modules (0)

Actionable Items

sergio-ropero left a comment

Choose a reason for hiding this comment

xiaohansong commented Feb 8, 2023 • edited by github-actions bot Loading

Build Failed

xiaohansong commented Feb 8, 2023 • edited by github-actions bot Loading

Build Failed

sherifnada left a comment

Choose a reason for hiding this comment

xiaohansong commented Feb 8, 2023

sherifnada commented Feb 8, 2023

pmossman left a comment

Choose a reason for hiding this comment

pmossman Feb 8, 2023

Choose a reason for hiding this comment

xiaohansong Feb 9, 2023

Choose a reason for hiding this comment

pmossman Feb 8, 2023

Choose a reason for hiding this comment

xiaohansong Feb 9, 2023

Choose a reason for hiding this comment

github-actions bot commented Feb 9, 2023

Airbyte Code Coverage

sergio-ropero commented Feb 9, 2023 • edited by github-actions bot Loading

Build Failed

github-actions bot commented Feb 8, 2023 •

edited

Loading

xiaohansong commented Feb 8, 2023 •

edited by github-actions bot

Loading

xiaohansong commented Feb 8, 2023 •

edited by github-actions bot

Loading

sergio-ropero commented Feb 9, 2023 •

edited by github-actions bot

Loading