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.

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

Improve Input JSON schemas #51

Merged
merged 1 commit into from
Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/bitnami/postgresql/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
enabled: true
global:
postgresql:
postgresqlDatabase: <@ defaultDBName @>
postgresqlDatabase: <@ defaultDBName | default('postgres') @>
postgresqlPassword: <@ superuser.password | default(random_word(length=16)) @>
output:
goTemplate: |
Expand Down
4 changes: 2 additions & 2 deletions manifests/interface/capactio/capact/examples/simple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: InterfaceGroup
metadata:
prefix: cap.interface.capactio.capact.examples
name: simple
displayName: "Hello Capact"
description: "Simple Capat Hello World example"
displayName: "Hello Capact (Simple)"
description: "Simple Capact Hello World example"
iconURL: https://storage.googleapis.com/dashboard-icons/glyph-capact.svg
documentationURL: https://capact.dev
supportURL: https://capact.dev
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: InterfaceGroup
metadata:
prefix: cap.interface.capactio.capact.examples
name: typeinstance
displayName: "Hello Capact"
description: "Simple Capat Hello World example using Type Instances"
displayName: "Hello Capact (TypeInstances)"
description: "Simple Capact Hello World example using Type nstances"
iconURL: https://storage.googleapis.com/dashboard-icons/glyph-capact.svg
documentationURL: https://capact.dev
supportURL: https://capact.dev
Expand Down
4 changes: 2 additions & 2 deletions manifests/interface/capactio/capact/validation/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: InterfaceGroup
metadata:
prefix: cap.interface.capactio.capact.validation
name: action
displayName: "Capact E2E actions test manifests"
description: "Manifests used for testing Capact actions"
displayName: "Capact E2E tests for Actions"
description: "Manifests used for testing Capact Actions"
iconURL: https://storage.googleapis.com/dashboard-icons/glyph-capact.svg
documentationURL: https://capact.io
supportURL: https://capact.io
Expand Down
4 changes: 2 additions & 2 deletions manifests/interface/capactio/capact/validation/hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: InterfaceGroup
metadata:
prefix: cap.interface.capactio.capact.validation
name: hub
displayName: "Capact E2E Hub Public test manifests"
description: "Manifests used for testing Hub Public GraphQL calls and filters"
displayName: "Capact E2E tests for Public Hub"
description: "Manifests used for testing Public Hub's GraphQL calls and filters"
documentationURL: https://capact.io
iconURL: https://storage.googleapis.com/dashboard-icons/glyph-capact.svg
supportURL: https://capact.io
Expand Down
4 changes: 2 additions & 2 deletions manifests/interface/database/object/aws/s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: InterfaceGroup
metadata:
prefix: cap.interface.database.object.aws
name: s3
displayName: AWS S3 Actions
description: AWS S3 related Actions
displayName: AWS S3
description: AWS S3 storage
documentationURL: https://aws.amazon.com/s3/
supportURL: https://aws.amazon.com/s3/
iconURL: https://storage.googleapis.com/dashboard-icons/s3.svg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
prefix: cap.interface.database.object.aws.s3
name: create-bucket
displayName: "Create S3 bucket"
description: "Create AWS s3 bucket"
description: "Create AWS S3 bucket"
documentationURL: https://aws.amazon.com/s3/
supportURL: https://aws.amazon.com/s3/
iconURL: http://media.corporate-ir.net/media_files/IROL/17/176060/Oct18/AWS.png
Expand Down
2 changes: 1 addition & 1 deletion manifests/interface/database/object/aws/s3/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Interface
metadata:
prefix: cap.interface.database.object.aws.s3
name: install
displayName: Install Action for AWS S3
displayName: Install
description: Install Action for AWS S3 object store
documentationURL: https://aws.amazon.com/s3/
supportURL: https://aws.amazon.com/s3/
Expand Down
2 changes: 1 addition & 1 deletion manifests/type/automation/concourse/install-input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ spec:
"$ref": "#/definitions/hostname"
}
},
"additionalProperties": true
"additionalProperties": false
}
8 changes: 4 additions & 4 deletions manifests/type/database/object/aws/s3/install-input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
{
"$schema": "http://json-schema.org/draft-07/schema",
"type": "object",
"title": "The schema for MinIO installation input",
"title": "The schema for S3 installation input",
"examples": [
{
"name": "Cluster name",
Expand All @@ -33,17 +33,17 @@ spec:
"name": {
"$id": "#/properties/name",
"type": "string",
"title": "Defines a cluster name for the MinIO"
"title": "S3 installation name"
},
"accesskey": {
"$id": "#/properties/accesskey",
"type": "string",
"title": "Defines MinIO access Key"
"title": "Access Key"
},
"secretkey": {
"$id": "#/properties/secretkey",
"type": "string",
"title": "Defines MinIO secret Key"
"title": "Secret Key"
}
},
"additionalProperties": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
"password": {
"$id": "#/properties/password",
"type": "string",
"title": "User password"
"title": "New user password"
}
},
"additionalProperties": false
Expand Down
5 changes: 2 additions & 3 deletions manifests/type/database/postgresql/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ spec:
"superuser": {
"$id": "#/properties/superuser",
"type": "object",
"title": "Defines superuser details",
"title": "Superuser details",
"required": [
"username",
"password"
"username"
],
"properties": {
"username": {
Expand Down
8 changes: 1 addition & 7 deletions manifests/type/database/postgresql/install-input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,11 @@ spec:
"defaultDBName": "default_db"
}
],
"required": [
"superuser"
],
"properties": {
"superuser": {
"$id": "#/properties/superuser",
"type": "object",
"title": "Defines superuser details",
"required": [
"password"
],
"title": "Superuser details",
"properties": {
"username": {
"$id": "#/properties/superuser/properties/username",
Expand Down
4 changes: 2 additions & 2 deletions manifests/type/database/redis/install-input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ spec:
"name": {
"$id": "#/properties/name",
"type": "string",
"title": "Defines a cluster name for the Redis"
"title": "Redis instance name"
},
"password": {
"$id": "#/properties/password",
"type": "string",
"title": "Defines a password"
"title": "Password"
}
},
"additionalProperties": false
Expand Down
2 changes: 1 addition & 1 deletion manifests/type/gcp/cloudsql/update-input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
"superuser": {
"$id": "#/properties/superuser",
"type": "object",
"title": "Defines superuser details",
"title": "Superuser details",
"properties": {
"username": {
"$id": "#/properties/superuser/properties/username",
Expand Down
Loading