From 4013628052c60717c77a3b7b67483b1d1cbd1915 Mon Sep 17 00:00:00 2001 From: aknysh Date: Tue, 10 Dec 2024 15:06:25 -0500 Subject: [PATCH 1/4] updates --- website/docs/core-concepts/components/terraform/backends.mdx | 4 ++-- website/docs/core-concepts/stacks/overrides.mdx | 2 +- .../docs/quick-start/advanced/configure-terraform-backend.mdx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/docs/core-concepts/components/terraform/backends.mdx b/website/docs/core-concepts/components/terraform/backends.mdx index 3674446ae..b9d4e4340 100644 --- a/website/docs/core-concepts/components/terraform/backends.mdx +++ b/website/docs/core-concepts/components/terraform/backends.mdx @@ -102,8 +102,8 @@ Configuring Terraform S3 backend with Atmos consists of three steps: ```yaml components: terraform: - # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_AUTO_GENERATE_BACKEND_FILE' ENV var, or '--auto-generate-backend-file' command-line argument - auto_generate_backend_file: true + # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_AUTO_GENERATE_BACKEND_FILE' ENV var, or '--auto-generate-backend-file' command-line argument + auto_generate_backend_file: true ``` diff --git a/website/docs/core-concepts/stacks/overrides.mdx b/website/docs/core-concepts/stacks/overrides.mdx index 0886439ca..ece2450f3 100644 --- a/website/docs/core-concepts/stacks/overrides.mdx +++ b/website/docs/core-concepts/stacks/overrides.mdx @@ -362,5 +362,5 @@ terraform: ::: :::tip -Refer to [`atmosxw describe component`](/cli/commands/describe/component) CLI command for more details +Refer to [`atmos describe component`](/cli/commands/describe/component) CLI command for more details ::: diff --git a/website/docs/quick-start/advanced/configure-terraform-backend.mdx b/website/docs/quick-start/advanced/configure-terraform-backend.mdx index a5983a417..2847ad426 100644 --- a/website/docs/quick-start/advanced/configure-terraform-backend.mdx +++ b/website/docs/quick-start/advanced/configure-terraform-backend.mdx @@ -155,8 +155,8 @@ Configuring Terraform S3 backend with Atmos consists of the three steps: ```yaml components: terraform: - # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_AUTO_GENERATE_BACKEND_FILE' ENV var, or '--auto-generate-backend-file' command-line argument - auto_generate_backend_file: true + # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_AUTO_GENERATE_BACKEND_FILE' ENV var, or '--auto-generate-backend-file' command-line argument + auto_generate_backend_file: true ``` From 86913a081d4862211bb5b99e67329b12ff334ce9 Mon Sep 17 00:00:00 2001 From: aknysh Date: Tue, 10 Dec 2024 15:20:32 -0500 Subject: [PATCH 2/4] updates --- examples/demo-context/schemas/atmos-manifest.json | 3 +++ examples/demo-helmfile/schemas/atmos-manifest.json | 3 +++ examples/demo-localstack/schemas/atmos-manifest.json | 3 +++ .../schemas/atmos/atmos-manifest/1.0/atmos-manifest.json | 3 +++ .../schemas/atmos/atmos-manifest/1.0/atmos-manifest.json | 3 +++ 5 files changed, 15 insertions(+) diff --git a/examples/demo-context/schemas/atmos-manifest.json b/examples/demo-context/schemas/atmos-manifest.json index 0baea98b5..f36042276 100644 --- a/examples/demo-context/schemas/atmos-manifest.json +++ b/examples/demo-context/schemas/atmos-manifest.json @@ -320,6 +320,9 @@ "real" ] }, + "enabled": { + "type": "boolean" + }, "component": { "type": "string" }, diff --git a/examples/demo-helmfile/schemas/atmos-manifest.json b/examples/demo-helmfile/schemas/atmos-manifest.json index 0baea98b5..f36042276 100644 --- a/examples/demo-helmfile/schemas/atmos-manifest.json +++ b/examples/demo-helmfile/schemas/atmos-manifest.json @@ -320,6 +320,9 @@ "real" ] }, + "enabled": { + "type": "boolean" + }, "component": { "type": "string" }, diff --git a/examples/demo-localstack/schemas/atmos-manifest.json b/examples/demo-localstack/schemas/atmos-manifest.json index 0baea98b5..f36042276 100644 --- a/examples/demo-localstack/schemas/atmos-manifest.json +++ b/examples/demo-localstack/schemas/atmos-manifest.json @@ -320,6 +320,9 @@ "real" ] }, + "enabled": { + "type": "boolean" + }, "component": { "type": "string" }, diff --git a/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json b/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json index 0baea98b5..f36042276 100644 --- a/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json +++ b/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json @@ -320,6 +320,9 @@ "real" ] }, + "enabled": { + "type": "boolean" + }, "component": { "type": "string" }, diff --git a/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json b/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json index 0baea98b5..f36042276 100644 --- a/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json +++ b/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json @@ -320,6 +320,9 @@ "real" ] }, + "enabled": { + "type": "boolean" + }, "component": { "type": "string" }, From a88ef6f3238d47ee6ad85fbdcb5cd621e7e347dc Mon Sep 17 00:00:00 2001 From: aknysh Date: Tue, 10 Dec 2024 15:21:14 -0500 Subject: [PATCH 3/4] updates --- examples/quick-start-advanced/Dockerfile | 2 +- website/docs/integrations/atlantis.mdx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/quick-start-advanced/Dockerfile b/examples/quick-start-advanced/Dockerfile index f9d24a9f4..8ad376f7e 100644 --- a/examples/quick-start-advanced/Dockerfile +++ b/examples/quick-start-advanced/Dockerfile @@ -6,7 +6,7 @@ ARG GEODESIC_OS=debian # https://atmos.tools/ # https://github.com/cloudposse/atmos # https://github.com/cloudposse/atmos/releases -ARG ATMOS_VERSION=1.121.0 +ARG ATMOS_VERSION=1.122.0 # Terraform: https://github.com/hashicorp/terraform/releases ARG TF_VERSION=1.5.7 diff --git a/website/docs/integrations/atlantis.mdx b/website/docs/integrations/atlantis.mdx index 8d330d3e3..842404516 100644 --- a/website/docs/integrations/atlantis.mdx +++ b/website/docs/integrations/atlantis.mdx @@ -673,7 +673,7 @@ on: branches: [ main ] env: - ATMOS_VERSION: 1.121.0 + ATMOS_VERSION: 1.122.0 ATMOS_CLI_CONFIG_PATH: ./ jobs: From 1943669167f1b8a488af751346c52d9af5b07e00 Mon Sep 17 00:00:00 2001 From: aknysh Date: Tue, 10 Dec 2024 15:38:17 -0500 Subject: [PATCH 4/4] updates --- examples/demo-context/schemas/atmos-manifest.json | 13 +++++++++---- examples/demo-helmfile/schemas/atmos-manifest.json | 13 +++++++++---- .../demo-localstack/schemas/atmos-manifest.json | 13 +++++++++---- .../atmos/atmos-manifest/1.0/atmos-manifest.json | 13 +++++++++---- .../atmos/atmos-manifest/1.0/atmos-manifest.json | 13 +++++++++---- 5 files changed, 45 insertions(+), 20 deletions(-) diff --git a/examples/demo-context/schemas/atmos-manifest.json b/examples/demo-context/schemas/atmos-manifest.json index f36042276..96e5c0ec1 100644 --- a/examples/demo-context/schemas/atmos-manifest.json +++ b/examples/demo-context/schemas/atmos-manifest.json @@ -321,23 +321,28 @@ ] }, "enabled": { - "type": "boolean" + "type": "boolean", + "description": "Flag to enable or disable the component" }, "component": { - "type": "string" + "type": "string", + "description": "Terraform/OpenTofu/Helmfile component" }, "inherits": { "type": "array", + "description": "A list of Atmos components that the current component inherits from", "uniqueItems": true, "items": { "type": "string" } }, "terraform_workspace": { - "type": "string" + "type": "string", + "description": "Terraform workspace" }, "terraform_workspace_pattern": { - "type": "string" + "type": "string", + "description": "Terraform workspace pattern" }, "custom": { "type": "object", diff --git a/examples/demo-helmfile/schemas/atmos-manifest.json b/examples/demo-helmfile/schemas/atmos-manifest.json index f36042276..96e5c0ec1 100644 --- a/examples/demo-helmfile/schemas/atmos-manifest.json +++ b/examples/demo-helmfile/schemas/atmos-manifest.json @@ -321,23 +321,28 @@ ] }, "enabled": { - "type": "boolean" + "type": "boolean", + "description": "Flag to enable or disable the component" }, "component": { - "type": "string" + "type": "string", + "description": "Terraform/OpenTofu/Helmfile component" }, "inherits": { "type": "array", + "description": "A list of Atmos components that the current component inherits from", "uniqueItems": true, "items": { "type": "string" } }, "terraform_workspace": { - "type": "string" + "type": "string", + "description": "Terraform workspace" }, "terraform_workspace_pattern": { - "type": "string" + "type": "string", + "description": "Terraform workspace pattern" }, "custom": { "type": "object", diff --git a/examples/demo-localstack/schemas/atmos-manifest.json b/examples/demo-localstack/schemas/atmos-manifest.json index f36042276..96e5c0ec1 100644 --- a/examples/demo-localstack/schemas/atmos-manifest.json +++ b/examples/demo-localstack/schemas/atmos-manifest.json @@ -321,23 +321,28 @@ ] }, "enabled": { - "type": "boolean" + "type": "boolean", + "description": "Flag to enable or disable the component" }, "component": { - "type": "string" + "type": "string", + "description": "Terraform/OpenTofu/Helmfile component" }, "inherits": { "type": "array", + "description": "A list of Atmos components that the current component inherits from", "uniqueItems": true, "items": { "type": "string" } }, "terraform_workspace": { - "type": "string" + "type": "string", + "description": "Terraform workspace" }, "terraform_workspace_pattern": { - "type": "string" + "type": "string", + "description": "Terraform workspace pattern" }, "custom": { "type": "object", diff --git a/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json b/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json index f36042276..96e5c0ec1 100644 --- a/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json +++ b/examples/quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json @@ -321,23 +321,28 @@ ] }, "enabled": { - "type": "boolean" + "type": "boolean", + "description": "Flag to enable or disable the component" }, "component": { - "type": "string" + "type": "string", + "description": "Terraform/OpenTofu/Helmfile component" }, "inherits": { "type": "array", + "description": "A list of Atmos components that the current component inherits from", "uniqueItems": true, "items": { "type": "string" } }, "terraform_workspace": { - "type": "string" + "type": "string", + "description": "Terraform workspace" }, "terraform_workspace_pattern": { - "type": "string" + "type": "string", + "description": "Terraform workspace pattern" }, "custom": { "type": "object", diff --git a/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json b/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json index f36042276..96e5c0ec1 100644 --- a/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json +++ b/website/static/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json @@ -321,23 +321,28 @@ ] }, "enabled": { - "type": "boolean" + "type": "boolean", + "description": "Flag to enable or disable the component" }, "component": { - "type": "string" + "type": "string", + "description": "Terraform/OpenTofu/Helmfile component" }, "inherits": { "type": "array", + "description": "A list of Atmos components that the current component inherits from", "uniqueItems": true, "items": { "type": "string" } }, "terraform_workspace": { - "type": "string" + "type": "string", + "description": "Terraform workspace" }, "terraform_workspace_pattern": { - "type": "string" + "type": "string", + "description": "Terraform workspace pattern" }, "custom": { "type": "object",