This repository was archived by the owner on Dec 4, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
[DCOS-38138] Update Spark CLI for shell-escape fix #388
Merged
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
5150951
WIP add tests and update manifest with spark.tgz
samvantran 764e6c0
WIP fix cleanUpSubmitArgs to handle special chars and multiargs
samvantran 746969a
Cleanup
samvantran 62b542b
Add vendor pkg go-shellwords
samvantran a71e59f
Fix url
samvantran 9f1dee7
More cleanup + gofmt
samvantran 65a0f7c
Fix single quote error
samvantran 8d347b9
Fix descrip
samvantran 8336832
More fixes and tests
samvantran db177cd
Debug why single quote fails via spark run
samvantran c5df110
Fixes and cleanup
samvantran 55412bc
gofmt
samvantran 5a8e3f4
Comment out test, need to create app to print out options
samvantran 8297693
Add simple app + test for CI
samvantran 93f588a
Cleanup and fix test
samvantran 96ac0a2
Fixes
samvantran 3026e88
Cleanup test cases
samvantran 7c294c7
Address PR comments
samvantran 7b12b34
Fix expected test output
samvantran ff65589
Write confs to tempfile
samvantran 29701c3
Forgot arg in parent function
samvantran 376bf1b
Let's try escaping the quotes
samvantran f7ad435
Alternatively, wrap entire fn in file
samvantran 6b32e56
Add function isSparkApp
samvantran c711c6c
Print out all system.properties in app
samvantran 34dffbc
Run the actual file in test
samvantran d0a230e
Add run perms to tempfile
samvantran 1afd177
Octals are different in python3
samvantran 644c264
Subprocess.run needs shell=True
samvantran f267518
Sleep right after chmod (potentially old Docker bug)
samvantran e7035d0
Holy bejesus it finally works
samvantran 9f86664
Cleanup, move logic to test_spark and revert spark_utils
samvantran 0fef2c3
Simplify test_multi_arg_confs
samvantran 39434da
Address PR comments
samvantran cfadbf1
Cleanup
samvantran 9a69880
Oops, too hasty with the revert
samvantran 36faae7
Merge branch 'master' into DCOS-38138-shell-escape
samvantran fbc86dc
Use spark distro 2.6.5 created from default
samvantran 13bb7f0
Resync test.sh from dcos-commons: use DOCKER_IMAGE envvar
7865b6c
Skip test_jar test
samvantran 0ca555a
Merge branch 'master' into DCOS-38138-shell-escape
samvantran d0aae3c
Remove checking for bool values
samvantran 7b2bb6c
Move app extensions closer to method
samvantran File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Run the actual file in test
- Loading branch information
commit 34dffbca8f54c2e52c23cf55132dfa841cb489cc
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ object MultiConfs { | |
| println("Printing all conf values...") | ||
| conf.getAll.foreach(println) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One additional check that tests the whole thing end-to-end: pass in
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good idea, I'll update. |
||
|
|
||
| // Verify property is set in system | ||
| // Verify property is set in system | ||
| val props = System.getProperties() | ||
| println("Printing all System.properties...") | ||
| props.list(System.out) | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you write the entire command to a file, you can just execute the file as a shell script: like
subprocess.run(args_file.name)rather than cat-ing the contents of the files.