fix: introduce mutex for folder crud ops (#2350)

Author: mustafasencer

internal/common/client.go

@@ -51,6 +51,7 @@ type Client struct {
 	K6APIConfig *k6providerapi.K6APIConfig
 
 	alertingMutex sync.Mutex
+	folderMutex   sync.Mutex
 }
 
 // WithAlertingMutex is a helper function that wraps a CRUD Terraform function with a mutex.
@@ -63,6 +64,16 @@ func WithAlertingMutex[T schema.CreateContextFunc | schema.ReadContextFunc | sch
 	}
 }
 
+// WithFolderMutex is a helper function that wraps a CRUD Terraform function with a mutex.
+func WithFolderMutex[T schema.CreateContextFunc | schema.ReadContextFunc | schema.UpdateContextFunc | schema.DeleteContextFunc](f T) T {
+	return func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+		lock := &meta.(*Client).folderMutex
+		lock.Lock()
+		defer lock.Unlock()
+		return f(ctx, d, meta)
+	}
+}
+
 func (c *Client) GrafanaSubpath(path string) string {
 	path = strings.TrimPrefix(path, c.GrafanaAPIURLParsed.Path)
 	return c.GrafanaAPIURLParsed.JoinPath(path).String()

internal/resources/grafana/resource_folder.go

@@ -29,10 +29,10 @@ func resourceFolder() *common.Resource {
 * [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/folder/)
 `,
 
-		CreateContext: CreateFolder,
-		DeleteContext: DeleteFolder,
+		CreateContext: common.WithFolderMutex[schema.CreateContextFunc](CreateFolder),
+		DeleteContext: common.WithFolderMutex[schema.DeleteContextFunc](DeleteFolder),
 		ReadContext:   ReadFolder,
-		UpdateContext: UpdateFolder,
+		UpdateContext: common.WithFolderMutex[schema.UpdateContextFunc](UpdateFolder),
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},