Merge pull request ovh#414 from sguyennet/dev/sgu/fix-cloud-project-database

scraly · web-flow · commit b80b208949f6 · 2023-04-25T14:15:30.000+02:00
fix (managed databases) Reset avnadmin grafana password
diff --git a/ovh/types_cloud_project_database.go b/ovh/types_cloud_project_database.go
@@ -583,7 +583,7 @@ func postCloudProjectDatabaseUser(ctx context.Context, d *schema.ResourceData, m
 		return updateFunc(ctx, d, meta)
 	}
 	if engine == "grafana" && name != "avnadmin" {
-		return fmt.Errorf("The Grafana engine does not allow to create a user resource other than avnadmin")
+		return diag.FromErr(fmt.Errorf("The Grafana engine does not allow to create a user resource other than avnadmin"))
 	}
 
 	serviceName := d.Get("service_name").(string)
@@ -606,7 +606,6 @@ func postCloudProjectDatabaseUser(ctx context.Context, d *schema.ResourceData, m
 
 	d.SetId(res.Id)
 	return readFunc(ctx, d, meta)
-
 }
 
 func postFuncCloudProjectDatabaseUser(ctx context.Context, d *schema.ResourceData, meta interface{}, engine string, endpoint string, params interface{}, res *CloudProjectDatabaseUserResponse, timeout string) error {

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ func postCloudProjectDatabaseUser(ctx context.Context, d *schema.ResourceData, m`
`583`	`583`	`return updateFunc(ctx, d, meta)`
`584`	`584`	`}`
`585`	`585`	`if engine == "grafana" && name != "avnadmin" {`
`586`		`- return fmt.Errorf("The Grafana engine does not allow to create a user resource other than avnadmin")`
	`586`	`+ return diag.FromErr(fmt.Errorf("The Grafana engine does not allow to create a user resource other than avnadmin"))`
`587`	`587`	`}`
`588`	`588`
`589`	`589`	`serviceName := d.Get("service_name").(string)`
`@@ -606,7 +606,6 @@ func postCloudProjectDatabaseUser(ctx context.Context, d *schema.ResourceData, m`
`606`	`606`
`607`	`607`	`d.SetId(res.Id)`
`608`	`608`	`return readFunc(ctx, d, meta)`
`609`		`-`
`610`	`609`	`}`
`611`	`610`
`612`	`611`	`func postFuncCloudProjectDatabaseUser(ctx context.Context, d schema.ResourceData, meta interface{}, engine string, endpoint string, params interface{}, res CloudProjectDatabaseUserResponse, timeout string) error {`