Fix an issue with the component_info output from the `atmos describ…

…e component` command. Add `assume_role` property to Atmos JSON Schema S3 backend (#621) * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates
cloudposse · Jun 8, 2024 · f466925 · f466925
1 parent 4ea538d
commit f466925
Show file tree

Hide file tree

Showing 15 changed files with 362 additions and 238 deletions.
diff --git a/cmd/helmfile.go b/cmd/helmfile.go
@@ -13,7 +13,7 @@ var helmfileCmd = &cobra.Command{
 	Use:                "helmfile",
 	Aliases:            []string{"hf"},
 	Short:              "Execute 'helmfile' commands",
-	Long:               `This command runs helmfile commands`,
+	Long:               `This command runs Helmfile commands`,
 	FParseErrWhitelist: struct{ UnknownFlags bool }{UnknownFlags: true},
 	Run: func(cmd *cobra.Command, args []string) {
 		// Check Atmos configuration

diff --git a/cmd/terraform.go b/cmd/terraform.go
@@ -12,8 +12,8 @@ import (
 var terraformCmd = &cobra.Command{
 	Use:                "terraform",
 	Aliases:            []string{"tf"},
-	Short:              "Execute 'terraform' commands",
-	Long:               `This command executes 'terraform'' commands`,
+	Short:              "Execute Terraform commands",
+	Long:               `This command executes Terraform commands`,
 	FParseErrWhitelist: struct{ UnknownFlags bool }{UnknownFlags: true},
 	Run: func(cmd *cobra.Command, args []string) {
 		// Check Atmos configuration

diff --git a/examples/quick-start/Dockerfile b/examples/quick-start/Dockerfile
@@ -6,10 +6,10 @@ ARG GEODESIC_OS=debian
 # https://atmos.tools/
 # https://github.com/cloudposse/atmos
 # https://github.com/cloudposse/atmos/releases
-ARG ATMOS_VERSION=1.78.0
+ARG ATMOS_VERSION=1.79.0
 
 # Terraform: https://github.com/hashicorp/terraform/releases
-ARG TF_VERSION=1.8.4
+ARG TF_VERSION=1.8.5
 
 FROM cloudposse/geodesic:${GEODESIC_VERSION}-${GEODESIC_OS}
 

diff --git a/examples/quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json b/examples/quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
@@ -499,6 +499,69 @@
             "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",

diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/hashicorp/go-getter v1.7.4
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/hcl/v2 v2.20.1
-	github.com/hashicorp/terraform-config-inspect v0.0.0-20240509232506-4708120f8f30
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20240607080351-271db412dbcb
 	github.com/ivanpirog/coloredcobra v1.0.1
 	github.com/json-iterator/go v1.1.12
 	github.com/jwalton/go-supportscolor v1.2.0

diff --git a/go.sum b/go.sum
@@ -797,8 +797,8 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/terraform-config-inspect v0.0.0-20240509232506-4708120f8f30 h1:0qwr2oZy9mIIJMWh7W9NTHLWGMbEF5KEQ+QqM9hym34=
-github.com/hashicorp/terraform-config-inspect v0.0.0-20240509232506-4708120f8f30/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
+github.com/hashicorp/terraform-config-inspect v0.0.0-20240607080351-271db412dbcb h1:6gCfY5aQdQgRr0G5VDjnV5ENpd+hTamWaZfVz+lJ724=
+github.com/hashicorp/terraform-config-inspect v0.0.0-20240607080351-271db412dbcb/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI=
 github.com/hashicorp/vault/api v1.6.0 h1:B8UUYod1y1OoiGHq9GtpiqSnGOUEWHaA26AY8RQEDY4=
 github.com/hashicorp/vault/api v1.6.0/go.mod h1:h1K70EO2DgnBaTz5IsL6D5ERsNt5Pce93ueVS2+t0Xc=
 github.com/hashicorp/vault/sdk v0.5.0 h1:EED7p0OCU3OY5SAqJwSANofY1YKMytm+jDHDQ2EzGVQ=

diff --git a/internal/exec/utils.go b/internal/exec/utils.go
@@ -441,21 +441,6 @@ func ProcessStacks(
 		configAndStacksInfo.ComponentSection[cfg.ComponentSectionName] = configAndStacksInfo.ComponentFromArg
 	}
 
-	// Add component info, including Terraform config
-	componentInfo := map[string]any{}
-	componentInfo["component_type"] = configAndStacksInfo.ComponentType
-
-	if configAndStacksInfo.ComponentType == "terraform" {
-		componentPath := constructTerraformComponentWorkingDir(cliConfig, configAndStacksInfo)
-		componentInfo["component_path"] = componentPath
-		terraformConfiguration, _ := tfconfig.LoadModule(componentPath)
-		componentInfo["terraform_config"] = terraformConfiguration
-	} else if configAndStacksInfo.ComponentType == "helmfile" {
-		componentInfo["component_path"] = constructHelmfileComponentWorkingDir(cliConfig, configAndStacksInfo)
-	}
-
-	configAndStacksInfo.ComponentSection["component_info"] = componentInfo
-
 	// `sources` (stack config files where the variables and other settings are defined)
 	sources, err := ProcessConfigSources(configAndStacksInfo, rawStackConfigs)
 	if err != nil {
@@ -569,11 +554,6 @@ func ProcessStacks(
 		configAndStacksInfo.ComponentSection["atlantis_project"] = atlantisProjectName
 	}
 
-	// Process `command`
-	//if len(configAndStacksInfo.Command) == 0 {
-	//	configAndStacksInfo.Command = configAndStacksInfo.ComponentType
-	//}
-
 	// Process the ENV variables from the `env` section
 	configAndStacksInfo.ComponentEnvList = u.ConvertEnvVars(configAndStacksInfo.ComponentEnvSection)
 
@@ -616,6 +596,21 @@ func ProcessStacks(
 		configAndStacksInfo.FinalComponent = configAndStacksInfo.Component
 	}
 
+	// Add component info, including Terraform config
+	componentInfo := map[string]any{}
+	componentInfo["component_type"] = configAndStacksInfo.ComponentType
+
+	if configAndStacksInfo.ComponentType == "terraform" {
+		componentPath := constructTerraformComponentWorkingDir(cliConfig, configAndStacksInfo)
+		componentInfo["component_path"] = componentPath
+		terraformConfiguration, _ := tfconfig.LoadModule(componentPath)
+		componentInfo["terraform_config"] = terraformConfiguration
+	} else if configAndStacksInfo.ComponentType == "helmfile" {
+		componentInfo["component_path"] = constructHelmfileComponentWorkingDir(cliConfig, configAndStacksInfo)
+	}
+
+	configAndStacksInfo.ComponentSection["component_info"] = componentInfo
+
 	return configAndStacksInfo, nil
 }
 

diff --git a/website/docs/cli/_category_.json b/website/docs/cli/_category_.json
@@ -2,5 +2,5 @@
   "label": "CLI",
   "position": 4,
   "collapsible": true,
-  "collapsed": true,
+  "collapsed": true
 }
diff --git a/website/docs/integrations/atlantis.mdx b/website/docs/integrations/atlantis.mdx
@@ -687,7 +687,7 @@ on:
     branches: [ main ]
 
 env:
-  ATMOS_VERSION: 1.78.0
+  ATMOS_VERSION: 1.79.0
   ATMOS_CLI_CONFIG_PATH: ./
 
 jobs:

diff --git a/website/docs/integrations/github-actions/setup-atmos.mdx b/website/docs/integrations/github-actions/setup-atmos.mdx
@@ -30,6 +30,6 @@ jobs:
         uses: cloudposse/github-action-setup-atmos
         with:
           # Make sure to pin to the latest version of atmos
-          atmos_version: 1.78.0
+          atmos_version: 1.79.0
 ```
 </File>
diff --git a/website/docs/introduction/index.mdx b/website/docs/introduction/index.mdx
@@ -67,7 +67,7 @@ operational mastery and innovation faster, transforming their infrastructure man
 
 ## How does Atmos work?
 
-At a high-level, Atmos is responsible for managing the configuration that gets passed to [Components](/reference/glossary/component) when they are instantiated.
+At a high-level, Atmos is responsible for managing the configuration that gets passed to [Components](/terms/component) when they are instantiated.
 
 To make this less abstract, we're going to focus on Terraform and how configuration gets passed to it.
 The secret to scaling architectures with Terraform, is to decompose it into smaller root modules. We want to keep these root modules 

diff --git a/website/docs/reference/glossary/_category_.json b/website/docs/reference/glossary/_category_.json
@@ -1,5 +1,5 @@
 {
     "label": "Glossary",
     "collapsible": true,
-    "collapsed": true,
+    "collapsed": true
 }