From dd0ebd3a3906332b1e9d59ff346958cdc9091be1 Mon Sep 17 00:00:00 2001 From: Andrew Mak Date: Wed, 17 Jul 2019 14:11:56 -0400 Subject: [PATCH 1/2] fix devfiles Signed-off-by: Andrew Mak --- devfiles/goTemplate/devfile.yaml | 9 +++++---- devfiles/javaMicroProfileTemplate/devfile.yaml | 8 ++++---- devfiles/lagomJavaTemplate/devfile.yaml | 8 ++++---- devfiles/nodeExpressTemplate/devfile.yaml | 8 ++++---- devfiles/openLibertyTemplate/devfile.yaml | 8 ++++---- devfiles/pythonTemplate/devfile.yaml | 8 ++++---- devfiles/springJavaTemplate/devfile.yaml | 7 ++++--- 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/devfiles/goTemplate/devfile.yaml b/devfiles/goTemplate/devfile.yaml index bab25d8..834134d 100755 --- a/devfiles/goTemplate/devfile.yaml +++ b/devfiles/goTemplate/devfile.yaml @@ -1,11 +1,12 @@ --- apiVersion: 1.0.0 metadata: - name: jgoTemplate + name: goTemplate projects: - - source: - type: git - location: "https://github.com/microclimate-dev2ops/microclimateGoTemplate" + - name: goproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/microclimateGoTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/javaMicroProfileTemplate/devfile.yaml b/devfiles/javaMicroProfileTemplate/devfile.yaml index 591af3d..12021f0 100755 --- a/devfiles/javaMicroProfileTemplate/devfile.yaml +++ b/devfiles/javaMicroProfileTemplate/devfile.yaml @@ -3,10 +3,10 @@ apiVersion: 1.0.0 metadata: name: javaMicroProfileTemplate projects: - - source: - type: git - language: java - location: "https://github.com/microclimate-dev2ops/javaMicroProfileTemplate" + - name: javaproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/javaMicroProfileTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/lagomJavaTemplate/devfile.yaml b/devfiles/lagomJavaTemplate/devfile.yaml index fe834ee..0cc0a7b 100755 --- a/devfiles/lagomJavaTemplate/devfile.yaml +++ b/devfiles/lagomJavaTemplate/devfile.yaml @@ -3,10 +3,10 @@ apiVersion: 1.0.0 metadata: name: lagomJavaTemplate projects: - - source: - type: git - language: java - location: "https://github.com/microclimate-dev2ops/lagomJavaTemplate" + - name: lagomproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/lagomJavaTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/nodeExpressTemplate/devfile.yaml b/devfiles/nodeExpressTemplate/devfile.yaml index aef787d..e0e8a28 100755 --- a/devfiles/nodeExpressTemplate/devfile.yaml +++ b/devfiles/nodeExpressTemplate/devfile.yaml @@ -3,10 +3,10 @@ apiVersion: 1.0.0 metadata: name: nodeExpressTemplate projects: - - source: - type: git - language: nodejs - location: "https://github.com/microclimate-dev2ops/nodeExpressTemplate" + - name: nodeproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/nodeExpressTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/openLibertyTemplate/devfile.yaml b/devfiles/openLibertyTemplate/devfile.yaml index 26768fc..5df0b57 100755 --- a/devfiles/openLibertyTemplate/devfile.yaml +++ b/devfiles/openLibertyTemplate/devfile.yaml @@ -3,10 +3,10 @@ apiVersion: 1.0.0 metadata: name: openLibertyTemplate projects: - - source: - type: git - language: java - location: "https://github.com/microclimate-dev2ops/openLibertyTemplate" + - name: libertyproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/openLibertyTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/pythonTemplate/devfile.yaml b/devfiles/pythonTemplate/devfile.yaml index 6bfb78e..4efa3d1 100755 --- a/devfiles/pythonTemplate/devfile.yaml +++ b/devfiles/pythonTemplate/devfile.yaml @@ -3,10 +3,10 @@ apiVersion: 1.0.0 metadata: name: Python Template projects: - - source: - type: git - language: python - location: "https://github.com/microclimate-dev2ops/SVTPythonTemplate" + - name: pythonproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/SVTPythonTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/devfiles/springJavaTemplate/devfile.yaml b/devfiles/springJavaTemplate/devfile.yaml index 2e26cb0..69b3b80 100755 --- a/devfiles/springJavaTemplate/devfile.yaml +++ b/devfiles/springJavaTemplate/devfile.yaml @@ -3,9 +3,10 @@ apiVersion: 1.0.0 metadata: name: springJavaTemplate projects: - - source: - type: git - location: "https://github.com/microclimate-dev2ops/springJavaTemplate" + - name: springproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/springJavaTemplate" components: - alias: codewind-sidecar type: chePlugin From 824b3574e346228f9512614889b27bc8d2fb2f20 Mon Sep 17 00:00:00 2001 From: Andrew Mak Date: Wed, 17 Jul 2019 14:16:44 -0400 Subject: [PATCH 2/2] fix script Signed-off-by: Andrew Mak --- devfiles/swiftTemplate/devfile.yaml | 7 ++++--- index.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devfiles/swiftTemplate/devfile.yaml b/devfiles/swiftTemplate/devfile.yaml index 05637ab..7de5b01 100755 --- a/devfiles/swiftTemplate/devfile.yaml +++ b/devfiles/swiftTemplate/devfile.yaml @@ -3,9 +3,10 @@ apiVersion: 1.0.0 metadata: name: swiftTemplate projects: - - source: - type: git - location: "https://github.com/microclimate-dev2ops/swiftTemplate" + - name: swiftproject + source: + type: git + location: "https://github.com/microclimate-dev2ops/swiftTemplate" components: - alias: codewind-sidecar type: chePlugin diff --git a/index.sh b/index.sh index 1832d1d..2a2d8b4 100755 --- a/index.sh +++ b/index.sh @@ -49,7 +49,7 @@ function buildIndex() { for field in "${metaInfoFields2[@]}" do # String value contains quotes, e.g. "str" - projects="$(yq r -j "${devfileArray[$count]}" "projects[0].location")" + projects="$(yq r -j "${devfileArray[$count]}" "projects[0].source.location")" #location="$(yq r -j "$projects" "location")" echo " \"location\":$projects," done