simple timeouts

Author: lantoli

internal/convert/convert.go

@@ -86,11 +86,11 @@ func fillFreeTier(resourceb *hclwrite.Body) error {
 	if err := hcl.MoveAttr(resourceb, electableSpec.Body(), nInstanceSizeSrc, nInstanceSize, errFreeCluster); err != nil {
 		return err
 	}
-	configb.SetAttributeRaw(nElectableSpecs, hcl.TokensObject(electableSpec))
+	configb.SetAttributeRaw(nElectableSpecs, hcl.TokensObject(electableSpec.Body()))
 
 	repSpecs := hclwrite.NewEmptyFile()
-	repSpecs.Body().SetAttributeRaw(nConfig, hcl.TokensArraySingle(config))
-	resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensArraySingle(repSpecs))
+	repSpecs.Body().SetAttributeRaw(nConfig, hcl.TokensArraySingle(configb))
+	resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensArraySingle(repSpecs.Body()))
 	return nil
 }
 
@@ -115,21 +115,21 @@ func fillReplicationSpecs(resourceb *hclwrite.Body) error {
 	}
 	repSpecs := hclwrite.NewEmptyFile()
 	repSpecs.Body().SetAttributeRaw(nConfig, configs)
-	resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensArraySingle(repSpecs))
+	resourceb.SetAttributeRaw(nRepSpecs, hcl.TokensArraySingle(repSpecs.Body()))
 	tags, errTags := getTagsLabelsOpt(nTags, resourceb)
 	if errTags != nil {
 		return errTags
 	}
 	if tags != nil {
 		resourceb.SetAttributeRaw(nTags, tags)
 	}
-
+	fillTimeoutsOpt(resourceb)
 	resourceb.RemoveBlock(repSpecsSrc)
 	return nil
 }
 
 func getRegionConfigs(repSpecsSrc *hclwrite.Block, root attrVals) (hclwrite.Tokens, error) {
-	var configs []*hclwrite.File
+	var configs []*hclwrite.Body
 	for {
 		configSrc := repSpecsSrc.Body().FirstMatchingBlock(nConfigSrc, nil)
 		if configSrc == nil {
@@ -139,15 +139,15 @@ func getRegionConfigs(repSpecsSrc *hclwrite.Block, root attrVals) (hclwrite.Toke
 		if err != nil {
 			return nil, err
 		}
-		configs = append(configs, config)
+		configs = append(configs, config.Body())
 		repSpecsSrc.Body().RemoveBlock(configSrc)
 	}
 	if len(configs) == 0 {
 		return nil, fmt.Errorf("%s: %s not found", errRepSpecs, nConfigSrc)
 	}
 	sort.Slice(configs, func(i, j int) bool {
-		pi, _ := hcl.GetAttrInt(configs[i].Body().GetAttribute(nPriority), errPriority)
-		pj, _ := hcl.GetAttrInt(configs[j].Body().GetAttribute(nPriority), errPriority)
+		pi, _ := hcl.GetAttrInt(configs[i].GetAttribute(nPriority), errPriority)
+		pj, _ := hcl.GetAttrInt(configs[j].GetAttribute(nPriority), errPriority)
 		return pi > pj
 	})
 	return hcl.TokensArray(configs), nil
@@ -203,7 +203,7 @@ func getSpecs(countName string, configSrc *hclwrite.Block, root attrVals) (hclwr
 	if root.opt[nDiskIOPSSrc] != nil {
 		fileb.SetAttributeRaw(nDiskIOPS, root.opt[nDiskIOPSSrc])
 	}
-	return hcl.TokensObject(file), nil
+	return hcl.TokensObject(fileb), nil
 }
 
 func getAutoScalingOpt(opt map[string]hclwrite.Tokens) hclwrite.Tokens {
@@ -216,19 +216,20 @@ func getAutoScalingOpt(opt map[string]hclwrite.Tokens) hclwrite.Tokens {
 			{nComputeScaleDownEnabledSrc, nComputeScaleDownEnabled},
 		}
 		file  = hclwrite.NewEmptyFile()
+		fileb = file.Body()
 		found = false
 	)
 	for _, tuple := range names {
 		src, dst := tuple[0], tuple[1]
 		if tokens := opt[src]; tokens != nil {
-			file.Body().SetAttributeRaw(dst, tokens)
+			fileb.SetAttributeRaw(dst, tokens)
 			found = true
 		}
 	}
 	if !found {
 		return nil
 	}
-	return hcl.TokensObject(file)
+	return hcl.TokensObject(fileb)
 }
 
 func getTagsLabelsOpt(attrName string, resourceb *hclwrite.Body) (hclwrite.Tokens, error) {
@@ -258,7 +259,16 @@ func getTagsLabelsOpt(attrName string, resourceb *hclwrite.Body) (hclwrite.Token
 	if !found {
 		return nil, nil
 	}
-	return hcl.TokensObject(file), nil
+	return hcl.TokensObject(fileb), nil
+}
+
+func fillTimeoutsOpt(resourceb *hclwrite.Body) {
+	block := resourceb.FirstMatchingBlock(nTimeouts, nil)
+	if block == nil {
+		return
+	}
+	resourceb.RemoveBlock(block)
+	resourceb.SetAttributeRaw(nTimeouts, hcl.TokensObject(block.Body()))
 }
 
 func checkDynamicBlock(body *hclwrite.Body) error {

internal/convert/testdata/clu2adv/tags_labels_timeouts.in.tf

@@ -17,3 +17,22 @@ resource "mongodbatlas_cluster" "basictags" {
     value = "dev"
   }
 }
+
+resource "mongodbatlas_cluster" "basictimeouts" {
+  project_id                  = var.project_id
+  name                        = "basictimeouts"
+  cluster_type                = "REPLICASET"
+  provider_name               = "AWS"
+  provider_instance_size_name = "M10"
+  replication_specs {
+    num_shards = 1
+    regions_config {
+      region_name     = "US_EAST_1"
+      electable_nodes = 3
+      priority        = 7
+    }
+  }
+  timeouts {
+    create = "60m"
+  }
+}

internal/convert/testdata/clu2adv/tags_labels_timeouts.out.tf

@@ -20,3 +20,27 @@ resource "mongodbatlas_advanced_cluster" "basictags" {
   # Generated by atlas-cli-plugin-terraform.
   # Please confirm that all references to this resource are updated.
 }
+
+resource "mongodbatlas_advanced_cluster" "basictimeouts" {
+  project_id   = var.project_id
+  name         = "basictimeouts"
+  cluster_type = "REPLICASET"
+  replication_specs = [{
+    region_configs = [{
+      provider_name = "AWS"
+      region_name   = "US_EAST_1"
+      priority      = 7
+      electable_specs = {
+        node_count    = 3
+        instance_size = "M10"
+      }
+    }]
+  }]
+  timeouts = {
+
+    create = "60m"
+  }
+
+  # Generated by atlas-cli-plugin-terraform.
+  # Please confirm that all references to this resource are updated.
+}

internal/hcl/hcl.go

@@ -72,13 +72,13 @@ func GetAttrString(attr *hclwrite.Attribute, errPrefix string) (string, error) {
 }
 
 // TokensArray creates an array of objects.
-func TokensArray(file []*hclwrite.File) hclwrite.Tokens {
+func TokensArray(bodies []*hclwrite.Body) hclwrite.Tokens {
 	ret := hclwrite.Tokens{
 		{Type: hclsyntax.TokenOBrack, Bytes: []byte("[")},
 	}
-	for i := range file {
-		ret = append(ret, TokensObject(file[i])...)
-		if i < len(file)-1 {
+	for i := range bodies {
+		ret = append(ret, TokensObject(bodies[i])...)
+		if i < len(bodies)-1 {
 			ret = append(ret, &hclwrite.Token{Type: hclsyntax.TokenComma, Bytes: []byte(",")})
 		}
 	}
@@ -88,17 +88,17 @@ func TokensArray(file []*hclwrite.File) hclwrite.Tokens {
 }
 
 // TokensArraySingle creates an array of one object.
-func TokensArraySingle(file *hclwrite.File) hclwrite.Tokens {
-	return TokensArray([]*hclwrite.File{file})
+func TokensArraySingle(body *hclwrite.Body) hclwrite.Tokens {
+	return TokensArray([]*hclwrite.Body{body})
 }
 
 // TokensObject creates an object.
-func TokensObject(file *hclwrite.File) hclwrite.Tokens {
+func TokensObject(body *hclwrite.Body) hclwrite.Tokens {
 	ret := hclwrite.Tokens{
 		{Type: hclsyntax.TokenOBrace, Bytes: []byte("{")},
 		{Type: hclsyntax.TokenNewline, Bytes: []byte("\n")},
 	}
-	ret = append(ret, file.BuildTokens(nil)...)
+	ret = append(ret, body.BuildTokens(nil)...)
 	ret = append(ret,
 		&hclwrite.Token{Type: hclsyntax.TokenCBrace, Bytes: []byte("}")})
 	return ret