Manage merge keys of top-level lists in a more consistent way

devfile-support/samples/devfile-registry/redhat-java8-latest.devfile.yaml

@@ -14,18 +14,19 @@ metadata:
 parent:
   id: redhat/theia-vsx-template/latest
   components:
-    - container:
-         name: vsx-installer
-         env:
-            - name: VSX_LIST
-              value: java-dbg.vsix,java.vsix
+    - name: vsx-installer
+      container:
+        env:
+          - name: VSX_LIST
+            value: java-dbg.vsix,java.vsix
 components:
- - container:
-    image: ...che-sidecar-java
-    name: vscode-java
-    memoryLimit: "1500Mi"
-    volumeMounts:
-     - path: "/home/theia/.m2"
-       name: m2
- - volume:
-    name: m2
+  - name: vscode-java
+    container:
+      image: ...che-sidecar-java
+      memoryLimit: "1500Mi"
+      volumeMounts:
+        - path: "/home/theia/.m2"
+          name: m2
+  - name: m2
+    volume: {}
+

devfile-support/samples/devfile-registry/redhat-theia-vsx-template.devfile.yaml

@@ -6,20 +6,20 @@ metadata:
   parameters:
     VSX_LIST 
 components:
- - container:
-    name: vsx-installer
-    image: vsx-installer
-    volumeMounts:
-      - name: vsx
-        path: "/vsx"
-    env:
-      - name: VSX_LIST
-        value: ""
- - volume:
-    name: vsx
+  - name: vsx-installer
+    container:
+      image: vsx-installer
+      volumeMounts:
+        - name: vsx
+          path: "/vsx"
+      env:
+        - name: VSX_LIST
+          value: ""
+  - name: vsx
+    volume: {}
 commands:
- - apply:
-     id: copyVsx
+ - id: copyVsx
+   apply:
      component: vsx-installer
 events:
   preStart:

devfile-support/samples/job-apply-example.devfile.yaml

@@ -3,8 +3,8 @@ metadata:
   name: "myDevfile"
   version: "0.0.1"
 components:
-  - kubernetes:
-      name: cleanup-job
+  - name: cleanup-job
+    kubernetes:
       inlined: |
         apiVersion: batch/v1
         kind: Job
@@ -19,13 +19,15 @@ components:
                 command: ["some",  "command", "with", "parameters"]
               restartPolicy: Never
           backoffLimit: 4
-  - plugin:
+  - name: go-support
+    plugin:
       id: ms-vscode/go/latest
-  - plugin:
+  - name: editor
+    plugin:
       id: eclipse/che-theia/latest
 commands:
-  - apply:
-      id: cleanup-job
+  - id: cleanup-job
+    apply:
       component: cleanup-job      
 events:
   postStop:

devfile-support/samples/nodejs-stack.devfile.yaml

@@ -7,19 +7,21 @@ projects:
       remotes:
         origin: "https://github.com/che-samples/web-nodejs-sample.git"
 components:
-  - plugin:
+  - name: editor
+    plugin:
       id: eclipse/che-theia/7.1.0
-  - plugin:
+  - name: terminal
+    plugin:
       id: eclipse/che-machine-exec-plugin/7.1.0
-  - plugin:
-      name: "typescript-plugin"
+  - name: typescript-plugin
+    plugin:
       id: che-incubator/typescript/1.30.2
       components:
-        - container:
-            name: "??"
+        - name: "??"
+          container:
             memoryLimit: 512Mi
-  - container:
-      name: nodejs
+  - name: nodejs
+    container:
       image: quay.io/eclipse/che-nodejs10-ubi:nightly
       memoryLimit: 512Mi
       endpoints:
@@ -28,37 +30,37 @@ components:
           targetPort: 3000
       mountSources: true
 commands:
-  - exec:
-      id: download dependencies
+  - id: download dependencies
+    exec:
       component: nodejs
       commandLine: npm install
       workingDir: ${PROJECTS_ROOT}/project/app
       group:
         kind: build
-  - exec:
-      id: run the app
+  - id: run the app
+    exec:
       component: nodejs
       commandLine: nodemon app.js
       workingDir: ${PROJECTS_ROOT}/project/app
       group:
         kind: run
         isDefault: true
-  - exec:
-      id: run the app (debugging enabled)
+  - id: run the app (debugging enabled)
+    exec:
       component: nodejs
       commandLine: nodemon --inspect app.js
       workingDir: ${PROJECTS_ROOT}/project/app
       group:
         kind: run
-  - exec:
-      id: stop the app
+  - id: stop the app
+    exec:
       component: nodejs
       commandLine: >-
           node_server_pids=$(pgrep -fx '.*nodemon (--inspect )?app.js' | tr "\\n" " ") &&
           echo "Stopping node server with PIDs: ${node_server_pids}" && 
           kill -15 ${node_server_pids} &>/dev/null && echo 'Done.'
-  - vscodeLaunch:
-      id: Attach remote debugger
+  - id: Attach remote debugger
+    vscodeLaunch:
       inlined: |
         {
           "version": "0.2.0",

devfile-support/samples/sample-devfile.yaml

@@ -10,18 +10,19 @@ projects:
         revision: "master"
         remote: origin
 components:
-  - plugin:
+  - name: editor
+    plugin:
       id: eclipse/che-theia/latest
-  - plugin:
-      name: "ownPlugin"
+  - name: "ownPlugin"
+    plugin:
       id: acme/newPlugin/latest
       registryUrl: "https://acme.com/registry/"
-  - plugin:
-      name: "myPlugin"
+  - name: "myPlugin"
+    plugin:
       uri: "https://github.com/johndoe/che-plugins/blob/master/cool-plugin/0.0.1/meta.yaml"
-  - container:
+  - name: "mycontainer"
+    container:
       image: "busybox"
-      name: "mycontainer"
       memoryLimit: "128M"
       mountSources: true
       endpoints:
@@ -31,6 +32,6 @@ components:
           attributes:
             type: terminal
           targetPort: 4000
-  - kubernetes:
-      name: "production"
+  - name: "production"
+    kubernetes:
       uri: "https://somewhere/production-environment.yaml"

devfile-support/samples/simple-devfile.yaml

@@ -8,27 +8,27 @@ projects:
       remotes:
         origin: "https://github.com/devfile/api"
 commands:
-  - exec:
-      id: buildSchema
+  - id: buildSchema
+    exec:
       label: Build the schema
       commandLine: "./buildSchema.sh"
       component: build-tools
       group:
         kind: build
         isDefault: true
-  - vscodeTask:
-      id: openDevfile
+  - id: openDevfile
+    vscodeTask:
       inlined:
         json        
-  - composite:
-      id: buildSchemaAndOpenDevfile
+  - id: buildSchemaAndOpenDevfile
+    composite:
       label: Build schema and open devfile
       commands:
         - buildSchema
         - openDevfile
       parallel: false
-  - exec:
-      id: helloWorld
+  - id: helloWorld
+    exec:
       env:
         - name: "USER"
           value: "John Doe"
@@ -37,15 +37,18 @@ events:
   postStart:
     - "buildSchemaAndOpenDevfile"
 components:
-  - plugin:
+  - name: yaml-support
+    plugin:
       id: redhat/vscode-yaml/latest
-  - plugin:
+  - name: go-support
+    plugin:
       id: ms-vscode/go/latest
-  - plugin:
+  - name: editor
+    plugin:
       id: eclipse/che-theia/latest
       registryUrl: "external-registry-url"
-  - container:
+  - name: "build-tools"
+    container:
       image: some container image with required build tools
       mountSources: true
       sourceMapping: /home/src
-      name: "build-tools"

devfile-support/samples/spring-boot-http-booster-devfile.yaml

@@ -10,19 +10,21 @@ projects:
       checkoutFrom:
         revision: master
 components:
-  - plugin:
+  - name: java-support
+    plugin:
       id: redhat/java8/latest
       components:
-        - container:
-            name: vscode-java            
+        - name: vscode-java            
+          container:
             memoryLimit: 2Gi
-        - volume:
-            name: m2
+        - name: m2
+          volume:
             size: 2G
-  - plugin:
+  - name: dependency-analytics
+    plugin:
       id: redhat/dependency-analytics/latest
-  - container:
-      name: maven
+  - name: maven-tooling
+    container:
       image: registry.redhat.io/codeready-workspaces/stacks-java-rhel8:2.1
       mountSources: true
       memoryLimit: 768Mi
@@ -43,16 +45,16 @@ components:
         - name: m2
           path: /home/jboss/.m2
 commands:
-  - exec:
-      id: build 
+  - id: build 
+    exec:
       component: maven
       commandLine: mvn -Duser.home=${HOME} -DskipTests clean install
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'
       env:
         - name: MAVEN_OPTS
           value: "-Xmx200m"
-  - vscodeLaunch:
-      id: debug remote java application
+  - id: debug remote java application
+    vscodeLaunch:
       inlined: |
         {
           "version": "0.2.0",
@@ -65,39 +67,39 @@ commands:
               "port": 8000
             }]
           }
-  - exec:
-      id: run
+  - id: run
+    exec:
       component: maven
       commandLine: 'mvn -Duser.home=${HOME} spring-boot:run'
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'
       env:
         - name: MAVEN_OPTS
           value: "-Xmx200m"
-  - exec:
-      id: debug
+  - id: debug
+    exec:
       component: maven
       commandLine: >-
         mvn  -Duser.home=${HOME} spring-boot:run -Drun.jvmArguments="-Xdebug
         -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'
-  - exec:
-      id: test
+  - id: test
+    exec:
       component: maven
       commandLine: 'mvn -Duser.home=${HOME} verify'
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'
       env:
         - name: MAVEN_OPTS
           value: "-Xmx200m"
-  - exec:
-      id: dependency-analysis
+  - id: dependency-analysis
+    exec:
       component: maven
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'
       commandLine: >-
         ${HOME}/stack-analysis.sh -f
         ${PROJECTS_ROOT}/spring-boot-http-booster/pom.xml -p
         ${PROJECTS_ROOT}/spring-boot-http-booster
-  - exec:
-      id: deploy to OpenShift 
+  - id: deploy to OpenShift 
+    exec:
       component: maven
       commandLine: 'mvn fabric8:deploy -Popenshift -DskipTests'
       workingDir: '${PROJECTS_ROOT}/spring-boot-http-booster'

devfile-support/samples/with-nodejs-parent.devfile.yaml

@@ -9,8 +9,8 @@ parent:
         checkoutFrom:
           revision: 'mybranch'
 commands:
-  - exec:
-      id: sayHello
+  - id: sayHello
+    exec:
       label: Say Hello
       commandLine: echo "hello"
       component: nodejs