Use devspaces-dashboard.openshift-devspaces.svc to get devfile yaml #23366
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: Dmytro Nochevnov <dnochevn@redhat.com>
Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| ); | ||
| return `http://${serviceClusterIp}:${servicePort}${devfileSampleURIPrefix}`; | ||
|
|
||
| return `http://devspaces-dashboard.openshift-devspaces.svc:8080${devfileSampleURIPrefix}`; |
Check warning
Code scanning / CodeQL
Unsafe shell command constructed from library input Medium test
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix AI 6 days ago
To fix the problem, we should avoid passing untrusted input directly to the shell. Instead, we can use the child_process.execFile method, which takes an array of arguments and does not invoke the shell, thus avoiding interpretation of special characters. If the command must be interpreted by a shell, we can use the shell-quote library to escape any special characters in the input.
- Replace the use of
child_process.execwithchild_process.execFilewhere possible. - For commands that require shell interpretation, use the
shell-quotelibrary to escape the input.
Suggested changeset
2
tests/e2e/utils/DevfilesHelper.ts
| @@ -35,4 +35,6 @@ | ||
| const clusterURL: string = this.getInternalClusterURLToDevFile(devFileName); | ||
| const shellQuote = require('shell-quote'); | ||
| const escapedClusterURL = shellQuote.quote([clusterURL]); | ||
| this.getShellExecutor().executeCommand( | ||
| `oc exec -i ${podName} -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -c ${containerName} -- sh -c 'curl -o /tmp/${devFileName}-devfile.yaml ${clusterURL}'` | ||
| `oc exec -i ${podName} -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -c ${containerName} -- sh -c 'curl -o /tmp/${devFileName}-devfile.yaml ${escapedClusterURL}'` | ||
| ); | ||
| @@ -40,3 +42,3 @@ | ||
| .executeArbitraryShellScript( | ||
| `oc exec -i ${podName} -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -c ${containerName} -- cat /tmp/${devFileName}-devfile.yaml` | ||
| `oc exec -i ${podName} -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -c ${containerName} -- cat /tmp/${shellQuote.quote([devFileName])}-devfile.yaml` | ||
| ) |
tests/e2e/package.json
Outside changed files
| @@ -68,3 +68,4 @@ | ||
| "inversify": "6.0.1", | ||
| "reflect-metadata": "0.1.13" | ||
| "reflect-metadata": "0.1.13", | ||
| "shell-quote": "^1.8.2" | ||
| }, |
This fix introduces these dependencies
| Package | Version | Security advisories |
| shell-quote (npm) | 1.8.2 | None |
Copilot is powered by AI and may make mistakes. Always verify output.
SkorikSergey
approved these changes
Feb 27, 2025
artaleks9
approved these changes
Feb 27, 2025
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 PR do?
Fixes devfile API tests on airgap cluster.
Screenshot/screencast of this PR
What issues does this PR fix or reference?
https://issues.redhat.com/browse/CRW-8247
How to test this PR?
PR Checklist
As the author of this Pull Request I made sure that:
What issues does this PR fix or referenceandHow to test this PRcompletedReviewers
Reviewers, please comment how you tested the PR when approving it.