diff --git a/.github/workflows/validate-codeowners.yml b/.github/workflows/validate-codeowners.yml index 70f829e..4b4a226 100644 --- a/.github/workflows/validate-codeowners.yml +++ b/.github/workflows/validate-codeowners.yml @@ -10,6 +10,7 @@ jobs: steps: - name: "Checkout source code at current commit" uses: actions/checkout@v2 + # Leave pinned at 0.7.1 until https://github.com/mszostok/codeowners-validator/issues/173 is resolved - uses: mszostok/codeowners-validator@v0.7.1 if: github.event.pull_request.head.repo.full_name == github.repository name: "Full check of CODEOWNERS" diff --git a/README.md b/README.md index 84a533f..ddfc85d 100644 --- a/README.md +++ b/README.md @@ -346,13 +346,13 @@ Available targets: | [terraform](#requirement\_terraform) | >= 0.13.0 | | [external](#requirement\_external) | >= 2.0 | | [local](#requirement\_local) | >= 1.3 | -| [utils](#requirement\_utils) | >= 1.2.0 | +| [utils](#requirement\_utils) | >= 1.3.0 | ## Providers | Name | Version | |------|---------| -| [utils](#provider\_utils) | >= 1.2.0 | +| [utils](#provider\_utils) | >= 1.3.0 | ## Modules diff --git a/docs/terraform.md b/docs/terraform.md index 9e06695..240a1ff 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -6,13 +6,13 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [external](#requirement\_external) | >= 2.0 | | [local](#requirement\_local) | >= 1.3 | -| [utils](#requirement\_utils) | >= 1.2.0 | +| [utils](#requirement\_utils) | >= 1.3.0 | ## Providers | Name | Version | |------|---------| -| [utils](#provider\_utils) | >= 1.2.0 | +| [utils](#provider\_utils) | >= 1.3.0 | ## Modules diff --git a/examples/backend/main.tf b/examples/backend/main.tf index e23286b..5fb24e9 100644 --- a/examples/backend/main.tf +++ b/examples/backend/main.tf @@ -1,10 +1,12 @@ module "backend" { source = "../../modules/backend" - stack = var.stack - component = var.component - ignore_errors = var.ignore_errors - env = var.env + stack = var.stack + component = var.component + ignore_errors = var.ignore_errors + env = var.env + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path context = module.this.context } diff --git a/examples/backend/variables.tf b/examples/backend/variables.tf index 102c281..2376a9a 100644 --- a/examples/backend/variables.tf +++ b/examples/backend/variables.tf @@ -20,3 +20,15 @@ variable "env" { description = "Map of ENV vars in the format `key=value`. These ENV vars will be set in the `utils` provider before executing the data source" default = null } + +variable "atmos_cli_config_path" { + type = string + description = "atmos CLI config path" + default = null +} + +variable "atmos_base_path" { + type = string + description = "atmos base path to components and stacks" + default = null +} diff --git a/examples/backend/versions.tf b/examples/backend/versions.tf index d1493be..d35f7f5 100644 --- a/examples/backend/versions.tf +++ b/examples/backend/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index d1493be..d35f7f5 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/examples/remote-state/main.tf b/examples/remote-state/main.tf index 0de6809..081c4e1 100644 --- a/examples/remote-state/main.tf +++ b/examples/remote-state/main.tf @@ -14,6 +14,9 @@ module "remote_state_using_stack" { ATMOS_CLI_CONFIG_PATH = path.module } + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path + context = module.this.context } @@ -30,6 +33,9 @@ module "remote_state_using_context" { ATMOS_CLI_CONFIG_PATH = path.module } + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path + context = module.this.context } @@ -54,5 +60,8 @@ module "remote_state_using_context_ignore_errors" { ATMOS_CLI_CONFIG_PATH = path.module } + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path + context = module.this.context } diff --git a/examples/remote-state/variables.tf b/examples/remote-state/variables.tf index e69de29..d088e39 100644 --- a/examples/remote-state/variables.tf +++ b/examples/remote-state/variables.tf @@ -0,0 +1,11 @@ +variable "atmos_cli_config_path" { + type = string + description = "atmos CLI config path" + default = null +} + +variable "atmos_base_path" { + type = string + description = "atmos base path to components and stacks" + default = null +} diff --git a/examples/remote-state/versions.tf b/examples/remote-state/versions.tf index d1493be..d35f7f5 100644 --- a/examples/remote-state/versions.tf +++ b/examples/remote-state/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/examples/spacelift/versions.tf b/examples/spacelift/versions.tf index d1493be..d35f7f5 100644 --- a/examples/spacelift/versions.tf +++ b/examples/spacelift/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/examples/stack/versions.tf b/examples/stack/versions.tf index d1493be..d35f7f5 100644 --- a/examples/stack/versions.tf +++ b/examples/stack/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/examples/stacks/versions.tf b/examples/stacks/versions.tf index d1493be..d35f7f5 100644 --- a/examples/stacks/versions.tf +++ b/examples/stacks/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/backend/main.tf b/modules/backend/main.tf index ac9b40a..e817273 100644 --- a/modules/backend/main.tf +++ b/modules/backend/main.tf @@ -1,12 +1,14 @@ data "utils_component_config" "config" { - component = var.component - stack = var.stack - namespace = module.always.namespace - tenant = module.always.tenant - environment = module.always.environment - stage = module.always.stage - ignore_errors = var.ignore_errors - env = var.env + component = var.component + stack = var.stack + namespace = module.always.namespace + tenant = module.always.tenant + environment = module.always.environment + stage = module.always.stage + ignore_errors = var.ignore_errors + env = var.env + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path } locals { diff --git a/modules/backend/variables.tf b/modules/backend/variables.tf index 102c281..2376a9a 100644 --- a/modules/backend/variables.tf +++ b/modules/backend/variables.tf @@ -20,3 +20,15 @@ variable "env" { description = "Map of ENV vars in the format `key=value`. These ENV vars will be set in the `utils` provider before executing the data source" default = null } + +variable "atmos_cli_config_path" { + type = string + description = "atmos CLI config path" + default = null +} + +variable "atmos_base_path" { + type = string + description = "atmos base path to components and stacks" + default = null +} diff --git a/modules/backend/versions.tf b/modules/backend/versions.tf index d1493be..d35f7f5 100644 --- a/modules/backend/versions.tf +++ b/modules/backend/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/env/versions.tf b/modules/env/versions.tf index d1493be..d35f7f5 100644 --- a/modules/env/versions.tf +++ b/modules/env/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/remote-state/main.tf b/modules/remote-state/main.tf index 5644d55..1b3e173 100644 --- a/modules/remote-state/main.tf +++ b/modules/remote-state/main.tf @@ -1,12 +1,14 @@ data "utils_component_config" "config" { - component = var.component - stack = var.stack - namespace = module.always.namespace - tenant = module.always.tenant - environment = module.always.environment - stage = module.always.stage - ignore_errors = var.ignore_errors - env = var.env + component = var.component + stack = var.stack + namespace = module.always.namespace + tenant = module.always.tenant + environment = module.always.environment + stage = module.always.stage + ignore_errors = var.ignore_errors + env = var.env + atmos_cli_config_path = var.atmos_cli_config_path + atmos_base_path = var.atmos_base_path } locals { diff --git a/modules/remote-state/variables.tf b/modules/remote-state/variables.tf index 611568c..90ad986 100644 --- a/modules/remote-state/variables.tf +++ b/modules/remote-state/variables.tf @@ -44,3 +44,15 @@ variable "env" { description = "Map of ENV vars in the format `key=value`. These ENV vars will be set in the `utils` provider before executing the data source" default = null } + +variable "atmos_cli_config_path" { + type = string + description = "atmos CLI config path" + default = null +} + +variable "atmos_base_path" { + type = string + description = "atmos base path to components and stacks" + default = null +} diff --git a/modules/remote-state/versions.tf b/modules/remote-state/versions.tf index d1493be..d35f7f5 100644 --- a/modules/remote-state/versions.tf +++ b/modules/remote-state/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/settings/versions.tf b/modules/settings/versions.tf index d1493be..d35f7f5 100644 --- a/modules/settings/versions.tf +++ b/modules/settings/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/spacelift/versions.tf b/modules/spacelift/versions.tf index d1493be..d35f7f5 100644 --- a/modules/spacelift/versions.tf +++ b/modules/spacelift/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/modules/vars/versions.tf b/modules/vars/versions.tf index d1493be..d35f7f5 100644 --- a/modules/vars/versions.tf +++ b/modules/vars/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } } diff --git a/versions.tf b/versions.tf index d1493be..d35f7f5 100644 --- a/versions.tf +++ b/versions.tf @@ -12,7 +12,7 @@ terraform { } utils = { source = "cloudposse/utils" - version = ">= 1.2.0" + version = ">= 1.3.0" } } }