This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[ART-7273] add go wrapper script in doozer #811
Merged
Conversation
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
|
/jira refresh |
joepvd
reviewed
Aug 10, 2023
doozerlib/source_modifications.py
Outdated
| @@ -79,12 +79,14 @@ def __init__(self, *args, **kwargs): | |||
| :param path: Destination path to the dist-git repo. | |||
| :param overwriting: True to allow to overwrite if path exists. | |||
| Setting to false to prevent from accidently overwriting files from in-tree source. | |||
| :param doozersource: Destination path to the doozer source | |||
There was a problem hiding this comment.
Think we split words with _ if an attribute has multiple words.
There was a problem hiding this comment.
Examplation sounds wrong. Maybe Source path local to doozer
There was a problem hiding this comment.
Note that this attribute is not used in openshift-eng/ocp-build-data#3356
joepvd
suggested changes
Aug 10, 2023
doozerlib/source_modifications.py
Outdated
| @@ -79,12 +79,14 @@ def __init__(self, *args, **kwargs): | |||
| :param path: Destination path to the dist-git repo. | |||
| :param overwriting: True to allow to overwrite if path exists. | |||
| Setting to false to prevent from accidently overwriting files from in-tree source. | |||
| :param doozersource: Destination path to the doozer source | |||
There was a problem hiding this comment.
Examplation sounds wrong. Maybe Source path local to doozer
doozerlib/source_modifications.py
Outdated
| if ceiling_dir and not is_in_directory(path, ceiling_dir): | ||
| raise ValueError("Writing to a file out of {} is not allowed.".format(ceiling_dir)) | ||
| # NOTE: `overwriting` is checked before writing. | ||
| dest_address = str(kwargs["context"]['distgit_path'].joinpath(self.path)) |
There was a problem hiding this comment.
This is not an address, but a path. I think?
doozerlib/target_go_wrapper.sh
Outdated
| @@ -0,0 +1,344 @@ | |||
| #!/bin/sh | |||
There was a problem hiding this comment.
Do not really like the file name, for these reasons:
- in config, we need:
source: target_go_wrapper.sh. Think the wordtargetwill cause confusions - everyone speaks of this as
fips_or_die. So would be good to have that in the name. Maybefips_or_die_wrapper?
doozerlib/source_modifications.py
Outdated
| raise ValueError("Unknown 'validate' value: {self.validate}") | ||
| else: # use doozer local source | ||
| content = Path(Path(__file__).parent, self.doozersource).read_text() | ||
| source_address = self.doozersource |
There was a problem hiding this comment.
This is not an address. Think the variable is also not strictly necessary.
doozerlib/source_modifications.py
Outdated
| @@ -79,12 +79,14 @@ def __init__(self, *args, **kwargs): | |||
| :param path: Destination path to the dist-git repo. | |||
| :param overwriting: True to allow to overwrite if path exists. | |||
| Setting to false to prevent from accidently overwriting files from in-tree source. | |||
| :param doozersource: Destination path to the doozer source | |||
There was a problem hiding this comment.
Note that this attribute is not used in openshift-eng/ocp-build-data#3356
This was referenced Aug 23, 2023
Merged
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
add go wrapper script in doozerlib path named
golang_builder_FIPS_wrapper.shextend add modification method to support using local path from doozer source instead of only support URL source
the new key under add modification is
doozer_sourcewitch take relative source path within doozer