Update Golang to 1.18. Update atmos to 1.4.22. Add ENV vars to …

…data sources (#174) * Update to Go 1.18 * Update to Go 1.18 * Update to Go 1.18 * Add `base_path` * Add ENV vars to each data source
cloudposse · Jun 30, 2022 · 336b1a6 · 336b1a6
1 parent d517ee2
commit 336b1a6
Show file tree

Hide file tree

Showing 27 changed files with 419 additions and 883 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - name: Import GPG key
         id: import_gpg

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/[email protected]
         with:
-          go-version: "1.16"
+          go-version: "1.18"
         id: go
 
       - name: Check out code into the Go module directory
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Go
         uses: actions/[email protected]
         with:
-          go-version: "1.16"
+          go-version: "1.18"
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.16.3
+1.18
diff --git a/examples/complete/stacks/catalog/terraform/test-component-override-3.yaml b/examples/complete/stacks/catalog/terraform/test-component-override-3.yaml
@@ -46,5 +46,5 @@ components:
           - "mixin/test-1"
           - "mixin/test-2"
         # Override Terraform workspace
-        # Note that by default, Terraform workspace is generated from the context, e.g. `<environment>-<stage>`
+        # Note that by default, Terraform workspace is generated from the context, e.g. `<tenant>-<environment>-<stage>`
         terraform_workspace: test-component-override-3-workspace
diff --git a/examples/data-sources/utils_aws_eks_update_kubeconfig/versions.tf b/examples/data-sources/utils_aws_eks_update_kubeconfig/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/examples/data-sources/utils_component_config/data-source.tf b/examples/data-sources/utils_component_config/data-source.tf
@@ -5,6 +5,12 @@ locals {
   environment = "ue2"
   stage       = "dev"
 
+  env = {
+    ENVIRONMENT           = local.environment
+    STAGE                 = local.stage
+    ATMOS_CLI_CONFIG_PATH = "."
+  }
+
   result1 = yamldecode(data.utils_component_config.example1.output)
   result2 = yamldecode(data.utils_component_config.example2.output)
 }
@@ -13,6 +19,7 @@ data "utils_component_config" "example1" {
   component     = local.component
   stack         = local.stack
   ignore_errors = false
+  env           = local.env
 }
 
 data "utils_component_config" "example2" {
@@ -21,4 +28,5 @@ data "utils_component_config" "example2" {
   environment   = local.environment
   stage         = local.stage
   ignore_errors = false
+  env           = local.env
 }
diff --git a/examples/data-sources/utils_component_config/versions.tf b/examples/data-sources/utils_component_config/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/examples/data-sources/utils_deep_merge_json/versions.tf b/examples/data-sources/utils_deep_merge_json/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/examples/data-sources/utils_deep_merge_yaml/versions.tf b/examples/data-sources/utils_deep_merge_yaml/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/examples/data-sources/utils_spacelift_stack_config/utils_spacelift_stack_config_test.go b/examples/data-sources/utils_spacelift_stack_config/utils_spacelift_stack_config_test.go
@@ -23,34 +23,34 @@ func TestSpaceliftStackProcessorWithTerraform(t *testing.T) {
 	terraform.InitAndApply(t, terraformOptions)
 
 	// Run `terraform output` to get the value of an output variable
-	var output interface{}
+	var output any
 	terraform.OutputStruct(t, terraformOptions, "output", &output)
-	spaceliftStacks := output.(map[string]interface{})
+	spaceliftStacks := output.(map[string]any)
 
 	assert.Equal(t, 35, len(spaceliftStacks))
 
-	tenant1Ue2DevInfraVpcStack := spaceliftStacks["tenant1-ue2-dev-infra-vpc"].(map[string]interface{})
+	tenant1Ue2DevInfraVpcStack := spaceliftStacks["tenant1-ue2-dev-infra-vpc"].(map[string]any)
 	tenant1Ue2DevInfraVpcStackInfrastructureStackName := tenant1Ue2DevInfraVpcStack["stack"].(string)
-	tenant1Ue2DevInfraVpcStackBackend := tenant1Ue2DevInfraVpcStack["backend"].(map[string]interface{})
+	tenant1Ue2DevInfraVpcStackBackend := tenant1Ue2DevInfraVpcStack["backend"].(map[string]any)
 	tenant1Ue2DevInfraVpcStackBackendWorkspaceKeyPrefix := tenant1Ue2DevInfraVpcStackBackend["workspace_key_prefix"].(string)
 	assert.Equal(t, "tenant1-ue2-dev", tenant1Ue2DevInfraVpcStackInfrastructureStackName)
 	assert.Equal(t, "infra-vpc", tenant1Ue2DevInfraVpcStackBackendWorkspaceKeyPrefix)
 
 	// Test having a dash `-` in tenant/environment/stage names
-	tenant1Ue2Test1InfraVpcStack := spaceliftStacks["tenant1-ue2-test-1-infra-vpc"].(map[string]interface{})
+	tenant1Ue2Test1InfraVpcStack := spaceliftStacks["tenant1-ue2-test-1-infra-vpc"].(map[string]any)
 	tenant1Ue2Test1InfraVpcStackInfrastructureStackName := tenant1Ue2Test1InfraVpcStack["stack"].(string)
-	tenant1Ue2Test1InfraVpcStackBackend := tenant1Ue2Test1InfraVpcStack["backend"].(map[string]interface{})
+	tenant1Ue2Test1InfraVpcStackBackend := tenant1Ue2Test1InfraVpcStack["backend"].(map[string]any)
 	tenant1Ue2Test1InfraVpcStackBackendWorkspaceKeyPrefix := tenant1Ue2Test1InfraVpcStackBackend["workspace_key_prefix"].(string)
 	assert.Equal(t, "tenant1-ue2-test-1", tenant1Ue2Test1InfraVpcStackInfrastructureStackName)
 	assert.Equal(t, "infra-vpc", tenant1Ue2Test1InfraVpcStackBackendWorkspaceKeyPrefix)
 
-	tenant1Ue2DevTestTestComponentOverrideComponent := spaceliftStacks["tenant1-ue2-dev-test-test-component-override"].(map[string]interface{})
+	tenant1Ue2DevTestTestComponentOverrideComponent := spaceliftStacks["tenant1-ue2-dev-test-test-component-override"].(map[string]any)
 	tenant1Ue2DevTestTestComponentOverrideComponentInfrastructureStackName := tenant1Ue2DevTestTestComponentOverrideComponent["stack"].(string)
-	tenant1Ue2DevTestTestComponentOverrideComponentBackend := tenant1Ue2DevTestTestComponentOverrideComponent["backend"].(map[string]interface{})
+	tenant1Ue2DevTestTestComponentOverrideComponentBackend := tenant1Ue2DevTestTestComponentOverrideComponent["backend"].(map[string]any)
 	tenant1Ue2DevTestTestComponentOverrideComponentBaseComponent := tenant1Ue2DevTestTestComponentOverrideComponent["base_component"].(string)
 	tenant1Ue2DevTestTestComponentOverrideComponentBackendWorkspaceKeyPrefix := tenant1Ue2DevTestTestComponentOverrideComponentBackend["workspace_key_prefix"].(string)
-	tenant1Ue2DevTestTestComponentOverrideComponentDeps := tenant1Ue2DevTestTestComponentOverrideComponent["deps"].([]interface{})
-	tenant1Ue2DevTestTestComponentOverrideComponentLabels := tenant1Ue2DevTestTestComponentOverrideComponent["labels"].([]interface{})
+	tenant1Ue2DevTestTestComponentOverrideComponentDeps := tenant1Ue2DevTestTestComponentOverrideComponent["deps"].([]any)
+	tenant1Ue2DevTestTestComponentOverrideComponentLabels := tenant1Ue2DevTestTestComponentOverrideComponent["labels"].([]any)
 	tenant1Ue2DevTestTestComponentOverrideTerraformWorkspace := tenant1Ue2DevTestTestComponentOverrideComponent["workspace"]
 	assert.Equal(t, "tenant1-ue2-dev", tenant1Ue2DevTestTestComponentOverrideComponentInfrastructureStackName)
 	assert.Equal(t, "test-test-component", tenant1Ue2DevTestTestComponentOverrideComponentBackendWorkspaceKeyPrefix)
@@ -86,12 +86,12 @@ func TestSpaceliftStackProcessorWithTerraform(t *testing.T) {
 	assert.Equal(t, "folder:component/test/test-component-override", tenant1Ue2DevTestTestComponentOverrideComponentLabels[37])
 	assert.Equal(t, "folder:tenant1/ue2/dev", tenant1Ue2DevTestTestComponentOverrideComponentLabels[38])
 
-	newTenant1Ue2DevTestTestComponentOverrideComponent2 := spaceliftStacks["tenant1-ue2-dev-new-component"].(map[string]interface{})
+	newTenant1Ue2DevTestTestComponentOverrideComponent2 := spaceliftStacks["tenant1-ue2-dev-new-component"].(map[string]any)
 	newTenant1Ue2DevTestTestComponentOverrideComponent2InfrastructureStackName := newTenant1Ue2DevTestTestComponentOverrideComponent2["stack"].(string)
 	assert.Equal(t, "tenant1-ue2-dev", newTenant1Ue2DevTestTestComponentOverrideComponent2InfrastructureStackName)
 
 	// Test having a dash `-` in tenant/environment/stage names
-	newTenant1Ue2Test1TestTestComponentOverrideComponent2 := spaceliftStacks["tenant1-ue2-test-1-new-component"].(map[string]interface{})
+	newTenant1Ue2Test1TestTestComponentOverrideComponent2 := spaceliftStacks["tenant1-ue2-test-1-new-component"].(map[string]any)
 	newTenant1Ue2Test1TestTestComponentOverrideComponent2InfrastructureStackName := newTenant1Ue2Test1TestTestComponentOverrideComponent2["stack"].(string)
 	assert.Equal(t, "tenant1-ue2-test-1", newTenant1Ue2Test1TestTestComponentOverrideComponent2InfrastructureStackName)
 

diff --git a/examples/data-sources/utils_spacelift_stack_config_legacy/versions.tf b/examples/data-sources/utils_spacelift_stack_config_legacy/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/examples/data-sources/utils_stack_config_yaml/versions.tf b/examples/data-sources/utils_stack_config_yaml/versions.tf
@@ -5,7 +5,7 @@ terraform {
       # For local development,
       # install the provider on local computer by running `make install` from the root of the repo,
       # and uncomment the version below
-      # version = "9999.99.99"
+      version = "9999.99.99"
     }
   }
 }
diff --git a/go.mod b/go.mod
@@ -1,13 +1,116 @@
 module github.com/cloudposse/terraform-provider-utils
 
-go 1.16
+go 1.18
 
 require (
-	github.com/cloudposse/atmos v1.4.20
-	github.com/gruntwork-io/terratest v0.40.13
-	github.com/hashicorp/terraform-plugin-docs v0.9.0
+	github.com/cloudposse/atmos v1.4.22
+	github.com/gruntwork-io/terratest v0.40.17
+	github.com/hashicorp/go-hclog v1.2.0
+	github.com/hashicorp/terraform-plugin-docs v0.11.0
+	github.com/hashicorp/terraform-plugin-log v0.4.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0
 	github.com/json-iterator/go v1.1.12
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	gopkg.in/yaml.v2 v2.4.0
 )
+
+require (
+	cloud.google.com/go v0.100.2 // indirect
+	cloud.google.com/go/compute v1.6.1 // indirect
+	cloud.google.com/go/iam v0.3.0 // indirect
+	cloud.google.com/go/storage v1.14.0 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
+	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.40.56 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.4.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-getter v1.6.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.4 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hc-install v0.4.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.12.0 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-exec v0.17.1 // indirect
+	github.com/hashicorp/terraform-json v0.14.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.9.1 // indirect
+	github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
+	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
+	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/klauspost/compress v1.13.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
+	github.com/mitchellh/cli v1.1.4 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/otiai10/copy v1.7.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/posener/complete v1.2.3 // indirect
+	github.com/russross/blackfriday v1.6.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/cobra v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.12.0 // indirect
+	github.com/subosito/gotenv v1.3.0 // indirect
+	github.com/tmccombs/hcl2json v0.3.3 // indirect
+	github.com/ulikunitz/xz v0.5.8 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
+	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
+	github.com/vmihailenco/tagparser v0.1.1 // indirect
+	github.com/zclconf/go-cty v1.10.0 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+	google.golang.org/api v0.81.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
+	google.golang.org/grpc v1.46.2 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)