Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for handle multiple backends #60

Merged
merged 7 commits into from
Mar 24, 2022
Merged

Support for handle multiple backends #60

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb48ac7
Add changes connected with backend context
Mar 9, 2022
3f32bcd
Fixes after review
Mar 14, 2022
c5a1809
Delete passing-c action
Mar 17, 2022
dc68958
Modify contextSchema to string in test storage
Mar 18, 2022
7538793
Add unpack property to manifests
Mar 24, 2022
c8842a6
Merge main branch
Mar 24, 2022
3224b04
Fix helm storage
Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/implementation/aws/elasticsearch/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ spec:
- name: basicAuth
path: /yamls/basicAuth.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
image: ghcr.io/capactio/pr/infra/merger:20c169b
image: ghcr.io/capactio/pr/infra/merger:20c169b

we cannot break this contract. All images under ghcr.io/capactio/pr/, need to stick to PR-{number} tag. How those images were pushed?

outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/aws/rds/postgresql/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ spec:
- name: aws
path: /yamls/aws.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/aws/redis/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ spec:
- name: provider-credentials
path: /yamls/providercredentials.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/aws/secrets-manager/storage/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ spec:
path: /yamls/additionalinput.yaml
optional: true
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/bitnami/minio/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ spec:
path: /yamls/additionalinput.yaml
optional: true
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/bitnami/mongodb/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ spec:
path: /yamls/additionalinput.yaml
optional: true
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/bitnami/redis/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ spec:
path: /yamls/additionalinput.yaml
optional: true
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
87 changes: 87 additions & 0 deletions manifests/implementation/capactio/capact/validation/action/passing-c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
ocfVersion: 0.0.1
revision: 0.1.0
kind: Implementation
metadata:
prefix: cap.implementation.capactio.capact.validation.action
name: passing-c
license:
name: "Apache 2.0"
displayName: Passing Capact test action that uses Helm storage
description: ""
documentationURL: "https://capact.io"
maintainers:
- email: [email protected]
name: Capact Dev Team
url: https://capact.io
attributes:
cap.attribute.capactio.capact.validation.policy.most-preferred:
revision: 0.1.0

spec:
appVersion: "1.x.x"

implements:
- path: cap.interface.capactio.capact.validation.action.passing
revision: 0.1.0

outputTypeInstanceRelations:
testUpload:
uses: []

requires:
cap.core.type.platform:
oneOf:
- name: kubernetes
revision: 0.1.0
cap.type.capactio.capact.validation:
allOf:
- name: single-key
alias: injected
revision: 0.1.0
- name: storage
revision: 0.1.0
alias: validation-storage

imports:
- interfaceGroupPath: cap.interface.runner.argo
alias: argo
methods:
- name: run
revision: 0.1.0

action:
runnerInterface: argo.run
args:
workflow:
entrypoint: main
templates:
- name: main
steps:
- - name: test
template: test
arguments:
artifacts:
- name: input
from: "{{workflow.outputs.artifacts.testInput}}"
- name: injected
from: "{{workflow.outputs.artifacts.injected}}"
capact-outputTypeInstances:
- name: testUpload
from: upload
backend: validation-storage

- name: test
inputs:
artifacts:
- name: input
path: /input
- name: injected
path: /injected
outputs:
artifacts:
- name: upload
path: /upload
container:
image: alpine:latest
command: ["sh", "-c"]
args: ["echo 'Implementation C' && cp /input /upload && sleep 1"]
2 changes: 1 addition & 1 deletion manifests/implementation/concourse/concourse/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ spec:
- name: user
path: /yamls/user.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/gcp/cloudsql/postgresql/update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ spec:
- name: postgresql
path: /yamls/postgresql.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/mattermost/mattermost-team-edition/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ spec:
- name: user
path: /yamls/user.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/minio/mc/create_bucket.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
- name: s3
path: /yamls/s3.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
4 changes: 2 additions & 2 deletions manifests/implementation/postgresql/change-password.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ spec:
from: "{{steps.prepare-parameters.outputs.artifacts.merged}}"
- name: configuration
raw:
data:
data: "strip-value: true"

- - name: change-password
template: change-password
Expand Down Expand Up @@ -125,7 +125,7 @@ spec:
- name: postgresql
path: /yamls/postgresql.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/postgresql/create-db.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spec:
from: "{{inputs.artifacts.postgresql}}"
- name: configuration
raw:
data: ""
data: "strip-value: true"

- - name: fill-params-in-create-db-script
capact-action: jinja2.template
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/postgresql/create-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
from: "{{inputs.artifacts.postgresql}}"
- name: configuration
raw:
data: ""
data: "strip-value: true"

- - name: create-user
template: create-psql-user
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/rocketchat/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ spec:
- name: mongo
path: /yamls/mongo.yaml
container:
image: ghcr.io/capactio/pr/infra/merger:PR-428
image: ghcr.io/capactio/pr/infra/merger:20c169b
outputs:
artifacts:
- name: merged
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/runner/helm/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
- name: tmp
emptyDir: { }
container:
image: ghcr.io/capactio/helm-runner:a89d7a5
image: ghcr.io/capactio/helm-runner:20c169b
env:
- name: RUNNER_OPTIONAL_KUBECONFIG_TI
value: "{{inputs.artifacts.kubeconfig.path}}"
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/runner/helm/upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
path: "/additional.yaml"
optional: true
container:
image: ghcr.io/capactio/helm-runner:a89d7a5
image: ghcr.io/capactio/helm-runner:20c169b
env:
- name: RUNNER_CONTEXT_PATH
value: "{{inputs.artifacts.runner-context.path}}"
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/runner/terraform/apply-with-state.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ spec:
globalName: tfstate
path: "/terraform-state.yaml"
container:
image: ghcr.io/capactio/terraform-runner:a89d7a5
image: ghcr.io/capactio/terraform-runner:20c169b
env:
- name: RUNNER_CONTEXT_PATH
value: "{{inputs.artifacts.runner-context.path}}"
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/runner/terraform/apply.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
globalName: tfstate
path: "/terraform-state.yaml"
container:
image: ghcr.io/capactio/terraform-runner:a89d7a5
image: ghcr.io/capactio/terraform-runner:20c169b
env:
- name: RUNNER_CONTEXT_PATH
value: "{{inputs.artifacts.runner-context.path}}"
Expand Down
2 changes: 1 addition & 1 deletion manifests/implementation/templating/jinja2/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
- name: render
path: "/render.yml"
container:
image: ghcr.io/capactio/pr/infra/jinja2:PR-590
image: ghcr.io/capactio/pr/infra/jinja2:20c169b
args:
- /template.yml
- /values.yml
Expand Down
4 changes: 1 addition & 3 deletions manifests/type/capactio/capact/validation/download.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ spec:
"key": "example key"
}
],
"required": [
"key"
],
"required": [],
mkuziemko marked this conversation as resolved.
Show resolved Hide resolved
"properties": {
"key": {
"$id": "#/properties/key",
Expand Down