Fixes after review

capactio · Mar 15, 2022 · a260150 · a260150
1 parent eb48ac7
commit a260150
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 25 deletions.
diff --git a/manifests/implementation/aws/elasticsearch/install.yaml b/manifests/implementation/aws/elasticsearch/install.yaml
@@ -464,7 +464,7 @@ spec:
                 - name: basicAuth
                   path: /yamls/basicAuth.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/aws/rds/postgresql/install.yaml b/manifests/implementation/aws/rds/postgresql/install.yaml
@@ -266,7 +266,7 @@ spec:
                 - name: aws
                   path: /yamls/aws.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/aws/redis/install.yaml b/manifests/implementation/aws/redis/install.yaml
@@ -260,7 +260,7 @@ spec:
                 - name: provider-credentials
                   path: /yamls/providercredentials.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/aws/secrets-manager/storage/install.yaml b/manifests/implementation/aws/secrets-manager/storage/install.yaml
@@ -185,7 +185,7 @@ spec:
                   path: /yamls/additionalinput.yaml
                   optional: true
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/bitnami/minio/install.yaml b/manifests/implementation/bitnami/minio/install.yaml
@@ -382,7 +382,7 @@ spec:
                   path: /yamls/additionalinput.yaml
                   optional: true
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
                 - name: merged

diff --git a/manifests/implementation/bitnami/mongodb/install.yaml b/manifests/implementation/bitnami/mongodb/install.yaml
@@ -406,7 +406,7 @@ spec:
                   path: /yamls/additionalinput.yaml
                   optional: true
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
                 - name: merged

diff --git a/manifests/implementation/bitnami/redis/install.yaml b/manifests/implementation/bitnami/redis/install.yaml
@@ -494,7 +494,7 @@ spec:
                   path: /yamls/additionalinput.yaml
                   optional: true
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/capactio/capact/validation/action/passing-b.yaml b/manifests/implementation/capactio/capact/validation/action/passing-b.yaml
@@ -86,4 +86,4 @@ spec:
             container:
               image: alpine:latest
               command: ["sh", "-c"]
-              args: ["echo 'Implementation B' && cp /input /upload && echo 'key: true' > /expected && diff /expected /injected && sleep 1"]
+              args: ["echo 'Implementation B' && cp /input /upload && printf 'value:\n  key: true\n' > /expected && diff /expected /injected && sleep 1"]
diff --git a/manifests/implementation/capactio/capact/validation/action/passing-c.yaml b/manifests/implementation/capactio/capact/validation/action/passing-c.yaml
@@ -69,7 +69,10 @@ spec:
                     - name: testUpload
                       from: upload
                       backend: validation-storage
-
+                  capact-updateTypeInstances:
+                    - name: testUpdate
+                      from: update
+                      backend: validation-storage
           - name: test
             inputs:
               artifacts:
@@ -81,7 +84,9 @@ spec:
               artifacts:
                 - name: upload
                   path: /upload
+                - name: update
+                  path: /update
             container:
               image: alpine:latest
               command: ["sh", "-c"]
-              args: ["echo 'Implementation C' && cp /input /upload && sleep 1"]
+              args: ["echo 'Implementation C' && cp /input /upload && cp /input /update && sleep 1"]
diff --git a/manifests/implementation/concourse/concourse/install.yaml b/manifests/implementation/concourse/concourse/install.yaml
@@ -239,7 +239,7 @@ spec:
                 - name: user
                   path: /yamls/user.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/gcp/cloudsql/postgresql/update.yaml b/manifests/implementation/gcp/cloudsql/postgresql/update.yaml
@@ -173,7 +173,7 @@ spec:
                 - name: postgresql
                   path: /yamls/postgresql.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/mattermost/mattermost-team-edition/install.yaml b/manifests/implementation/mattermost/mattermost-team-edition/install.yaml
@@ -478,7 +478,7 @@ spec:
                 - name: user
                   path: /yamls/user.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/minio/mc/create_bucket.yaml b/manifests/implementation/minio/mc/create_bucket.yaml
@@ -135,7 +135,7 @@ spec:
                 - name: s3
                   path: /yamls/s3.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/postgresql/change-password.yaml b/manifests/implementation/postgresql/change-password.yaml
@@ -89,7 +89,7 @@ spec:
                         from: "{{steps.prepare-parameters.outputs.artifacts.merged}}"
                       - name: configuration
                         raw:
-                          data: "strip-value: true"
+                          data: "unpackValue: true"
 
               - - name: change-password
                   template: change-password
@@ -125,7 +125,7 @@ spec:
                 - name: postgresql
                   path: /yamls/postgresql.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
               - name: merged

diff --git a/manifests/implementation/postgresql/create-db.yaml b/manifests/implementation/postgresql/create-db.yaml
@@ -82,7 +82,7 @@ spec:
                         from: "{{inputs.artifacts.postgresql}}"
                       - name: configuration
                         raw:
-                          data: "strip-value: true"
+                          data: "unpackValue: true"
 
               - - name: fill-params-in-create-db-script
                   capact-action: jinja2.template

diff --git a/manifests/implementation/postgresql/create-user.yaml b/manifests/implementation/postgresql/create-user.yaml
@@ -96,7 +96,7 @@ spec:
                         from: "{{inputs.artifacts.postgresql}}"
                       - name: configuration
                         raw:
-                          data: "strip-value: true"
+                          data: "unpackValue: true"
 
               - - name: create-user
                   template: create-psql-user

diff --git a/manifests/implementation/rocketchat/install.yaml b/manifests/implementation/rocketchat/install.yaml
@@ -273,7 +273,7 @@ spec:
                 - name: mongo
                   path: /yamls/mongo.yaml
             container:
-              image: ghcr.io/capactio/pr/infra/merger:20c169b
+              image: ghcr.io/capactio/pr/infra/merger:PR-657
             outputs:
               artifacts:
                 - name: merged

diff --git a/manifests/implementation/runner/helm/install.yaml b/manifests/implementation/runner/helm/install.yaml
@@ -78,7 +78,7 @@ spec:
               - name: tmp
                 emptyDir: { }
             container:
-              image: ghcr.io/capactio/helm-runner:20c169b
+              image: ghcr.io/capactio/pr/helm-runner:PR-657
               env:
                 - name: RUNNER_OPTIONAL_KUBECONFIG_TI
                   value: "{{inputs.artifacts.kubeconfig.path}}"

diff --git a/manifests/implementation/runner/helm/upgrade.yaml b/manifests/implementation/runner/helm/upgrade.yaml
@@ -94,7 +94,7 @@ spec:
                   path: "/additional.yaml"
                   optional: true
             container:
-              image: ghcr.io/capactio/helm-runner:20c169b
+              image: ghcr.io/capactio/pr/helm-runner:PR-657
               env:
                 - name: RUNNER_CONTEXT_PATH
                   value: "{{inputs.artifacts.runner-context.path}}"

diff --git a/manifests/implementation/runner/terraform/apply-with-state.yaml b/manifests/implementation/runner/terraform/apply-with-state.yaml
@@ -112,7 +112,7 @@ spec:
                   globalName: tfstate
                   path: "/terraform-state.yaml"
             container:
-              image: ghcr.io/capactio/terraform-runner:20c169b
+              image: ghcr.io/capactio/pr/terraform-runner:PR-657
               env:
                 - name: RUNNER_CONTEXT_PATH
                   value: "{{inputs.artifacts.runner-context.path}}"

diff --git a/manifests/implementation/runner/terraform/apply.yaml b/manifests/implementation/runner/terraform/apply.yaml
@@ -76,7 +76,7 @@ spec:
                   globalName: tfstate
                   path: "/terraform-state.yaml"
             container:
-              image: ghcr.io/capactio/terraform-runner:20c169b
+              image: ghcr.io/capactio/pr/terraform-runner:PR-657
               env:
                 - name: RUNNER_CONTEXT_PATH
                   value: "{{inputs.artifacts.runner-context.path}}"

diff --git a/manifests/implementation/templating/jinja2/template.yaml b/manifests/implementation/templating/jinja2/template.yaml
@@ -45,7 +45,7 @@ spec:
                 - name: render
                   path: "/render.yml"
             container:
-              image: ghcr.io/capactio/pr/infra/jinja2:20c169b
+              image: ghcr.io/capactio/pr/infra/jinja2:PR-657
               args:
                 - /template.yml
                 - /values.yml

diff --git a/manifests/type/capactio/capact/validation/download.yaml b/manifests/type/capactio/capact/validation/download.yaml
@@ -24,7 +24,9 @@ spec:
             "key": "example key"
           }
         ],
-        "required": [],
+        "required": [
+            "key"
+        ],
         "properties": {
           "key": {
            "$id": "#/properties/key",