Fix integration tests on windows #2912
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
Signed-off-by: Ludvig Liljenberg <[email protected]>
…e TestResolveBundleReference TestInstall_stringParam Signed-off-by: Ludvig Liljenberg <[email protected]>
Signed-off-by: Ludvig Liljenberg <[email protected]>
ludfjig
force-pushed
the
win_integrationtest
branch
from
09bea31 to
db8914f
Compare
ludfjig
commented
Sep 18, 2023
pkg/porter/archive.go
Outdated
| @@ -336,6 +336,9 @@ func (ex *exporter) addImage(base bundle.BaseImage) error { | |||
| // If the name contains a path separator, all path separators will be replaced with "-". | |||
| func (ex *exporter) createArchiveFolder(name string) (string, error) { | |||
| cleanedPath := strings.ReplaceAll(afero.UnicodeSanitize(name), string(os.PathSeparator), "-") | |||
| cleanedPath = strings.ReplaceAll(cleanedPath, "/", "-") // this is needed because on windows, if the bundle name is from a reference | |||
| // e.g. "ghcr.io/getporter/examples/porter-hello:v0.2.0", the name will be "examples/porter-hello", | |||
| // so we still need to replace the / with -, which the above line doesn't do (on windows) | |||
There was a problem hiding this comment.
I'm wondering why this respected the OS's PathSeparator to begin with...?
There was a problem hiding this comment.
We should just use '/', no need for checking PathSeparator here. I don't believe a bundle name will ever have the name example\\hello-porter. https://github.com/getporter/porter/pull/2154/files
Signed-off-by: Ludvig Liljenberg <[email protected]>
ludfjig
force-pushed
the
win_integrationtest
branch
from
f258080 to
45aec93
Compare
ludfjig
requested review from
schristoff,
sgettys,
bdegeeter and
troy0820
as code owners
4 tasks
|
/azp run porter-integration |
|
Azure Pipelines successfully started running 1 pipeline(s). |
schristoff
approved these changes
Sep 21, 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.
What does this change
Fixes integration tests so they pass on windows . Also fixes a bug where
porter archivefails on windows due to not being able to create a temp directory, because it tried to create 2 nesting levels at once.One windows bug remains which is tracked separately, see #2917
What issue does it fix
Closes #2908
If there is not an existing issue, please make sure we have context on why this change is needed. See our Contributing Guide for examples of when an existing issue isn't necessary.
Notes for the reviewer
Please review agent.go. I have removed printing out the filecontents, because on windows there is no way to determine if a file is executable or not. I would like confirmation that this is ok (or not).
Checklist
Reviewer Checklist