CDI-790: add mutex to resolve race condition between cdn_origin_shiel…

…ding and cdn_applied_preset resources (#117)

gcore/provider.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"sync"
 
 	dnssdk "github.com/G-Core/gcore-dns-sdk-go"
 	storageSDK "github.com/G-Core/gcore-storage-sdk-go"
@@ -283,6 +284,7 @@ func providerConfigure(_ context.Context, d *schema.ResourceData) (interface{},
 	config := Config{
 		Provider:  provider,
 		CDNClient: cdnService,
+		CDNMutex:  &sync.Mutex{},
 	}
 
 	userAgent := fmt.Sprintf("terraform/%s", version.Version)

gcore/resource_gcore_cdn_applied_preset.go

@@ -52,6 +52,9 @@ func resourceCDNPresetApply(ctx context.Context, d *schema.ResourceData, m inter
 	config := m.(*Config)
 	client := config.CDNClient
 
+	config.CDNMutex.Lock()
+	defer config.CDNMutex.Unlock()
+
 	var req presets.ApplyRequest
 	req.ObjectID = d.Get("object_id").(int)
 
@@ -96,6 +99,9 @@ func resourceCDNPresetUnapply(ctx context.Context, d *schema.ResourceData, m int
 	config := m.(*Config)
 	client := config.CDNClient
 
+	config.CDNMutex.Lock()
+	defer config.CDNMutex.Unlock()
+
 	if err := client.Presets().Unapply(ctx, d.Get("preset_id").(int), d.Get("object_id").(int)); err != nil {
 		return diag.FromErr(err)
 	}

gcore/resource_gcore_cdn_origin_shielding.go

@@ -67,6 +67,9 @@ func resourceCDNOriginShieldingUpdate(ctx context.Context, d *schema.ResourceDat
 	config := m.(*Config)
 	client := config.CDNClient
 
+	config.CDNMutex.Lock()
+	defer config.CDNMutex.Unlock()
+
 	var req originshielding.UpdateRequest
 	req.ShieldingPop = pointer.ToInt(d.Get("shielding_pop").(int))
 
@@ -87,6 +90,9 @@ func resourceCDNOriginShieldingDelete(ctx context.Context, d *schema.ResourceDat
 	config := m.(*Config)
 	client := config.CDNClient
 
+	config.CDNMutex.Lock()
+	defer config.CDNMutex.Unlock()
+
 	var req originshielding.UpdateRequest
 	var intPointer *int
 	req.ShieldingPop = intPointer

gcore/utils.go

@@ -13,6 +13,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"sync"
 
 	dnssdk "github.com/G-Core/gcore-dns-sdk-go"
 	storageSDK "github.com/G-Core/gcore-storage-sdk-go"
@@ -52,6 +53,7 @@ const (
 type Config struct {
 	Provider      *gcorecloud.ProviderClient
 	CDNClient     gcdn.ClientService
+	CDNMutex      *sync.Mutex
 	StorageClient *storageSDK.SDK
 	DNSClient     *dnssdk.Client
 }