Merge branch 'feat/cr_setuser_wait' into 'master'

feat: update cr for waiting set user ready

See merge request iaasng/terraform-provider-volcengine!364

Author: zpp12354321

common/common_volcengine_version.go

@@ -2,5 +2,5 @@ package common
 
 const (
 	TerraformProviderName    = "terraform-provider-volcengine"
-	TerraformProviderVersion = "0.0.107"
+	TerraformProviderVersion = "0.0.108"
 )

volcengine/cr/cr_registry/resource_volcengine_cr_registry.go

@@ -13,7 +13,7 @@ import (
 Import
 CR Instance can be imported using the name, e.g.
 ```
-$ terraform import volcengine_cr_instance.default enterprise-x
+$ terraform import volcengine_cr_registry.default enterprise-x
 ```
 
 */

volcengine/cr/cr_registry/service_volcengine_cr_registry.go

@@ -167,6 +167,7 @@ func (s *VolcengineCrRegistryService) RefreshResourceState(resourceData *schema.
 			var (
 				demo       map[string]interface{}
 				status     interface{}
+				userStatus interface{}
 				failStates []string
 			)
 			failStates = append(failStates, "Failed")
@@ -186,6 +187,18 @@ func (s *VolcengineCrRegistryService) RefreshResourceState(resourceData *schema.
 					return nil, "", fmt.Errorf("CrRegistry status error,status %s", status.(string))
 				}
 			}
+
+			//must wait user status
+			if len(target) > 0 && target[0] == "Active" {
+				userStatus, err = ve.ObtainSdkValue("UserStatus", demo)
+				if userStatus != "Active" {
+					status = "InActive"
+				} else {
+					if status == "Running" {
+						status = userStatus
+					}
+				}
+			}
 			return demo, status.(string), err
 		},
 	}
@@ -241,6 +254,10 @@ func (s *VolcengineCrRegistryService) CreateResource(resourceData *schema.Resour
 					logger.Debug(logger.ReqFormat, call.Action, call.SdkParam)
 					return s.Client.UniversalClient.DoCall(getUniversalInfo(call.Action), call.SdkParam)
 				},
+				Refresh: &ve.StateRefresh{
+					Target:  []string{"Active"},
+					Timeout: resourceData.Timeout(schema.TimeoutCreate),
+				},
 			},
 		}
 		callbacks = append(callbacks, callback)
@@ -266,6 +283,10 @@ func (s *VolcengineCrRegistryService) ModifyResource(resourceData *schema.Resour
 					logger.Debug(logger.ReqFormat, call.Action, call.SdkParam)
 					return s.Client.UniversalClient.DoCall(getUniversalInfo(call.Action), call.SdkParam)
 				},
+				Refresh: &ve.StateRefresh{
+					Target:  []string{"Active"},
+					Timeout: resourceData.Timeout(schema.TimeoutUpdate),
+				},
 			},
 		}
 		callbacks = append(callbacks, callback)

volcengine/vpc/security_group/resource_volcengine_security_group.go

@@ -61,9 +61,9 @@ func ResourceVolcengineSecurityGroup() *schema.Resource {
 				Description: "Name of SecurityGroup.",
 			},
 			"project_name": {
-				Type:     schema.TypeString,
-				Optional: true,
-				//ForceNew:    true,
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
 				Description: "The ProjectName of SecurityGroup.",
 			},
 			"tags": ve.TagsSchema(),

website/docs/r/cr_registry.html.markdown

@@ -41,6 +41,6 @@ In addition to all arguments above, the following attributes are exported:
 ## Import
 CR Instance can be imported using the name, e.g.
 ```
-$ terraform import volcengine_cr_instance.default enterprise-x
+$ terraform import volcengine_cr_registry.default enterprise-x
 ```