Merge pull request #505 from hazelops/IZE-509-ability-to-provide/set-…

…backend.tf-with-file-name-value IZE-509 added `terraform_config_file` parameter
hazelops · Oct 20, 2022 · 0f37e31 · 0f37e31
2 parents 42cf8c9 + 7d984af
commit 0f37e31
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/internal/commands/tfenv.go b/internal/commands/tfenv.go
@@ -2,6 +2,10 @@ package commands
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -12,9 +16,6 @@ import (
 	"github.com/pterm/pterm"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"io/ioutil"
-	"os"
-	"path/filepath"
 )
 
 type TfenvOptions struct {
@@ -139,12 +140,17 @@ func GenerateTerraformFiles(name string, terraformStateBucketName string, projec
 		stackPath = project.EnvDir
 	}
 
+	if len(tf.TerraformConfigFile) == 0 {
+		tf.TerraformConfigFile = "backend.tf"
+	}
+
 	logrus.Debugf("backend opts: %s", backendOpts)
 	logrus.Debugf("state dir path: %s", stackPath)
+	logrus.Debugf("config file name: %s", tf.TerraformConfigFile)
 
 	err := template.GenerateBackendTf(
 		backendOpts,
-		stackPath,
+		filepath.Join(stackPath, tf.TerraformConfigFile),
 	)
 	if err != nil {
 		pterm.Error.Printfln("Generate terraform file for \"%s\" not completed", name)

diff --git a/internal/config/infra.go b/internal/config/infra.go
@@ -6,14 +6,15 @@ type Infra struct {
 }
 
 type Terraform struct {
-	Version           string   `mapstructure:",omitempty"`
-	StateBucketRegion string   `mapstructure:"state_bucket_region,omitempty"`
-	StateBucketName   string   `mapstructure:"state_bucket_name,omitempty"`
-	StateName         string   `mapstructure:"state_name,omitempty"`
-	RootDomainName    string   `mapstructure:"root_domain_name,omitempty"`
-	AwsRegion         string   `mapstructure:"aws_region,omitempty"`
-	AwsProfile        string   `mapstructure:"aws_profile,omitempty"`
-	DependsOn         []string `mapstructure:"depends_on,omitempty"`
+	Version             string   `mapstructure:",omitempty"`
+	StateBucketRegion   string   `mapstructure:"state_bucket_region,omitempty"`
+	StateBucketName     string   `mapstructure:"state_bucket_name,omitempty"`
+	StateName           string   `mapstructure:"state_name,omitempty"`
+	RootDomainName      string   `mapstructure:"root_domain_name,omitempty"`
+	TerraformConfigFile string   `mapstructure:"terraform_config_file,omitempty"`
+	AwsRegion           string   `mapstructure:"aws_region,omitempty"`
+	AwsProfile          string   `mapstructure:"aws_profile,omitempty"`
+	DependsOn           []string `mapstructure:"depends_on,omitempty"`
 }
 
 type Tunnel struct {

diff --git a/internal/schema/ize-spec.json b/internal/schema/ize-spec.json
@@ -463,6 +463,11 @@
                     "type": "string",
                     "description": "(optional) Root domain name can be set here. This is the main domain that will be passed to the terraform. Generally if your app lives at 'api.dev.nutcorp.net' the root domain is `nutcorp.net`"
                 },
+                "terraform_config_file"   : {
+                    "type": "string",
+                    "description": "(optional) Terraform config file name.",
+                    "default": "backend.tf"
+                },
                 "aws_region"   : {
                     "type": "string",
                     "description": "(optional) Terraform-specific AWS Region of this environment should be specified here. Normally global AWS_REGION is used."

diff --git a/internal/template/template.go b/internal/template/template.go
@@ -17,9 +17,8 @@ import (
 )
 
 const (
-	backend = "backend.tf"
-	vars    = "terraform.tfvars"
-	ize     = "ize.hcl"
+	vars = "terraform.tfvars"
+	ize  = "ize.hcl"
 )
 
 func GenerateVarsTf(opts VarsOpts, path string) error {
@@ -210,11 +209,9 @@ func GenerateBackendTf(opts BackendOpts, path string) error {
 		backendBlock.Body().SetAttributeValue("dynamodb_table", cty.StringVal(opts.TERRAFORM_STATE_DYNAMODB_TABLE))
 	}
 
-	backendPath := filepath.Join(path, backend)
-
-	_, err := os.Stat(backendPath)
+	_, err := os.Stat(path)
 	if errors.Is(err, os.ErrNotExist) {
-		file, err := os.Create(backendPath)
+		file, err := os.Create(path)
 		if err != nil {
 			return err
 		}
@@ -230,15 +227,15 @@ func GenerateBackendTf(opts BackendOpts, path string) error {
 	}
 
 	newHash := md5.Sum(f.Bytes())
-	oldFile, err := os.ReadFile(backendPath)
+	oldFile, err := os.ReadFile(path)
 	if err != nil {
 		return err
 	}
 
 	oldHash := md5.Sum(oldFile)
 
 	if !reflect.DeepEqual(newHash, oldHash) {
-		file, err := os.Create(backendPath)
+		file, err := os.Create(path)
 		if err != nil {
 			return err
 		}