-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
[QA checks] tolerate connector without dockerfile #30467
Merged
alafanechere
merged 2 commits into
master
from
augustin/09-15-make_QA_checks_tolerate_connector_without_dockerfile
Oct 11, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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 |
---|---|---|
|
@@ -299,6 +299,10 @@ def icon_path(self) -> Path: | |
def code_directory(self) -> Path: | ||
return Path(f"./airbyte-integrations/connectors/{self.technical_name}") | ||
|
||
@property | ||
def has_dockerfile(self) -> bool: | ||
return (self.code_directory / "Dockerfile").is_file() | ||
|
||
@property | ||
def metadata_file_path(self) -> Path: | ||
return self.code_directory / METADATA_FILE_NAME | ||
|
@@ -321,20 +325,19 @@ def language(self) -> ConnectorLanguage: | |
return None | ||
|
||
@property | ||
def version(self) -> str: | ||
def version(self) -> Optional[str]: | ||
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. why is this one optional? I get becuase |
||
if self.metadata is None: | ||
return self.version_in_dockerfile_label | ||
return self.metadata["dockerImageTag"] | ||
|
||
@property | ||
def version_in_dockerfile_label(self) -> Optional[str]: | ||
try: | ||
with open(self.code_directory / "Dockerfile") as f: | ||
for line in f: | ||
if "io.airbyte.version" in line: | ||
return line.split("=")[1].strip() | ||
except FileNotFoundError: | ||
if not self.has_dockerfile: | ||
return None | ||
with open(self.code_directory / "Dockerfile") as f: | ||
for line in f: | ||
if "io.airbyte.version" in line: | ||
return line.split("=")[1].strip() | ||
raise ConnectorVersionNotFound( | ||
""" | ||
Could not find the connector version from its Dockerfile. | ||
|
Oops, something went wrong.
Oops, something went wrong.
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.
👍