PR to fix https://github.com/salesforce/dockerfile-image-update/issues/236, to bring in support for sending PRs to docker-compose files #687
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
afalko
reviewed
Dec 7, 2022
| search.filename("Dockerfile"); | ||
| search.filename("docker-compose"); |
There was a problem hiding this comment.
Can we move these filenames to come from CLI where we have a default list of "Dockerfile", "docker-compose" there? Then this part of code would do search.filename on a list
afalko
reviewed
Dec 7, 2022
| assertEquals(new ImageKeyValuePair(fromInstruction).hasADifferentTag(tagToCheck), expectedResult); | ||
| } | ||
|
|
||
| /* @DataProvider |
There was a problem hiding this comment.
do we need to keep this commented?
Additionally updated to ignore sending PR for latest tag in docker-compose.
Also ignore changing invalid tags which include variables like ${ITEST}/${version}
Updated mockito-all to mockito-core as prior is deprecated.
Codecov Report
@@ Coverage Diff @@
## main #687 +/- ##
============================================
+ Coverage 83.33% 84.40% +1.07%
- Complexity 320 374 +54
============================================
Files 26 27 +1
Lines 1140 1244 +104
Branches 137 164 +27
============================================
+ Hits 950 1050 +100
- Misses 155 157 +2
- Partials 35 37 +2
|
afalko
previously approved these changes
Jan 9, 2023
pchugh17
changed the title
afalko
reviewed
Jan 24, 2023
| @DataProvider | ||
| public Object[][] imageNameSpecifiedBranchAndFilenameSearched() { | ||
| return new Object[][]{ | ||
| /*{"docker.io/some/container", "", "blah", "dockerfile", "blah"}, |
There was a problem hiding this comment.
Do you need these commented?
There was a problem hiding this comment.
That was added for some debugging, uncommented now. Thanks @afalko
afalko
reviewed
Jan 24, 2023
| if (!validTag.matcher(tag.trim()).matches()) { | ||
| log.warn("{} is not a valid value for image tag. So will be ignored!", tag); | ||
| return false; | ||
| } else if (tag.trim().equals("latest")) { |
There was a problem hiding this comment.
I think we'll want to parameterize this at some point. For now this is good to have in this PR
afalko
approved these changes
Jan 24, 2023
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.
Following changes are being implemented in this PR: