Support environment variables in command #3537

yangcao77 · 2020-07-09T17:59:28Z

What type of PR is this?
/kind user-story
/area devfile

What does does this PR do / why we need it:
This PR allows to specify environment variables in a command in the devfile so that the environment variables are used when executing the command.

Which issue(s) this PR fixes:

Fixes #3406

How to test changes / Special notes to the reviewer:

automation:
run make test-cmd-devfile-push

manual:
Use the devfile.yaml within this PR: devfile-with-multiple-defaults.yaml

run odo create and odo push --build-command firstbuild --run-command singleenv
kubectl exec -it <pod> ls /projects/nodejs-web-app/ should see test_env_variable directory exist

Signed-off-by: Stephanie <stephanie.cao@ibm.com>

…ntVariable

Signed-off-by: Stephanie <stephanie.cao@ibm.com>

codecov · 2020-07-09T20:48:37Z

Codecov Report

Merging #3537 into master will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3537      +/-   ##
==========================================
+ Coverage   45.94%   46.00%   +0.06%     
==========================================
  Files         114      114              
  Lines       11584    11598      +14     
==========================================
+ Hits         5322     5336      +14     
  Misses       5745     5745              
  Partials      517      517

Impacted Files	Coverage Δ
pkg/devfile/adapters/kubernetes/utils/utils.go	`59.49% <100.00%> (+3.93%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 81adbcc...ed4acf9. Read the comment docs.

…ntVariable

pkg/devfile/adapters/kubernetes/utils/utils.go

tests/examples/source/devfiles/nodejs/devfile-with-multiple-defaults.yaml

pkg/devfile/adapters/kubernetes/utils/utils.go

dharmit · 2020-07-15T11:52:26Z

@yangcao77 can you please also share a working example of this that would help test the functionality of this PR? If it's already there at some place (code/issue), please point me to it.

dharmit · 2020-07-15T11:58:56Z

AFAICS, there's not make target by the specified name. I hope I'm not doing something really stupid here. 😢

How to test changes / Special notes to the reviewer:

automation:
run make test-push-devfile-test

$ git checkout upstream/pr/3537
Previous HEAD position was f7c51a7b0 Refactor odo delete logic
HEAD is now at 9b7cc15dc Merge branch 'master' of github.com:openshift/odo into 3406-environmentVariable

$ make test-push-devfile-test
make: *** No rule to make target 'test-push-devfile-test'.  Stop.

$ git log --oneline -n7
9b7cc15dc (HEAD, upstream/pr/3537) Merge branch 'master' of github.com:openshift/odo into 3406-environmentVariable
4d69aab92 added deprecation and error messages for 'odo update' (#3453)
8791263cf Fixing kubeconfig path and login session for 4.x cluster (#3528)
72b44d7bb Adds a error message for creation of routes with host flag (#3541)
c7d7fcb16 Update odo delete for no component and devfile.yaml (#3405)
42fe69318 used MatchJSON in tests wherever needed (#3523)
941bcf83b catalog search services honor experiment flag (#3366)

$ make && cp -f odo ~/bin    
go build -ldflags="-w -X github.com/openshift/odo/pkg/version.GITCOMMIT=9b7cc15dc" cmd/odo/odo.go

$ make test-push-devfile-test
make: *** No rule to make target 'test-push-devfile-test'.  Stop

mik-dass · 2020-07-15T12:02:11Z

How to test changes / Special notes to the reviewer:
automation:
run make test-push-devfile-test

@yangcao77 I think this should be make test-cmd-devfile-push

…ntVariable

Signed-off-by: Stephanie <stephanie.cao@ibm.com>

yangcao77 · 2020-07-15T17:38:09Z

@dharmit Sorry for the confusion, it should be make test-cmd-devfile-push

Also updated the manual test in the PR description if you want to try it manually.

mik-dass · 2020-07-16T05:21:59Z

pkg/devfile/adapters/kubernetes/utils/utils_test.go

+			wantErr:                 false,
+		},
+		{
+			name:       "Case: custom command with multiple environment variable",


please add cases for the debug commands as well

…ntVariable

Signed-off-by: Stephanie <stephanie.cao@ibm.com>

yangcao77 · 2020-07-16T17:16:09Z

/retest

Signed-off-by: Stephanie <stephanie.cao@ibm.com>

openshift-bot · 2020-07-20T13:10:00Z

/retest