Skip to content

Commit

Permalink
Update Atmos manifests validation JSON schema. Improve help for Atmos…
Browse files Browse the repository at this point in the history 
… commands. Deep-merge the `settings.integrations.github` section from stack manifests with the `integrations.github` section from `atmos.yaml` (#755)

* updates

* updates

* updates

* updates

* updates

* updates

* updates

* updates
  • Loading branch information
@aknysh
aknysh authored Oct 31, 2024
1 parent 1f135ad commit 9cbe499
Show file tree
Hide file tree
Showing 20 changed files with 182 additions and 575 deletions.
7 changes: 7 additions & 0 deletions atmos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,13 @@ integrations:
steps:
- run: terraform apply $PLANFILE

# GitHub integration
github:
gitops:
opentofu-version: 1.8.4
terraform-version: 1.9.8
infracost-enabled: false

# Validation schemas (for validating atmos stacks and components)
schemas:
# https://json-schema.org
Expand Down
104 changes: 5 additions & 99 deletions examples/demo-context/schemas/atmos-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,107 +477,13 @@
"description": "Backend manifest",
"additionalProperties": false,
"properties": {
"local": {
"type": "object",
"additionalProperties": true
},
"s3": {
"type": "object",
"additionalProperties": false,
"properties": {
"encrypt": {
"type": "boolean"
},
"bucket": {
"type": "string"
},
"key": {
"type": "string"
},
"dynamodb_table": {
"type": "string"
},
"acl": {
"type": "string"
},
"region": {
"type": "string"
},
"assume_role": {
"type": "object",
"additionalProperties": false,
"properties": {
"role_arn": {
"type": [
"string",
"null"
]
},
"duration": {
"type": [
"string",
"null"
]
},
"external_id": {
"type": [
"string",
"null"
]
},
"policy": {
"type": [
"string",
"null"
]
},
"policy_arns": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
},
"session_name": {
"type": [
"string",
"null"
]
},
"source_identity": {
"type": [
"string",
"null"
]
},
"tags": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"transitive_tag_keys": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
}
}
},
"role_arn": {
"type": [
"string",
"null"
]
},
"profile": {
"type": [
"string",
"null"
]
},
"workspace_key_prefix": {
"type": "string"
}
}
"additionalProperties": true
},
"remote": {
"type": "object",
Expand Down
104 changes: 5 additions & 99 deletions examples/demo-helmfile/schemas/atmos-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,107 +477,13 @@
"description": "Backend manifest",
"additionalProperties": false,
"properties": {
"local": {
"type": "object",
"additionalProperties": true
},
"s3": {
"type": "object",
"additionalProperties": false,
"properties": {
"encrypt": {
"type": "boolean"
},
"bucket": {
"type": "string"
},
"key": {
"type": "string"
},
"dynamodb_table": {
"type": "string"
},
"acl": {
"type": "string"
},
"region": {
"type": "string"
},
"assume_role": {
"type": "object",
"additionalProperties": false,
"properties": {
"role_arn": {
"type": [
"string",
"null"
]
},
"duration": {
"type": [
"string",
"null"
]
},
"external_id": {
"type": [
"string",
"null"
]
},
"policy": {
"type": [
"string",
"null"
]
},
"policy_arns": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
},
"session_name": {
"type": [
"string",
"null"
]
},
"source_identity": {
"type": [
"string",
"null"
]
},
"tags": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"transitive_tag_keys": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
}
}
},
"role_arn": {
"type": [
"string",
"null"
]
},
"profile": {
"type": [
"string",
"null"
]
},
"workspace_key_prefix": {
"type": "string"
}
}
"additionalProperties": true
},
"remote": {
"type": "object",
Expand Down
104 changes: 5 additions & 99 deletions examples/demo-localstack/schemas/atmos-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,107 +477,13 @@
"description": "Backend manifest",
"additionalProperties": false,
"properties": {
"local": {
"type": "object",
"additionalProperties": true
},
"s3": {
"type": "object",
"additionalProperties": false,
"properties": {
"encrypt": {
"type": "boolean"
},
"bucket": {
"type": "string"
},
"key": {
"type": "string"
},
"dynamodb_table": {
"type": "string"
},
"acl": {
"type": "string"
},
"region": {
"type": "string"
},
"assume_role": {
"type": "object",
"additionalProperties": false,
"properties": {
"role_arn": {
"type": [
"string",
"null"
]
},
"duration": {
"type": [
"string",
"null"
]
},
"external_id": {
"type": [
"string",
"null"
]
},
"policy": {
"type": [
"string",
"null"
]
},
"policy_arns": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
},
"session_name": {
"type": [
"string",
"null"
]
},
"source_identity": {
"type": [
"string",
"null"
]
},
"tags": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"transitive_tag_keys": {
"type": "array",
"uniqueItems": true,
"items": {
"type": "string"
}
}
}
},
"role_arn": {
"type": [
"string",
"null"
]
},
"profile": {
"type": [
"string",
"null"
]
},
"workspace_key_prefix": {
"type": "string"
}
}
"additionalProperties": true
},
"remote": {
"type": "object",
Expand Down
4 changes: 2 additions & 2 deletions examples/quick-start-advanced/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Geodesic: https://github.com/cloudposse/geodesic/
ARG GEODESIC_VERSION=3.3.0
ARG GEODESIC_VERSION=3.4.0
ARG GEODESIC_OS=debian

# Atmos
# https://atmos.tools/
# https://github.com/cloudposse/atmos
# https://github.com/cloudposse/atmos/releases
ARG ATMOS_VERSION=1.97.0
ARG ATMOS_VERSION=1.99.0

# Terraform: https://github.com/hashicorp/terraform/releases
ARG TF_VERSION=1.9.8
Expand Down
Loading

0 comments on commit 9cbe499

Please sign in to comment.