Add atmos_cli_config_path and atmos_base_path variables to `remot…

…e-state` module (#53)

* Add `atmos_cli_config_path` and `atmos_base_path` variables

* Auto Format

Co-authored-by: cloudpossebot <[email protected]>

.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/[email protected]
       if: github.event.pull_request.head.repo.full_name == github.repository
       name: "Full check of CODEOWNERS"

README.md

@@ -346,13 +346,13 @@ Available targets:
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_external"></a> [external](#requirement\_external) | >= 2.0 |
 | <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.3 |
-| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 1.2.0 |
+| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 1.3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_utils"></a> [utils](#provider\_utils) | >= 1.2.0 |
+| <a name="provider_utils"></a> [utils](#provider\_utils) | >= 1.3.0 |
 
 ## Modules
 

docs/terraform.md

@@ -6,13 +6,13 @@
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
 | <a name="requirement_external"></a> [external](#requirement\_external) | >= 2.0 |
 | <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.3 |
-| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 1.2.0 |
+| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 1.3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_utils"></a> [utils](#provider\_utils) | >= 1.2.0 |
+| <a name="provider_utils"></a> [utils](#provider\_utils) | >= 1.3.0 |
 
 ## Modules
 

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
 }

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
+}

examples/backend/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

examples/complete/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

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
 }

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
+}

examples/remote-state/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

examples/spacelift/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

examples/stack/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

examples/stacks/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

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 {

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
+}

modules/backend/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

modules/env/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

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 {

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
+}

modules/remote-state/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

modules/settings/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

modules/spacelift/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

modules/vars/versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }

versions.tf

@@ -12,7 +12,7 @@ terraform {
     }
     utils = {
       source  = "cloudposse/utils"
-      version = ">= 1.2.0"
+      version = ">= 1.3.0"
     }
   }
 }