Skip to content

Commit 14d5c04

Browse files
committed
bug fix on tf statefile creation
1 parent aed0c0e commit 14d5c04

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

cli/pkg/config/tf_state.go

+9-14
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package config
1818

1919
import (
2020
"context"
21-
"fmt"
2221
"html/template"
2322
"os"
2423
"strings"
@@ -32,7 +31,7 @@ func CheckTfStateType(conf *Config, bucketNameClusters string, bucketNameSharedV
3231
if conf.TerraformState == "cloud" {
3332
if conf.VpcConfig.VpcType == "shared" {
3433
if bucketNameSharedVPC == "" {
35-
bucketNameSharedVPC := "tf-state-sharedvpc-" + strings.ToLower(randstr.String(6))
34+
bucketNameSharedVPC = "tf-state-sharedvpc-" + strings.ToLower(randstr.String(6))
3635
err := createTfStorage(conf.VpcConfig.VpcProjectID, bucketNameSharedVPC)
3736
if err != nil {
3837
return err
@@ -44,17 +43,18 @@ func CheckTfStateType(conf *Config, bucketNameClusters string, bucketNameSharedV
4443
}
4544
}
4645
if bucketNameClusters == "" {
47-
log.Infof("Clusters Bucket Name: %s", bucketNameClusters)
48-
bucketNameClusters := "tf-state-clusters-" + strings.ToLower(randstr.String(6))
46+
bucketNameClusters = "tf-state-clusters-" + strings.ToLower(randstr.String(6))
4947
err := createTfStorage(conf.ClustersProjectID, bucketNameClusters)
5048
if err != nil {
5149
return err
5250
}
51+
log.Infof("✅ Created a bucket for the Clusters TF State: %s", bucketNameClusters)
5352
}
5453
err := createTfBackend(bucketNameClusters, "cluster_build/backend.tf")
5554
if err != nil {
5655
return err
5756
}
57+
log.Infof("✅ Created Cluster TF State backend file in bucket: %s", bucketNameClusters)
5858
return nil
5959
}
6060
return nil
@@ -67,17 +67,12 @@ func createTfStorage(projectId string, bucketName string) error {
6767
if err != nil {
6868
return err
6969
}
70-
attrs, err := c.Bucket(bucketName).Attrs(ctx)
71-
if err == storage.ErrBucketNotExist {
72-
log.Infof("Creating storage bucket: %s ", bucketName)
73-
err = c.Bucket(bucketName).Create(ctx, projectId, nil)
74-
if err != nil {
75-
log.Fatalf("error creating storage bucket: %s", err)
76-
return err
77-
}
78-
} else {
79-
fmt.Printf("The bucket exists and has attributes: %#v\n", attrs)
70+
err = c.Bucket(bucketName).Create(ctx, projectId, nil)
71+
if err != nil {
72+
log.Fatalf("error creating storage bucket: %s", err)
73+
return err
8074
}
75+
log.Infof("✅ Created storage bucket: %s ", bucketName)
8176
return err
8277
}
8378

0 commit comments

Comments
 (0)