[Object Storage] fix: fix linting, remove duplicate code

fpt-corp · Nov 27, 2024 · 5017ae3 · 5017ae3
1 parent 88edf87
commit 5017ae3
Show file tree

Hide file tree

Showing 24 changed files with 242 additions and 230 deletions.
diff --git a/commons/api_path.go b/commons/api_path.go
@@ -357,7 +357,7 @@ var ApiPath = struct {
 	DeleteSubUserAccessKey: func(vpcId, s3ServiceId, subUserId string) string {
 		return fmt.Sprintf("/v1/vmware/vpc/%s/s3/%s/sub-users/%s/credentials/delete", vpcId, s3ServiceId, subUserId)
 	},
-
+	
 	// Access Key
 	ListAccessKeys: func(vpcId, s3ServiceId string) string {
 		return fmt.Sprintf("/v1/vmware/vpc/%s/s3/user/credentials?s3_service_id=%s", vpcId, s3ServiceId)

diff --git a/fptcloud/object-storage/dataqsource_object_storage_bucket_acl.go b/fptcloud/object-storage/dataqsource_object_storage_bucket_acl.go
@@ -13,24 +13,19 @@ func DataSourceBucketAcl() *schema.Resource {
 	return &schema.Resource{
 		ReadContext: dataSourceBucketAclRead,
 		Schema: map[string]*schema.Schema{
-			"vpc_id": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: "The VPC ID",
-			},
 			"bucket_name": {
 				Type:        schema.TypeString,
 				Required:    true,
 				ForceNew:    true,
 				Description: "Name of the bucket to config the ACL",
 			},
-			"region_name": {
+			"vpc_id": {
 				Type:        schema.TypeString,
 				Required:    true,
 				ForceNew:    true,
-				Description: "The region name that's are the same with the region name in the S3 service. Currently, we have: HCM-01, HCM-02, HN-01, HN-02",
+				Description: "The VPC ID",
 			},
+
 			"canned_acl": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -41,6 +36,12 @@ func DataSourceBucketAcl() *schema.Resource {
 				Computed:    true,
 				Description: "The status after configuring the bucket ACL",
 			},
+			"region_name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "The region name that's are the same with the region name in the S3 service. Currently, we have: HCM-01, HCM-02, HN-01, HN-02",
+			},
 			"bucket_acl": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -104,12 +105,12 @@ func DataSourceBucketAcl() *schema.Resource {
 func dataSourceBucketAclRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*common.Client)
 	service := NewObjectStorageService(client)
-	vpcId := d.Get("vpc_id").(string)
 	bucketName := d.Get("bucket_name").(string)
+	vpcId := d.Get("vpc_id").(string)
 	regionName := d.Get("region_name").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", regionName))
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
 	}
 	r := service.GetBucketAcl(vpcId, s3ServiceDetail.S3ServiceId, bucketName)
 	if !r.Status {

diff --git a/fptcloud/object-storage/datasource_object_storage_access_key.go b/fptcloud/object-storage/datasource_object_storage_access_key.go
@@ -50,7 +50,7 @@ func dataSourceAccessKeyRead(ctx context.Context, d *schema.ResourceData, m inte
 	regionName := d.Get("region_name").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", regionName))
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
 	}
 	keys, err := service.ListAccessKeys(vpcId, s3ServiceDetail.S3ServiceId)
 	if err != nil {

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket.go b/fptcloud/object-storage/datasource_object_storage_bucket.go
@@ -86,7 +86,7 @@ func dataSourceBucketRead(ctx context.Context, d *schema.ResourceData, m interfa
 	regionName := d.Get("region_name").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", regionName))
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
 	}
 	buckets := service.ListBuckets(vpcId, s3ServiceDetail.S3ServiceId, page, pageSize)
 	if buckets.Total == 0 {

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket_cors.go b/fptcloud/object-storage/datasource_object_storage_bucket_cors.go
@@ -94,7 +94,7 @@ func dataSourceBucketCorsRead(ctx context.Context, d *schema.ResourceData, m int
 	vpcId := d.Get("vpc_id").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, d.Get("region_name").(string))
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", d.Get("region_name").(string)))
+		return diag.FromErr(fmt.Errorf(regionError, d.Get("region_name").(string)))
 	}
 	bucketName := d.Get("bucket_name").(string)
 	page := 1

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket_lifecycle.go b/fptcloud/object-storage/datasource_object_storage_bucket_lifecycle.go
@@ -113,41 +113,9 @@ func DataSourceBucketLifecycle() *schema.Resource {
 		},
 	}
 }
-
-func dataSourceBucketLifecycleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := m.(*common.Client)
-	service := NewObjectStorageService(client)
-
-	bucketName := d.Get("bucket_name").(string)
-	vpcId := d.Get("vpc_id").(string)
-	regionName := d.Get("region_name").(string)
-	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
-	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", regionName))
-	}
-	page := 1
-	v, ok := d.GetOk("page")
-	if ok {
-		page = v.(int)
-	}
-	pageSize := 25
-	v, ok = d.GetOk("page_size")
-	if ok {
-		pageSize = v.(int)
-	}
-
-	lifeCycleResponse := service.GetBucketLifecycle(vpcId, s3ServiceDetail.S3ServiceId, bucketName, page, pageSize)
-	if !lifeCycleResponse.Status {
-		return diag.FromErr(fmt.Errorf("failed to fetch life cycle rules for bucket %s", bucketName))
-	}
-	d.SetId(bucketName)
+func parseData(lifeCycleResponse BucketLifecycleResponse) []interface{} {
 	var formattedData []interface{}
-	if lifeCycleResponse.Total == 0 {
-		if err := d.Set("life_cycle_rules", make([]interface{}, 0)); err != nil {
-			d.SetId("")
-			return diag.FromErr(err)
-		}
-	}
+
 	for _, lifecycleRule := range lifeCycleResponse.Rules {
 		data := map[string]interface{}{
 			"id":     lifecycleRule.ID,
@@ -191,7 +159,42 @@ func dataSourceBucketLifecycleRead(ctx context.Context, d *schema.ResourceData,
 		}
 		formattedData = append(formattedData, data)
 	}
+	return formattedData
+}
+func dataSourceBucketLifecycleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	client := m.(*common.Client)
+	service := NewObjectStorageService(client)
 
+	bucketName := d.Get("bucket_name").(string)
+	vpcId := d.Get("vpc_id").(string)
+	regionName := d.Get("region_name").(string)
+	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
+	if s3ServiceDetail.S3ServiceId == "" {
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
+	}
+	page := 1
+	v, ok := d.GetOk("page")
+	if ok {
+		page = v.(int)
+	}
+	pageSize := 25
+	v, ok = d.GetOk("page_size")
+	if ok {
+		pageSize = v.(int)
+	}
+
+	lifeCycleResponse := service.GetBucketLifecycle(vpcId, s3ServiceDetail.S3ServiceId, bucketName, page, pageSize)
+	if !lifeCycleResponse.Status {
+		return diag.FromErr(fmt.Errorf("failed to fetch life cycle rules for bucket %s", bucketName))
+	}
+	if lifeCycleResponse.Total == 0 {
+		if err := d.Set("life_cycle_rules", make([]interface{}, 0)); err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+	d.SetId(bucketName)
+	formattedData := parseData(lifeCycleResponse)
 	if err := d.Set("life_cycle_rules", formattedData); err != nil {
 		d.SetId("")
 		return diag.FromErr(err)

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket_policy.go b/fptcloud/object-storage/datasource_object_storage_bucket_policy.go
@@ -45,7 +45,7 @@ func dataSourceBucketPolicyRead(ctx context.Context, d *schema.ResourceData, m i
 	vpcId := d.Get("vpc_id").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, d.Get("region_name").(string))
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", d.Get("region_name").(string)))
+		return diag.FromErr(fmt.Errorf(regionError, d.Get("region_name").(string)))
 	}
 	policyResponse := service.GetBucketPolicy(vpcId, s3ServiceDetail.S3ServiceId, bucketName)
 	if !policyResponse.Status {

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket_static_website.go b/fptcloud/object-storage/datasource_object_storage_bucket_static_website.go
@@ -48,7 +48,7 @@ func dataSourceBucketStaticWebsite(ctx context.Context, d *schema.ResourceData,
 	vpcId := d.Get("vpc_id").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, d.Get("region_name").(string))
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", d.Get("region_name").(string)))
+		return diag.FromErr(fmt.Errorf(regionError, d.Get("region_name").(string)))
 	}
 
 	staticWebsiteResponse := service.GetBucketWebsite(vpcId, s3ServiceDetail.S3ServiceId, bucketName)

diff --git a/fptcloud/object-storage/datasource_object_storage_bucket_versioning.go b/fptcloud/object-storage/datasource_object_storage_bucket_versioning.go
@@ -47,7 +47,7 @@ func dataSourceBucketVersioningRead(ctx context.Context, d *schema.ResourceData,
 	vpcId := d.Get("vpc_id").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, d.Get("region_name").(string))
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", d.Get("region_name").(string)))
+		return diag.FromErr(fmt.Errorf(regionError, d.Get("region_name").(string)))
 	}
 	bucketName := d.Get("bucket_name").(string)
 

diff --git a/fptcloud/object-storage/datasource_object_storage_sub_user.go b/fptcloud/object-storage/datasource_object_storage_sub_user.go
@@ -70,7 +70,7 @@ func dataSourceSubUserRead(ctx context.Context, d *schema.ResourceData, m interf
 	regionName := d.Get("region_name").(string)
 	s3ServiceDetail := getServiceEnableRegion(service, vpcId, regionName)
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", regionName))
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
 	}
 	page := 1
 	pageSize := 100

diff --git a/fptcloud/object-storage/datasource_object_storage_sub_user_detail.go b/fptcloud/object-storage/datasource_object_storage_sub_user_detail.go
@@ -58,20 +58,22 @@ func DataSourceSubUserDetail() *schema.Resource {
 func dataSourceSubUserDetailRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*common.Client)
 	objectStorageService := NewObjectStorageService(client)
-
 	vpcId := d.Get("vpc_id").(string)
-	s3ServiceDetail := getServiceEnableRegion(objectStorageService, vpcId, d.Get("region_name").(string))
+	regionName := d.Get("region_name").(string)
+
+	s3ServiceDetail := getServiceEnableRegion(objectStorageService, vpcId, regionName)
 	if s3ServiceDetail.S3ServiceId == "" {
-		return diag.FromErr(fmt.Errorf("region %s is not enabled", d.Get("region_name").(string)))
+		return diag.FromErr(fmt.Errorf(regionError, regionName))
 	}
-	subUserId := d.Get("user_id").(string)
 
+	subUserId := d.Get("user_id").(string)
 	subUser := objectStorageService.DetailSubUser(vpcId, s3ServiceDetail.S3ServiceId, subUserId)
+	d.SetId(subUser.UserID)
 	if subUser.UserID == "" {
+		d.SetId("")
 		return diag.Errorf("sub-user with ID %s not found", subUserId)
 	}
 
-	d.SetId(subUser.UserID)
 	if err := d.Set("user_id", subUser.UserID); err != nil {
 		return diag.FromErr(err)
 	}

diff --git a/fptcloud/object-storage/object_storage_service.go b/fptcloud/object-storage/object_storage_service.go
@@ -6,6 +6,10 @@ import (
 	common "terraform-provider-fptcloud/commons"
 )
 
+const (
+	regionError = "region %s is not enabled"
+)
+
 // ObjectStorageService defines the interface for object storage operations
 type ObjectStorageService interface {
 	CheckServiceEnable(vpcId string) S3ServiceEnableResponse