feat: Allow composite commands to be overridden #4043

johnmcollier · 2020-09-25T17:21:11Z

What type of PR is this?
/kind feature
/area devfile

What does does this PR do / why we need it:
Adds support for overriding composite commands in parent devfiles. Also fixes a bug where parent commands could not be overridden if the parent command contained upper case letters.

Which issue(s) this PR fixes:

Fixes #3759

PR acceptance criteria:

Unit test
Integration test
Documentation
I have read the test guidelines

How to test changes / Special notes to the reviewer:
Sample devfile:

schemaVersion: 2.0.0
metadata:
  name: nodejs
  version: 1.0.0
parent:
  uri: https://raw.githubusercontent.com/openshift/odo/master/tests/examples/source/devfiles/nodejs/devfileCompositeCommands.yaml
  commands:
  - id: buildAndMkdir
    composite:
         label: Build and Mkdir
         commands:
           - createfile
           - install
         parallel: false
         group: 
            kind: build
            isDefault: true
commands:
  - id: createfile
    exec:
      component: runtime
      commandLine: touch /projects/testfile
      workingDir: ${PROJECTS_ROOT}
      group:
        kind: build
        isDefault: false

Output should have:

Executing devfile commands for component nodejs
 ✓  Executing createfile command "touch /projects/testfile" [300ms]
 ✓  Executing install command "npm install" [2s]
 ✓  Executing run command "npm start" [1s]

Adds support for overriding composite commands in parent devfiles. Also fixes a bug where parent commands could not be overridden if the parent command contained upper case letters. Signed-off-by: John Collier <[email protected]>

Signed-off-by: John Collier <[email protected]>

pkg/devfile/parser/types.go

Signed-off-by: John Collier <[email protected]>

johnmcollier · 2020-09-28T17:10:36Z

/retest

pkg/devfile/parser/types.go

Signed-off-by: John Collier <[email protected]>

johnmcollier · 2020-09-29T13:17:39Z

@mik-dass Thanks for reviewing, fixed the typos! The "o" key on my laptop has been acting up lately 😅

codecov · 2020-09-29T16:58:14Z

Codecov Report

Merging #4043 into master will increase coverage by 0.02%.
The diff coverage is 57.69%.

@@            Coverage Diff             @@
##           master    #4043      +/-   ##
==========================================
+ Coverage   43.28%   43.31%   +0.02%     
==========================================
  Files         147      147              
  Lines       12435    12452      +17     
==========================================
+ Hits         5383     5394      +11     
- Misses       6483     6486       +3     
- Partials      569      572       +3

Impacted Files	Coverage Δ
pkg/devfile/parser/data/2.0.0/components.go	`40.84% <0.00%> (ø)`
pkg/devfile/parser/types.go	`64.70% <60.00%> (ø)`

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 19098a2...ee229e3. Read the comment docs.

mik-dass

/approve

openshift-ci-robot · 2020-09-30T10:49:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mik-dass

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/devfile/OWNERS~~ [mik-dass]
~~tests/OWNERS~~ [mik-dass]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2020-09-30T10:59:37Z

/retest