Fix issue that doesn't allow using upstream with match_if_app_name_starts_with set to true in copy-image-from-upstream command
#136
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
rafaelgomesxyz
force-pushed
the
copy-image-from-upstream-starts-with-fix
branch
from
8793caa to
d1fd881
Compare
rafaelgomesxyz
commented
Jan 19, 2024
| @@ -102,6 +102,13 @@ def current | |||
| end | |||
| end | |||
|
|
|||
| def find_app_config(app_name1) | |||
There was a problem hiding this comment.
Just made it public to be able to use it.
| @@ -29,7 +29,7 @@ def call # rubocop:disable Metrics/MethodLength | |||
| ensure_docker_running! | |||
|
|
|||
| @upstream = config[:upstream] | |||
| @upstream_org = config.apps[@upstream.to_sym][:cpln_org] || ENV.fetch("CPLN_ORG_UPSTREAM", nil) | |||
| @upstream_org = config.find_app_config(@upstream)&.dig(:cpln_org) || ENV.fetch("CPLN_ORG_UPSTREAM", nil) | |||
There was a problem hiding this comment.
Let's say we have a dummy-test app in controlplane.yml that has match_if_app_name_starts_with set to true.
The old method wouldn't work if called with, e.g., dummy-test-123, because config.apps only contains the apps exactly as they are in controlplane.yml, and we have dummy-test in controlplane.yml, not dummy-test-123.
The new method works by iterating through config.apps looking for an app that matches dummy-test-123, so it will find dummy-test and match it.
There was a problem hiding this comment.
I don't understand why we'd use a starts with for the upstream. That should be a validation error. Agree, @dzirtusss
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
NOTE: On top of #135
The
copy-image-from-upstreamcommand does not currently allow using an app that hasmatch_if_app_name_starts_withset totrueas the upstream.This PR fixes that.