Merge pull request #72 from volcengine/bugfix/fix_mongodb_import

Bugfix/fix mongodb import
volcengine · Mar 21, 2023 · e0851b7 · e0851b7
2 parents 3489a5b + 91cfa5c
commit e0851b7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 35 deletions.
diff --git a/common/common_volcengine_version.go b/common/common_volcengine_version.go
@@ -2,5 +2,5 @@ package common
 
 const (
 	TerraformProviderName    = "terraform-provider-volcengine"
-	TerraformProviderVersion = "0.0.61"
+	TerraformProviderVersion = "0.0.62"
 )
diff --git a/example/mongoDBInstance/main.tf b/example/mongoDBInstance/main.tf
@@ -1,15 +1,21 @@
 resource "volcengine_mongodb_instance" "foo"{
-    zone_id="cn-xxx"
-    instance_type="ShardedCluster"
-    node_spec="mongo.xxx"
-    mongos_node_spec="mongo.mongos.xxx"
-    shard_number=3
-    storage_space_gb=100
-    subnet_id="subnet-2d6pxxu"
-    instance_name="tf-test"
+    zone_id="cn-beijing-a"
+    instance_type="ReplicaSet"
+    node_spec="mongo.2c4g"
+#    mongos_node_spec="mongo.2c4g"
+#    shard_number=3
+    storage_space_gb=20
+    subnet_id="subnet-rrx4ns6abw1sv0x57wq6h47"
+    instance_name="mongo-replica-be9995d32e4a"
     charge_type="PostPaid"
+    super_account_password = "******"
     # period_unit="Month"
     # period=1
     # auto_renew=false
     # ssl_action="Close"
+#    lifecycle {
+#        ignore_changes = [
+#            super_account_password,
+#        ]
+#    }
 }
diff --git a/example/mongodb/import/main.tf b/example/mongodb/import/main.tf
diff --git a/volcengine/mongodb/instance/service_volcengine_mongodb_instance.go b/volcengine/mongodb/instance/service_volcengine_mongodb_instance.go
@@ -180,11 +180,11 @@ func (s *VolcengineMongoDBInstanceService) ReadResource(resourceData *schema.Res
 			nodes := temp.([]interface{})
 			data["NodeNumber"] = len(nodes)
 			data["NodeSpec"] = nodes[0].(map[string]interface{})["NodeSpec"]
+			data["StorageSpaceGb"] = nodes[0].(map[string]interface{})["TotalStorageGB"]
 		} else {
 			data["NodeNumber"] = 0
 		}
-	}
-	if data["InstanceType"].(string) == "ShardedCluster" {
+	} else if data["InstanceType"].(string) == "ShardedCluster" {
 		if temp, ok := data["Mongos"]; ok && temp != nil {
 			mongos := temp.([]interface{})
 			data["MongosNodeNumber"] = len(mongos)

diff --git a/website/docs/r/mongodb_instance.html.markdown b/website/docs/r/mongodb_instance.html.markdown
@@ -11,19 +11,25 @@ Provides a resource to manage mongodb instance
 ## Example Usage
 ```hcl
 resource "volcengine_mongodb_instance" "foo" {
-  zone_id          = "cn-xxx"
-  instance_type    = "ShardedCluster"
-  node_spec        = "mongo.xxx"
-  mongos_node_spec = "mongo.mongos.xxx"
-  shard_number     = 3
-  storage_space_gb = 100
-  subnet_id        = "subnet-2d6pxxu"
-  instance_name    = "tf-test"
-  charge_type      = "PostPaid"
+  zone_id       = "cn-beijing-a"
+  instance_type = "ReplicaSet"
+  node_spec     = "mongo.2c4g"
+  #    mongos_node_spec="mongo.2c4g"
+  #    shard_number=3
+  storage_space_gb       = 20
+  subnet_id              = "subnet-rrx4ns6abw1sv0x57wq6h47"
+  instance_name          = "mongo-replica-be9995d32e4a"
+  charge_type            = "PostPaid"
+  super_account_password = "******"
   # period_unit="Month"
   # period=1
   # auto_renew=false
   # ssl_action="Close"
+  #    lifecycle {
+  #        ignore_changes = [
+  #            super_account_password,
+  #        ]
+  #    }
 }
 ```
 ## Argument Reference