Make diag errors use constant format strings (#512)

vultr · Oct 16, 2024 · eef6a7c · eef6a7c
1 parent 46809d7
commit eef6a7c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/vultr/data_source_vultr_bare_metal_server.go b/vultr/data_source_vultr_bare_metal_server.go
@@ -222,7 +222,7 @@ func dataSourceVultrBareMetalServerRead(ctx context.Context, d *schema.ResourceD
 
 	vpc2s, err := getBareMetalServerVPC2s(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	if err := d.Set("vpc2_ids", vpc2s); err != nil {

diff --git a/vultr/data_source_vultr_instance.go b/vultr/data_source_vultr_instance.go
@@ -300,12 +300,12 @@ func dataSourceVultrInstanceRead(ctx context.Context, d *schema.ResourceData, me
 
 	vpcs, err := getVPCs(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	vpc2s, err := getVPC2s(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	if err := d.Set("vpc_ids", vpcs); err != nil {

diff --git a/vultr/data_source_vultr_instances.go b/vultr/data_source_vultr_instances.go
@@ -203,7 +203,7 @@ func dataSourceVultrInstancesRead(ctx context.Context, d *schema.ResourceData, m
 
 				vpcs, err := getVPCs(client, server.ID)
 				if err != nil {
-					return diag.Errorf(err.Error())
+					return diag.Errorf("%s", err.Error())
 				}
 
 				serverList = append(serverList, map[string]interface{}{

diff --git a/vultr/resource_vultr_bare_metal_server.go b/vultr/resource_vultr_bare_metal_server.go
@@ -357,7 +357,7 @@ func resourceVultrBareMetalServerRead(ctx context.Context, d *schema.ResourceDat
 
 	vpc2s, err := getBareMetalServerVPC2s(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	if _, vpcUpdate := d.GetOk("vpc2_ids"); vpcUpdate {

diff --git a/vultr/resource_vultr_instance.go b/vultr/resource_vultr_instance.go
@@ -336,7 +336,7 @@ func resourceVultrInstanceCreate(ctx context.Context, d *schema.ResourceData, me
 	if osOption == "" && osID.(int) != 0 {
 		osOption = "os_id"
 	} else if osOption != "" && osID.(int) != 0 {
-		return diag.Errorf(fmt.Sprintf("Please do not set %s with os_id", osOption))
+		return diag.Errorf("Please do not set %s with os_id", osOption)
 	}
 
 	switch osOption {
@@ -544,12 +544,12 @@ func resourceVultrInstanceRead(ctx context.Context, d *schema.ResourceData, meta
 
 	vpcs, err := getVPCs(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	vpc2s, err := getVPC2s(client, d.Id())
 	if err != nil {
-		return diag.Errorf(err.Error())
+		return diag.Errorf("%s", err.Error())
 	}
 
 	if _, vpcUpdate := d.GetOk("vpc_ids"); vpcUpdate {