Add delete protection (#2201)

Author: KucicM

docs/data-sources/cloud_stack.md

@@ -41,6 +41,7 @@ available at “https://<stack_slug>.grafana.net".
 - `alertmanager_url` (String) Base URL of the Alertmanager instance configured for this stack.
 - `alertmanager_user_id` (Number) User ID of the Alertmanager instance configured for this stack.
 - `cluster_slug` (String) Slug of the cluster where this stack resides.
+- `delete_protection` (Boolean) Whether to enable delete protection for the stack, preventing accidental deletion.
 - `description` (String) Description of stack.
 - `fleet_management_name` (String) Name of the Fleet Management instance configured for this stack.
 - `fleet_management_private_connectivity_info_private_dns` (String) Private DNS for Fleet Management when using AWS PrivateLink (only for AWS stacks)

docs/resources/cloud_stack.md

@@ -39,6 +39,7 @@ resource "grafana_cloud_stack" "test" {
 
 ### Optional
 
+- `delete_protection` (Boolean) Whether to enable delete protection for the stack, preventing accidental deletion. Defaults to `true`.
 - `description` (String) Description of stack.
 - `labels` (Map of String) A map of labels to assign to the stack. Label keys and values must match the following regexp: "^[a-zA-Z0-9/\\-.]+$" and stacks cannot have more than 10 labels.
 - `region_slug` (String) Region slug to assign to this stack. Changing region will destroy the existing stack and create a new one in the desired region. Use the region list API to get the list of available regions: https://grafana.com/docs/grafana-cloud/developer-resources/api-reference/cloud-api/#list-regions.

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/grafana/authlib/claims v0.0.0-20250120084028-e3328c576437
 	github.com/grafana/fleet-management-api v1.0.0
 	github.com/grafana/grafana-app-sdk v0.35.2-0.20250408075831-c2a87bde0849
-	github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250225152211-076f0759931d
+	github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250526074454-7ec66e02e4bb
 	github.com/grafana/grafana-openapi-client-go v0.0.0-20250516123951-83fcd32d7bbe
 	github.com/grafana/grafana/apps/dashboard v0.0.0-20250424064802-2fbb2d6f5d27
 	github.com/grafana/grafana/apps/playlist v0.0.0-20250424064802-2fbb2d6f5d27

go.sum

@@ -168,8 +168,6 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grafana/amixr-api-go-client v0.0.23 h1:9It5KYc79J8znWBriOezF723+1cyB/PWiS/4/RpaoVI=
-github.com/grafana/amixr-api-go-client v0.0.23/go.mod h1:ihgLhTVimmjASuZ06y/mQxPcYH3toAIuUVGK6flHsMU=
 github.com/grafana/amixr-api-go-client v0.0.24 h1:Yvj8Ir02e3GTcetd+qHmajrLC690YJxK8lppEUkrsyA=
 github.com/grafana/amixr-api-go-client v0.0.24/go.mod h1:ihgLhTVimmjASuZ06y/mQxPcYH3toAIuUVGK6flHsMU=
 github.com/grafana/authlib/claims v0.0.0-20250120084028-e3328c576437 h1:OlwbIVFcYgMjnQhpbZwRPVNrvZKTodvPMqwb8yEqVW0=
@@ -180,12 +178,8 @@ github.com/grafana/grafana-app-sdk v0.35.2-0.20250408075831-c2a87bde0849 h1:fzoG
 github.com/grafana/grafana-app-sdk v0.35.2-0.20250408075831-c2a87bde0849/go.mod h1:hQFtfn65wd/zTcQ/ftwOpRTr/B37MfIzPZD8jGoAx5E=
 github.com/grafana/grafana-app-sdk/logging v0.35.1 h1:taVpl+RoixTYl0JBJGhH+fPVmwA9wvdwdzJTZsv9buM=
 github.com/grafana/grafana-app-sdk/logging v0.35.1/go.mod h1:Y/bvbDhBiV/tkIle9RW49pgfSPIPSON8Q4qjx3pyqDk=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250214150112-a52892176c26 h1:7NMB6/x0CcfH/zKQ5D+3Ffb2DbYMJBx0QdJ1GGdw8z4=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250214150112-a52892176c26/go.mod h1:sYWkB3NhyirQJfy3wtNQ29UYjoHbRlJlYhqN1jNsC5g=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250225152211-076f0759931d h1:CS04cUrE9ke/S5sbaH01gW4JcEy3joLKMJO5Vu3T2/4=
-github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250225152211-076f0759931d/go.mod h1:sYWkB3NhyirQJfy3wtNQ29UYjoHbRlJlYhqN1jNsC5g=
-github.com/grafana/grafana-openapi-client-go v0.0.0-20250424142317-beadd3136e10 h1:RznghhbjMUEvGJD0p9AOCjnVOTq0MiINDt98BscNcdw=
-github.com/grafana/grafana-openapi-client-go v0.0.0-20250424142317-beadd3136e10/go.mod h1:hiZnMmXc9KXNUlvkV2BKFsiWuIFF/fF4wGgYWEjBitI=
+github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250526074454-7ec66e02e4bb h1:rmYEnCXHNQbRsuzc5jCX5qkBqFF37c5RCHlyqAAPJZo=
+github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250526074454-7ec66e02e4bb/go.mod h1:sYWkB3NhyirQJfy3wtNQ29UYjoHbRlJlYhqN1jNsC5g=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20250516123951-83fcd32d7bbe h1:OdLLQKwEBVVhe9wHAncGp+Ff1N5aDl7erDIBdO9xBmA=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20250516123951-83fcd32d7bbe/go.mod h1:hiZnMmXc9KXNUlvkV2BKFsiWuIFF/fF4wGgYWEjBitI=
 github.com/grafana/grafana-plugin-sdk-go v0.275.0 h1:icGmZG91lVqIo79w/pSki6N44d3IjOjTfsfQPfu4THU=

internal/resources/cloud/resource_cloud_access_policy.go

@@ -336,7 +336,7 @@ func flattenCloudAccessPolicyConditions(condition *gcom.AuthAccessPolicyConditio
 	return result
 }
 
-func expandCloudAccessPolicyConditions(condition []interface{}) *gcom.PostAccessPoliciesRequestConditions {
+func expandCloudAccessPolicyConditions(condition []interface{}) gcom.NullablePostAccessPoliciesRequestConditions {
 	var result gcom.PostAccessPoliciesRequestConditions
 
 	for _, c := range condition {
@@ -346,7 +346,7 @@ func expandCloudAccessPolicyConditions(condition []interface{}) *gcom.PostAccess
 		}
 	}
 
-	return &result
+	return *gcom.NewNullablePostAccessPoliciesRequestConditions(&result)
 }
 
 func expandCloudAccessPolicyRealm(realm []interface{}) []gcom.PostAccessPoliciesRequestRealmsInner {

internal/resources/cloud/resource_cloud_stack.go

@@ -155,6 +155,12 @@ Required access policy scopes:
 					return nil, nil
 				},
 			},
+			"delete_protection": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Whether to enable delete protection for the stack, preventing accidental deletion.",
+			},
 
 			"grafanas_ip_allow_list_cname": ipAllowListCNAMEDescription("the grafana instance"),
 
@@ -279,12 +285,13 @@ func listStacks(ctx context.Context, client *gcom.APIClient, data *ListerData) (
 
 func createStack(ctx context.Context, d *schema.ResourceData, client *gcom.APIClient) diag.Diagnostics {
 	stack := gcom.PostInstancesRequest{
-		Name:        d.Get("name").(string),
-		Slug:        common.Ref(d.Get("slug").(string)),
-		Url:         common.Ref(d.Get("url").(string)),
-		Region:      common.Ref(d.Get("region_slug").(string)),
-		Description: common.Ref(d.Get("description").(string)),
-		Labels:      common.Ref(common.UnpackMap[string](d.Get("labels"))),
+		Name:             d.Get("name").(string),
+		Slug:             common.Ref(d.Get("slug").(string)),
+		Url:              common.Ref(d.Get("url").(string)),
+		Region:           common.Ref(d.Get("region_slug").(string)),
+		Description:      common.Ref(d.Get("description").(string)),
+		Labels:           common.Ref(common.UnpackMap[string](d.Get("labels"))),
+		DeleteProtection: common.Ref(d.Get("delete_protection").(bool)),
 	}
 
 	err := retry.RetryContext(ctx, 2*time.Minute, func() *retry.RetryError {
@@ -344,11 +351,12 @@ func updateStack(ctx context.Context, d *schema.ResourceData, client *gcom.APICl
 	}
 
 	stack := gcom.PostInstanceRequest{
-		Name:        common.Ref(d.Get("name").(string)),
-		Slug:        common.Ref(d.Get("slug").(string)),
-		Description: common.Ref(d.Get("description").(string)),
-		Url:         &url,
-		Labels:      common.Ref(common.UnpackMap[string](d.Get("labels"))),
+		Name:             common.Ref(d.Get("name").(string)),
+		Slug:             common.Ref(d.Get("slug").(string)),
+		Description:      common.Ref(d.Get("description").(string)),
+		Url:              &url,
+		Labels:           common.Ref(common.UnpackMap[string](d.Get("labels"))),
+		DeleteProtection: common.Ref(d.Get("delete_protection").(bool)),
 	}
 	req := client.InstancesAPI.PostInstance(ctx, id.(string)).PostInstanceRequest(stack).XRequestId(ClientRequestID())
 	_, _, err = req.Execute()
@@ -436,6 +444,7 @@ func flattenStack(d *schema.ResourceData, stack *gcom.FormattedApiInstance, conn
 	d.Set("cluster_slug", stack.ClusterSlug)
 	d.Set("description", stack.Description)
 	d.Set("labels", stack.Labels)
+	d.Set("delete_protection", stack.DeleteProtection)
 
 	d.Set("org_id", stack.OrgId)
 	d.Set("org_slug", stack.OrgSlug)

internal/resources/cloud/resource_cloud_stack_test.go

@@ -82,6 +82,7 @@ func TestResourceStack_Basic(t *testing.T) {
 		resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "pdc_gateway_private_connectivity_info_private_dns"),
 		resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "pdc_gateway_private_connectivity_info_service_name"),
 		resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "oncall_api_url"),
+		resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "delete_protection"),
 	)
 
 	resource.ParallelTest(t, resource.TestCase{

pkg/provider/configure_clients.go

@@ -267,6 +267,7 @@ func createCloudClient(client *common.Client, providerConfig ProviderConfig) err
 	openAPIConfig.Scheme = parsedURL.Scheme
 	openAPIConfig.HTTPClient = getRetryClient(providerConfig)
 	openAPIConfig.DefaultHeader["Authorization"] = "Bearer " + providerConfig.CloudAccessPolicyToken.ValueString()
+	openAPIConfig.UserAgent = providerConfig.UserAgent.String()
 	httpHeaders, err := getHTTPHeadersMap(providerConfig)
 	if err != nil {
 		return err