Fix storage backend ID for TypeInstance from nested workflow (#706)

capactio · May 4, 2022 · dd61711 · dd61711
1 parent 5ebe084
commit dd61711
Show file tree

Hide file tree

Showing 22 changed files with 2,822 additions and 30 deletions.
diff --git a/pkg/hub/client/fake/fake.go b/pkg/hub/client/fake/fake.go
@@ -124,7 +124,8 @@ func (s *FileSystemClient) ListTypes(ctx context.Context, opts ...public.TypeOpt
 					Path: typeRev.Metadata.Path,
 				},
 				Spec: &hubpublicgraphql.TypeSpec{
-					JSONSchema: typeRev.Spec.JSONSchema,
+					JSONSchema:     typeRev.Spec.JSONSchema,
+					AdditionalRefs: typeRev.Spec.AdditionalRefs,
 				},
 			}},
 		})

diff --git a/pkg/sdk/renderer/argo/dedicated_renderer.go b/pkg/sdk/renderer/argo/dedicated_renderer.go
@@ -348,7 +348,7 @@ func (r *dedicatedRenderer) RenderTemplateSteps(ctx context.Context, workflow *W
 
 					// 3.9 Add TypeInstances to the upload graph
 					inputArtifacts := r.tplInputArguments[step.Template]
-					typeInstancesBackends, err := r.policyEnforcedCli.ListTypeInstancesBackendsBasedOnPolicy(ctx, rootimpl.Rule, rootimpl.Revision)
+					typeInstancesBackends, err := r.policyEnforcedCli.ListTypeInstancesBackendsBasedOnPolicy(ctx, rule, implementation)
 					if err != nil {
 						return nil, errors.Wrap(err, "while resolving TypeInstance Backend based on Policy")
 					}
@@ -982,6 +982,16 @@ func (r *dedicatedRenderer) addOutputTypeInstancesToGraph(step *WorkflowStep, pr
 				stepOutputBackendAlias = ptr.StringPtrToString(output.Backend)
 				name = addPrefix(prefix, output.From)
 				r.tryReplaceTypeInstanceName(output.Name, name)
+
+				for i := range mappings {
+					if mappings[i].Name == name {
+						mappings[name] = artefactNameWithBackend{
+							Name:    output.Name,
+							Backend: mappings[i].Backend,
+						}
+						delete(mappings, i)
+					}
+				}
 			} else {
 				// if the TypeInstance was not defined in capact-outputTypeInstances, then just prefix it
 				name = addPrefix(prefix, item.TypeInstanceName)
@@ -1041,7 +1051,7 @@ func (r *dedicatedRenderer) addOutputTypeInstancesToGraph(step *WorkflowStep, pr
 }
 
 func (*dedicatedRenderer) selectBackendAlias(upperStep, resolvedStep string) (*string, error) {
-	if upperStep != "" && resolvedStep != "" {
+	if upperStep != "" && resolvedStep != "" && upperStep != resolvedStep {
 		return nil, errors.Errorf("cannot override backend on capact-outputTypeInstances")
 	}
 	for _, alias := range []string{upperStep, resolvedStep} {

diff --git a/pkg/sdk/renderer/argo/fixtures_test.go b/pkg/sdk/renderer/argo/fixtures_test.go
@@ -6,6 +6,43 @@ import (
 	"capact.io/capact/pkg/sdk/apis/0.0.1/types"
 )
 
+func fixHelmStorageGlobalPolicy() policy.Policy {
+	return policy.Policy{
+		Interface: policy.InterfacePolicy{
+			Default: &policy.InterfaceDefault{
+				Inject: &policy.DefaultInject{
+					RequiredTypeInstances: []policy.RequiredTypeInstanceToInject{
+						{
+							TypeInstanceReference: policy.TypeInstanceReference{
+								ID:          "a35a0c04-6153-4fe9-8d49-9ec35a0e86e",
+								Description: ptr.String("Helm release"),
+							},
+						},
+						{
+							TypeInstanceReference: policy.TypeInstanceReference{
+								ID:          "b1fcdf4c-f3e3-4b90-ba37-f8ca40c620e2",
+								Description: ptr.String("Helm template"),
+							},
+						},
+					},
+				},
+			},
+			Rules: policy.InterfaceRulesList{
+				{
+					Interface: types.ManifestRefWithOptRevision{
+						Path: "cap.*",
+					},
+					OneOf: []policy.Rule{
+						{
+							ImplementationConstraints: policy.ImplementationConstraints{},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
 func fixGCPGlobalPolicy() policy.Policy {
 	return policy.Policy{
 		Interface: policy.InterfacePolicy{

diff --git a/pkg/sdk/renderer/argo/renderer_test.go b/pkg/sdk/renderer/argo/renderer_test.go
@@ -203,6 +203,16 @@ func TestRenderHappyPathWithCustomPolicies(t *testing.T) {
 		userParameterCollection types.ParametersCollection
 		policy                  policy.Policy
 	}{
+		{
+			name: "Mattermost workflow with storage backends",
+			ref: types.InterfaceRef{
+				Path: "cap.interface.productivity.mattermost.install",
+			},
+			userParameterCollection: types.ParametersCollection{
+				"input-parameters": `{"host":"mattermost.local"}`,
+			},
+			policy: fixHelmStorageGlobalPolicy(),
+		},
 		{
 			name: "Mattermost with CloudSQL PostgreSQL installation with GCP SA injected",
 			ref: types.InterfaceRef{

diff --git a/...yPathWithCustomPolicies/CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml b/...yPathWithCustomPolicies/CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml
@@ -174,8 +174,8 @@ args:
           name: inject-runner-context-step
           template: inject-runner-context
       - - arguments: {}
-          name: inject-input-type-instances-2-0-step
-          template: inject-input-type-instances-2-0
+          name: inject-input-type-instances-3-0-step
+          template: inject-input-type-instances-3-0
       - - arguments: {}
           name: populate-input-parameters-step
           template: populate-input-parameters
@@ -258,7 +258,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-2-0
+      name: inject-input-type-instances-3-0
       outputs:
         artifacts:
         - globalName: gcp-sa

diff --git a/...estdata/TestRenderHappyPathWithCustomPolicies/Mattermost_with_AWS_RDS_install.golden.yaml b/...estdata/TestRenderHappyPathWithCustomPolicies/Mattermost_with_AWS_RDS_install.golden.yaml
@@ -427,8 +427,8 @@ args:
           name: rds-instance
       steps:
       - - arguments: {}
-          name: inject-input-type-instances-5-0-step
-          template: inject-input-type-instances-5-0
+          name: inject-input-type-instances-6-0-step
+          template: inject-input-type-instances-6-0
       - - arguments:
             artifacts:
             - from: '{{inputs.artifacts.input-parameters}}'
@@ -869,7 +869,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-5-0
+      name: inject-input-type-instances-6-0
       outputs:
         artifacts:
         - globalName: aws-credentials

diff --git a/...olicies/Mattermost_with_CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml b/...olicies/Mattermost_with_CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml
@@ -423,8 +423,8 @@ args:
           name: postgresql
       steps:
       - - arguments: {}
-          name: inject-input-type-instances-0-0-step
-          template: inject-input-type-instances-0-0
+          name: inject-input-type-instances-1-0-step
+          template: inject-input-type-instances-1-0
       - - arguments:
             artifacts:
             - from: '{{inputs.artifacts.input-parameters}}'
@@ -592,7 +592,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-0-0
+      name: inject-input-type-instances-1-0
       outputs:
         artifacts:
         - globalName: gcp-sa

diff --git a/...estRenderHappyPathWithCustomPolicies/Mattermost_with_CloudSQL_using_Terraform.golden.yaml b/...estRenderHappyPathWithCustomPolicies/Mattermost_with_CloudSQL_using_Terraform.golden.yaml
@@ -423,8 +423,8 @@ args:
           name: postgresql
       steps:
       - - arguments: {}
-          name: inject-input-type-instances-4-0-step
-          template: inject-input-type-instances-4-0
+          name: inject-input-type-instances-5-0-step
+          template: inject-input-type-instances-5-0
       - - arguments:
             artifacts:
             - from: '{{inputs.artifacts.input-parameters}}'
@@ -653,7 +653,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-4-0
+      name: inject-input-type-instances-5-0
       outputs:
         artifacts:
         - globalName: gcp-sa

diff --git a/...estRenderHappyPathWithCustomPolicies/Mattermost_with_existing_DB_installation.golden.yaml b/...estRenderHappyPathWithCustomPolicies/Mattermost_with_existing_DB_installation.golden.yaml
@@ -950,14 +950,14 @@ args:
       outputs: {}
       steps:
       - - arguments: {}
-          name: inject-input-type-instances-1-1-step
-          template: inject-input-type-instances-1-1
+          name: inject-input-type-instances-2-1-step
+          template: inject-input-type-instances-2-1
       - - arguments: {}
           name: inject-runner-context-step
           template: inject-runner-context
       - - arguments: {}
-          name: inject-input-type-instances-1-0-step
-          template: inject-input-type-instances-1-0
+          name: inject-input-type-instances-2-0-step
+          template: inject-input-type-instances-2-0
       - - arguments: {}
           name: populate-input-parameters-step
           template: populate-input-parameters
@@ -1072,7 +1072,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-1-0
+      name: inject-input-type-instances-2-0
       outputs:
         artifacts:
         - globalName: postgresql
@@ -1122,7 +1122,7 @@ args:
         resources: {}
       inputs: {}
       metadata: {}
-      name: inject-input-type-instances-1-1
+      name: inject-input-type-instances-2-1
       outputs:
         artifacts:
         - globalName: postgresql