fix

capactio · Aug 25, 2021 · 68bd7c5 · 68bd7c5
1 parent 9b41d21
commit 68bd7c5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 21 deletions.
diff --git a/internal/cli/alpha/manifestgen/templates/helm-implementation.yaml.tmpl b/internal/cli/alpha/manifestgen/templates/helm-implementation.yaml.tmpl
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.{{ .Prefix }}.{{ .Name }}-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.{{ .Prefix }}.{{ .Name }}-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:
@@ -111,7 +112,7 @@ spec:
                   arguments:
                     artifacts:
                       - name: input-parameters
-                        from: "{{"{{"}}steps.fill-parameters.outputs.artifacts.render{{"}}"}}"
+                        from: "{{"{{"}}steps.create-helm-args.outputs.artifacts.render{{"}}"}}"
                       - name: runner-context
                         from: "{{"{{"}}workflow.outputs.artifacts.runner-context{{"}}"}}"
 

diff --git a/internal/cli/alpha/manifestgen/testdata/cap.implementation.helm.test-generated-schema.yaml b/internal/cli/alpha/manifestgen/testdata/cap.implementation.helm.test-generated-schema.yaml
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.helm.test-generated-schema-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.helm.test-generated-schema-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:
@@ -253,7 +254,7 @@ spec:
                   arguments:
                     artifacts:
                       - name: input-parameters
-                        from: "{{steps.fill-parameters.outputs.artifacts.render}}"
+                        from: "{{steps.create-helm-args.outputs.artifacts.render}}"
                       - name: runner-context
                         from: "{{workflow.outputs.artifacts.runner-context}}"
 

diff --git a/internal/cli/alpha/manifestgen/testdata/cap.implementation.helm.test.yaml b/internal/cli/alpha/manifestgen/testdata/cap.implementation.helm.test.yaml
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.helm.test-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.helm.test-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:
@@ -393,7 +394,7 @@ spec:
                   arguments:
                     artifacts:
                       - name: input-parameters
-                        from: "{{steps.fill-parameters.outputs.artifacts.render}}"
+                        from: "{{steps.create-helm-args.outputs.artifacts.render}}"
                       - name: runner-context
                         from: "{{workflow.outputs.artifacts.runner-context}}"
 

diff --git a/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.aws.test.yaml b/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.aws.test.yaml
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.terraform.aws.test-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.terraform.aws.test-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:

diff --git a/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.gcp.test.yaml b/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.gcp.test.yaml
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.terraform.gcp.test-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.terraform.gcp.test-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:

diff --git a/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.generic.test.yaml b/internal/cli/alpha/manifestgen/testdata/cap.implementation.terraform.generic.test.yaml
@@ -19,9 +19,10 @@ spec:
   appVersion: "1.0.x" # TODO(ContentDeveloper): Set the supported application version here
   additionalInput:
     parameters:
-      typeRef:
-        path: "cap.type.terraform.generic.test-input"
-        revision: 0.1.0
+      additional-parameters:
+        typeRef:
+          path: "cap.type.terraform.generic.test-input"
+          revision: 0.1.0
 
   outputTypeInstanceRelations:
     config:

diff --git a/pkg/hub/client/public/iface_fields.go b/pkg/hub/client/public/iface_fields.go
@@ -68,6 +68,10 @@ var ifaceRevisionInputDataFields = `
           parameters {
             name
             jsonSchema
+            typeRef {
+              path
+              revision
+            }
           }
           typeInstances {
             name