-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SAT: script to create PR to migrate GA connector to high
test strictness level.
#19138
Merged
alafanechere
merged 5 commits into
master
from
augustin/sat/auto-open-pr-for-test-strictness-level
Nov 8, 2022
Merged
Changes from 4 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 0 additions & 37 deletions
37
...ntegrations/bases/source-acceptance-test/source_acceptance_test/utils/config_migration.py
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...rations/bases/source-acceptance-test/tools/strictness_level_migration/config_migration.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# | ||
# Copyright (c) 2022 Airbyte, Inc., all rights reserved. | ||
# | ||
|
||
import argparse | ||
import logging | ||
from pathlib import Path | ||
|
||
import yaml | ||
from source_acceptance_test.config import Config | ||
from yaml import load | ||
|
||
try: | ||
from yaml import CLoader as Loader | ||
except ImportError: | ||
from yaml import Loader | ||
|
||
parser = argparse.ArgumentParser(description="Migrate legacy acceptance-test-config.yml to the latest configuration format.") | ||
parser.add_argument("config_path", type=str, help="Path to the acceptance-test-config.yml to migrate.") | ||
|
||
|
||
def get_new_config_format(config_path: Path): | ||
|
||
with open(config_path, "r") as file: | ||
to_migrate = load(file, Loader=Loader) | ||
|
||
if Config.is_legacy(to_migrate): | ||
return Config.migrate_legacy_to_current_config(to_migrate) | ||
else: | ||
logging.warn("The configuration is not in a legacy format.") | ||
return to_migrate | ||
|
||
|
||
def set_high_test_strictness_level(config): | ||
config["test_strictness_level"] = "high" | ||
for basic_read_test in config["acceptance_tests"].get("basic_read", {"tests": []})["tests"]: | ||
basic_read_test.pop("configured_catalog_path", None) | ||
return config | ||
|
||
|
||
def write_new_config(new_config, output_path): | ||
with open(output_path, "w") as output_file: | ||
yaml.dump(new_config, output_file) | ||
logging.info("Saved the configuration in its new format") | ||
|
||
|
||
def migrate_configuration(config_path): | ||
new_config = get_new_config_format(config_path) | ||
new_config = set_high_test_strictness_level(new_config) | ||
write_new_config(new_config, config_path) | ||
logging.info(f"The configuration was successfully migrated to the latest configuration format: {config_path}") | ||
return config_path | ||
|
||
|
||
if __name__ == "__main__": | ||
args = parser.parse_args() | ||
config_path = Path(args.config_path) | ||
migrate_configuration(config_path) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
...-integrations/bases/source-acceptance-test/tools/strictness_level_migration/create_prs.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
# | ||
# Copyright (c) 2022 Airbyte, Inc., all rights reserved. | ||
# | ||
import argparse | ||
import json | ||
import logging | ||
import os | ||
import subprocess | ||
import tempfile | ||
from pathlib import Path | ||
|
||
from config_migration import migrate_configuration | ||
from create_issues import COMMON_ISSUE_LABELS as COMMON_PR_LABELS | ||
from create_issues import GITHUB_PROJECT_NAME | ||
from definitions import GA_DEFINITIONS | ||
from git import Repo | ||
from jinja2 import Environment, FileSystemLoader | ||
|
||
CONNECTORS_DIRECTORY = "../../../../connectors" | ||
REPO_ROOT = "../../../../../" | ||
AIRBYTE_REPO = Repo(REPO_ROOT) | ||
environment = Environment(loader=FileSystemLoader("./templates/")) | ||
PR_TEMPLATE = environment.get_template("pr.md.j2") | ||
|
||
parser = argparse.ArgumentParser(description="Create PRs for migration of GA connectors to high test strictness level in SAT") | ||
parser.add_argument("-d", "--dry", default=True) | ||
|
||
|
||
logging.basicConfig(level=logging.DEBUG) | ||
|
||
|
||
def migrate_acceptance_test_config(connector_name): | ||
acceptance_test_config_path = Path(CONNECTORS_DIRECTORY) / connector_name / "acceptance-test-config.yml" | ||
return migrate_configuration(acceptance_test_config_path) | ||
|
||
|
||
def checkout_new_branch(connector_name): | ||
AIRBYTE_REPO.heads.master.checkout() | ||
new_branch_name = f"{connector_name}/sat/migrate-to-high-test-strictness-level" | ||
new_branch = AIRBYTE_REPO.create_head(new_branch_name) | ||
new_branch.checkout() | ||
return new_branch | ||
|
||
|
||
def commit_push_migrated_config(config_path, connector_name, new_branch, dry_run): | ||
process = subprocess.Popen(["pre-commit", "run", "--files", config_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) | ||
process.communicate() | ||
relative_config_path = f"airbyte-integrations/connectors/{connector_name}/acceptance-test-config.yml" | ||
AIRBYTE_REPO.git.add(relative_config_path) | ||
AIRBYTE_REPO.git.commit(m=f"Migrated config for {connector_name}") | ||
logging.info(f"Committed migrated config on {new_branch}") | ||
if not dry_run: | ||
AIRBYTE_REPO.git.push("--set-upstream", "origin", new_branch) | ||
logging.info(f"Pushed branch {new_branch} to origin") | ||
|
||
|
||
def get_pr_content(definition): | ||
pr_title = f"Source {definition['name']}: enable `high` test strictness level in SAT" | ||
|
||
pr_body = PR_TEMPLATE.render(connector_name=definition["name"], release_stage=definition["releaseStage"]) | ||
file_definition, pr_body_path = tempfile.mkstemp() | ||
|
||
with os.fdopen(file_definition, "w") as tmp: | ||
tmp.write(pr_body) | ||
|
||
return {"title": pr_title, "body_file": pr_body_path, "labels": COMMON_PR_LABELS} | ||
|
||
|
||
def open_pr(definition, new_branch, dry_run): | ||
pr_content = get_pr_content(definition) | ||
list_command_arguments = ["gh", "pr", "list", "--state", "open", "--head", new_branch.name, "--json", "url"] | ||
create_command_arguments = [ | ||
"gh", | ||
"pr", | ||
"create", | ||
"--draft", | ||
"--title", | ||
pr_content["title"], | ||
"--body-file", | ||
pr_content["body_file"], | ||
"--project", | ||
GITHUB_PROJECT_NAME, | ||
] | ||
for label in pr_content["labels"]: | ||
create_command_arguments += ["--label", label] | ||
list_existing_pr_process = subprocess.Popen(list_command_arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE) | ||
stdout, stderr = list_existing_pr_process.communicate() | ||
existing_prs = json.loads(stdout.decode()) | ||
already_created = len(existing_prs) > 0 | ||
if already_created: | ||
logging.warning(f"A PR was already created for this definition: {existing_prs[0]}") | ||
if not already_created: | ||
if not dry_run: | ||
process = subprocess.Popen(create_command_arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE) | ||
stdout, stderr = process.communicate() | ||
if stderr: | ||
logging.error(stderr.decode()) | ||
else: | ||
created_pr_url = stdout.decode() | ||
logging.info(f"Created PR for {definition['name']}: {created_pr_url}") | ||
else: | ||
logging.info(f"[DRY RUN]: {' '.join(create_command_arguments)}") | ||
os.remove(pr_content["body_file"]) | ||
|
||
|
||
def add_test_comment(definition, new_branch, dry_run): | ||
connector_name = definition["dockerRepository"].replace("airbyte/", "") | ||
comment = f"/test connector=connectors/{connector_name}" | ||
comment_command_arguments = ["gh", "pr", "comment", new_branch.name, "--body", comment] | ||
if not dry_run: | ||
process = subprocess.Popen(comment_command_arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE) | ||
_, stderr = process.communicate() | ||
if stderr: | ||
logging.error(stderr.decode()) | ||
else: | ||
logging.info("Added test comment") | ||
else: | ||
logging.info(f"[DRY RUN]: {' '.join(comment_command_arguments)}") | ||
|
||
|
||
def migrate_config_on_new_branch(definition, dry_run): | ||
AIRBYTE_REPO.heads.master.checkout() | ||
connector_name = definition["dockerRepository"].replace("airbyte/", "") | ||
new_branch = checkout_new_branch(connector_name) | ||
config_path = migrate_acceptance_test_config(connector_name) | ||
commit_push_migrated_config(config_path, connector_name, new_branch, dry_run) | ||
return new_branch | ||
|
||
|
||
def migrate_definition_and_open_pr(definition, dry_run): | ||
original_branch = AIRBYTE_REPO.active_branch | ||
new_branch = migrate_config_on_new_branch(definition, dry_run) | ||
open_pr(definition, new_branch, dry_run) | ||
add_test_comment(definition, new_branch, dry_run) | ||
original_branch.checkout() | ||
AIRBYTE_REPO.git.branch(D=new_branch) | ||
logging.info(f"Deleted branch {new_branch}") | ||
|
||
|
||
if __name__ == "__main__": | ||
args = parser.parse_args() | ||
dry_run = False if args.dry == "False" or args.dry == "false" else True | ||
for definition in GA_DEFINITIONS[:1]: | ||
migrate_definition_and_open_pr(definition, dry_run=dry_run) |
62 changes: 61 additions & 1 deletion
62
...tegrations/bases/source-acceptance-test/tools/strictness_level_migration/requirements.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,64 @@ | ||
airbyte-cdk==0.7.0 | ||
appdirs==1.4.4 | ||
attrs==22.1.0 | ||
backoff==2.2.1 | ||
cattrs==22.2.0 | ||
certifi==2022.9.24 | ||
charset-normalizer==2.1.1 | ||
coverage==6.5.0 | ||
dataclasses-jsonschema==2.15.1 | ||
deepdiff==5.8.1 | ||
Deprecated==1.2.13 | ||
docker==5.0.3 | ||
dpath==2.0.6 | ||
exceptiongroup==1.0.1 | ||
fancycompleter==0.9.1 | ||
gitdb==4.0.9 | ||
GitPython==3.1.29 | ||
hypothesis==6.54.6 | ||
hypothesis-jsonschema==0.20.1 | ||
icdiff==1.9.1 | ||
idna==3.4 | ||
inflection==0.5.1 | ||
iniconfig==1.1.1 | ||
Jinja2==3.1.2 | ||
jsonref==0.2 | ||
jsonschema==3.2.0 | ||
MarkupSafe==2.1.1 | ||
ordered-set==4.1.0 | ||
packaging==21.3 | ||
pdbpp==0.10.3 | ||
pendulum==2.1.2 | ||
pluggy==1.0.0 | ||
pprintpp==0.4.0 | ||
py==1.11.0 | ||
pyaml==21.10.1 | ||
PyYAML==6.0 | ||
pydantic==1.9.2 | ||
Pygments==2.13.0 | ||
pyparsing==3.0.9 | ||
pyrepl==0.9.0 | ||
pyrsistent==0.19.2 | ||
pytest==6.2.5 | ||
pytest-cov==3.0.0 | ||
pytest-mock==3.6.1 | ||
pytest-sugar==0.9.6 | ||
pytest-timeout==1.4.2 | ||
python-dateutil==2.8.2 | ||
pytzdata==2020.1 | ||
PyYAML==5.4.1 | ||
requests==2.28.1 | ||
requests-cache==0.9.7 | ||
requests-mock==1.9.3 | ||
six==1.16.0 | ||
smmap==5.0.0 | ||
sortedcontainers==2.4.0 | ||
-e git+ssh://git@github.com/airbytehq/airbyte.git@70679775b55c5bb1be7384114155924772885be0#egg=source_acceptance_test&subdirectory=airbyte-integrations/bases/source-acceptance-test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems kind of scary |
||
termcolor==2.1.0 | ||
toml==0.10.2 | ||
tomli==2.0.1 | ||
typing_extensions==4.4.0 | ||
url-normalize==1.4.3 | ||
urllib3==1.26.12 | ||
websocket-client==1.4.2 | ||
wmctrl==0.4 | ||
wrapt==1.14.1 |
22 changes: 22 additions & 0 deletions
22
...grations/bases/source-acceptance-test/tools/strictness_level_migration/templates/pr.md.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
## What | ||
A `test_strictness_level` field was introduced to Source Acceptance Tests (SAT). | ||
{{ connector_name }} is a {{ release_stage }} connector, we want it to have a `high` test strictness level. | ||
|
||
**This will help**: | ||
- maximize the SAT coverage on this connector. | ||
- document its potential weaknesses in term of test coverage. | ||
|
||
## How | ||
1. Migrate the existing `acceptance-test-config.yml` file to the latest configuration format. (See instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-integrations/bases/source-acceptance-test/README.md#L61)) | ||
2. Enable `high` test strictness level in `acceptance-test-config.yml`. (See instructions [here](https://github.com/airbytehq/airbyte/blob/master/docs/connector-development/testing-connectors/source-acceptance-tests-reference.md#L240)) | ||
|
||
⚠️ ⚠️ ⚠️ | ||
**If tests are failing please fix the failing test by changing the `acceptance-test-config.yml` file or use `bypass_reason` fields to explain why a specific test can't be run.** | ||
|
||
Please open a new PR if the new enabled tests help discover a new bug. | ||
Once this bug fix is merged please rebase this branch and run `/test` again. | ||
|
||
You can find more details about the rules enforced by `high` test strictness level [here](https://docs.airbyte.com/connector-development/testing-connectors/source-acceptance-tests-reference/). | ||
|
||
## Review process | ||
Please ask the `connector-operations` teams for review. |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a big deps change - was this intentional?