Alerting: Allow duplicated alert rule names (grafana#2323)

* Alerting: Allow duplicated alert rule names

* update test

* update Grafana version in test

Signed-off-by: Hélia Barroso <[email protected]>

Author: santihernandezc

cmd/generate/validation.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/urfave/cli/v2"
 )
@@ -15,10 +16,8 @@ func newFlagValidations() flagValidations {
 
 func (v flagValidations) atLeastOne(flags ...string) flagValidations {
 	validateFunc := func(ctx *cli.Context) error {
-		for _, flag := range flags {
-			if ctx.IsSet(flag) {
-				return nil
-			}
+		if slices.ContainsFunc(flags, ctx.IsSet) {
+			return nil
 		}
 		return fmt.Errorf("at least one of flags %s must be specified", flags)
 	}

internal/common/adapters.go

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func ListToStringSlice(src []interface{}) []string {
+func ListToStringSlice(src []any) []string {
 	dst := make([]string, 0, len(src))
 	for _, s := range src {
 		val, ok := s.(string)
@@ -20,7 +20,7 @@ func SetToStringSlice(src *schema.Set) []string {
 	return ListToStringSlice(src.List())
 }
 
-func ListToIntSlice[T int | int64](src []interface{}) []T {
+func ListToIntSlice[T int | int64](src []any) []T {
 	dst := make([]T, 0, len(src))
 	for _, s := range src {
 		val, ok := s.(int)
@@ -36,8 +36,8 @@ func SetToIntSlice[T int | int64](src *schema.Set) []T {
 	return ListToIntSlice[T](src.List())
 }
 
-func StringSliceToList(list []string) []interface{} {
-	vs := make([]interface{}, 0, len(list))
+func StringSliceToList(list []string) []any {
+	vs := make([]any, 0, len(list))
 	for _, v := range list {
 		vs = append(vs, v)
 	}
@@ -48,8 +48,8 @@ func StringSliceToSet(src []string) *schema.Set {
 	return schema.NewSet(schema.HashString, StringSliceToList(src))
 }
 
-func Int32SliceToIntList(list []int32) []interface{} {
-	vs := make([]interface{}, 0, len(list))
+func Int32SliceToIntList(list []int32) []any {
+	vs := make([]any, 0, len(list))
 	for _, v := range list {
 		vs = append(vs, int(v))
 	}
@@ -60,17 +60,17 @@ func Int32SliceToSet(src []int32) *schema.Set {
 	return schema.NewSet(schema.HashInt, Int32SliceToIntList(src))
 }
 
-func ListOfSetsToStringSlice(listSet []interface{}) [][]string {
+func ListOfSetsToStringSlice(listSet []any) [][]string {
 	ret := make([][]string, 0, len(listSet))
 	for _, set := range listSet {
 		ret = append(ret, SetToStringSlice(set.(*schema.Set)))
 	}
 	return ret
 }
 
-func UnpackMap[T any](m interface{}) map[string]T {
+func UnpackMap[T any](m any) map[string]T {
 	ret := make(map[string]T)
-	for k, v := range m.(map[string]interface{}) {
+	for k, v := range m.(map[string]any) {
 		ret[k] = v.(T)
 	}
 	return ret

internal/common/client.go

@@ -55,7 +55,7 @@ type Client struct {
 
 // WithAlertingMutex is a helper function that wraps a CRUD Terraform function with a mutex.
 func WithAlertingMutex[T schema.CreateContextFunc | schema.ReadContextFunc | schema.UpdateContextFunc | schema.DeleteContextFunc](f T) T {
-	return func(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	return func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 		lock := &meta.(*Client).alertingMutex
 		lock.Lock()
 		defer lock.Unlock()

internal/common/json.go

@@ -23,12 +23,12 @@ func SuppressEquivalentJSONDiffs(k, old, new string, d *schema.ResourceData) boo
 }
 
 func JSONBytesEqual(b1, b2 []byte) bool {
-	var o1 interface{}
+	var o1 any
 	if err := json.Unmarshal(b1, &o1); err != nil {
 		return false
 	}
 
-	var o2 interface{}
+	var o2 any
 	if err := json.Unmarshal(b2, &o2); err != nil {
 		return false
 	}

internal/common/schema.go

@@ -57,7 +57,7 @@ func AllowedValuesDescription(description string, allowedValues []string) string
 	return fmt.Sprintf("%s. Allowed values: `%s`.", description, strings.Join(allowedValues, "`, `"))
 }
 
-func ValidateDuration(i interface{}, p cty.Path) diag.Diagnostics {
+func ValidateDuration(i any, p cty.Path) diag.Diagnostics {
 	v := i.(string)
 	_, err := time.ParseDuration(v)
 	if err != nil {
@@ -66,7 +66,7 @@ func ValidateDuration(i interface{}, p cty.Path) diag.Diagnostics {
 	return nil
 }
 
-func ValidateDurationWithDays(i interface{}, p cty.Path) diag.Diagnostics {
+func ValidateDurationWithDays(i any, p cty.Path) diag.Diagnostics {
 	v := i.(string)
 	_, err := strfmt.ParseDuration(v)
 	if err != nil {

internal/resources/asserts/resource_alert_config.go

@@ -70,7 +70,7 @@ func makeResourceAlertConfig() *common.Resource {
 	).WithLister(assertsListerFunction(listAlertConfigs))
 }
 
-func resourceAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -85,13 +85,13 @@ func resourceAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta
 	alertLabels := make(map[string]string)
 
 	if v, ok := d.GetOk("match_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			matchLabels[k] = val.(string)
 		}
 	}
 
 	if v, ok := d.GetOk("alert_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			alertLabels[k] = val.(string)
 		}
 	}
@@ -136,7 +136,7 @@ func resourceAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta
 	return resourceAlertConfigRead(ctx, d, meta)
 }
 
-func resourceAlertConfigRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceAlertConfigRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -229,7 +229,7 @@ func resourceAlertConfigRead(ctx context.Context, d *schema.ResourceData, meta i
 	return nil
 }
 
-func resourceAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -245,13 +245,13 @@ func resourceAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta
 	alertLabels := make(map[string]string)
 
 	if v, ok := d.GetOk("match_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			matchLabels[k] = val.(string)
 		}
 	}
 
 	if v, ok := d.GetOk("alert_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			alertLabels[k] = val.(string)
 		}
 	}
@@ -294,7 +294,7 @@ func resourceAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta
 	return resourceAlertConfigRead(ctx, d, meta)
 }
 
-func resourceAlertConfigDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceAlertConfigDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")

internal/resources/asserts/resource_disabled_alert_config.go

@@ -52,7 +52,7 @@ func makeResourceDisabledAlertConfig() *common.Resource {
 	).WithLister(assertsListerFunction(listDisabledAlertConfigs))
 }
 
-func resourceDisabledAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceDisabledAlertConfigCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -66,7 +66,7 @@ func resourceDisabledAlertConfigCreate(ctx context.Context, d *schema.ResourceDa
 	matchLabels := make(map[string]string)
 
 	if v, ok := d.GetOk("match_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			matchLabels[k] = val.(string)
 		}
 	}
@@ -96,7 +96,7 @@ func resourceDisabledAlertConfigCreate(ctx context.Context, d *schema.ResourceDa
 	return resourceDisabledAlertConfigRead(ctx, d, meta)
 }
 
-func resourceDisabledAlertConfigRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceDisabledAlertConfigRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -174,7 +174,7 @@ func resourceDisabledAlertConfigRead(ctx context.Context, d *schema.ResourceData
 	return nil
 }
 
-func resourceDisabledAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceDisabledAlertConfigUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")
@@ -189,7 +189,7 @@ func resourceDisabledAlertConfigUpdate(ctx context.Context, d *schema.ResourceDa
 	matchLabels := make(map[string]string)
 
 	if v, ok := d.GetOk("match_labels"); ok {
-		for k, val := range v.(map[string]interface{}) {
+		for k, val := range v.(map[string]any) {
 			matchLabels[k] = val.(string)
 		}
 	}
@@ -218,7 +218,7 @@ func resourceDisabledAlertConfigUpdate(ctx context.Context, d *schema.ResourceDa
 	return resourceDisabledAlertConfigRead(ctx, d, meta)
 }
 
-func resourceDisabledAlertConfigDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func resourceDisabledAlertConfigDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*common.Client).AssertsAPIClient
 	if client == nil {
 		return diag.Errorf("Asserts API client is not configured")

internal/resources/cloud/common.go

@@ -24,7 +24,7 @@ func ClientRequestID() string {
 type crudWithClientFunc func(ctx context.Context, d *schema.ResourceData, client *gcom.APIClient) diag.Diagnostics
 
 func withClient[T schema.CreateContextFunc | schema.UpdateContextFunc | schema.ReadContextFunc | schema.DeleteContextFunc](f crudWithClientFunc) T {
-	return func(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	return func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 		client := meta.(*common.Client).GrafanaCloudAPI
 		if client == nil {
 			return diag.Errorf("the Cloud API client is required for this resource. Set the cloud_access_policy_token provider attribute")

internal/resources/cloud/data_source_cloud_ips.go

@@ -61,7 +61,7 @@ func datasourceIPs() *common.DataSource {
 	return common.NewLegacySDKDataSource(common.CategoryCloud, "grafana_cloud_ips", schema)
 }
 
-func datasourceIPsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+func datasourceIPsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	d.SetId("cloud_ips")
 	for attr, dataURL := range map[string]string{
 		"hosted_alerts":  "https://grafana.com/api/hosted-alerts/source-ips.txt",

internal/resources/cloud/resource_cloud_access_policy.go

@@ -281,34 +281,34 @@ func deleteCloudAccessPolicy(ctx context.Context, d *schema.ResourceData, client
 	return apiError(err)
 }
 
-func validateCloudAccessPolicyScope(v interface{}, path cty.Path) diag.Diagnostics {
+func validateCloudAccessPolicyScope(v any, path cty.Path) diag.Diagnostics {
 	if strings.Count(v.(string), ":") != 1 {
 		return diag.Errorf("invalid scope: %s. Should be in the `service:permission` format", v.(string))
 	}
 
 	return nil
 }
 
-func validateCloudAccessPolicyAllowedSubnets(v interface{}, path cty.Path) diag.Diagnostics {
+func validateCloudAccessPolicyAllowedSubnets(v any, path cty.Path) diag.Diagnostics {
 	_, _, err := net.ParseCIDR(v.(string))
 	if err == nil {
 		return nil
 	}
 	return diag.Errorf("Invalid IP CIDR : %s.", v.(string))
 }
 
-func flattenCloudAccessPolicyRealm(realm []gcom.AuthAccessPolicyRealmsInner) []interface{} {
-	var result []interface{}
+func flattenCloudAccessPolicyRealm(realm []gcom.AuthAccessPolicyRealmsInner) []any {
+	var result []any
 
 	for _, r := range realm {
-		labelPolicy := []interface{}{}
+		labelPolicy := []any{}
 		for _, lp := range r.LabelPolicies {
-			labelPolicy = append(labelPolicy, map[string]interface{}{
+			labelPolicy = append(labelPolicy, map[string]any{
 				"selector": lp.Selector,
 			})
 		}
 
-		result = append(result, map[string]interface{}{
+		result = append(result, map[string]any{
 			"type":         r.Type,
 			"identifier":   r.Identifier,
 			"label_policy": labelPolicy,
@@ -318,29 +318,29 @@ func flattenCloudAccessPolicyRealm(realm []gcom.AuthAccessPolicyRealmsInner) []i
 	return result
 }
 
-func flattenCloudAccessPolicyConditions(condition *gcom.AuthAccessPolicyConditions) []interface{} {
+func flattenCloudAccessPolicyConditions(condition *gcom.AuthAccessPolicyConditions) []any {
 	if condition == nil || len(condition.GetAllowedSubnets()) == 0 {
 		return nil
 	}
-	var result []interface{}
+	var result []any
 	var allowedSubnets []string
 
 	for _, sn := range condition.GetAllowedSubnets() {
 		allowedSubnets = append(allowedSubnets, *sn.String)
 	}
 
-	result = append(result, map[string]interface{}{
+	result = append(result, map[string]any{
 		"allowed_subnets": allowedSubnets,
 	})
 
 	return result
 }
 
-func expandCloudAccessPolicyConditions(condition []interface{}) gcom.NullablePostAccessPoliciesRequestConditions {
+func expandCloudAccessPolicyConditions(condition []any) gcom.NullablePostAccessPoliciesRequestConditions {
 	var result gcom.PostAccessPoliciesRequestConditions
 
 	for _, c := range condition {
-		c := c.(map[string]interface{})
+		c := c.(map[string]any)
 		for _, as := range c["allowed_subnets"].(*schema.Set).List() {
 			result.AllowedSubnets = append(result.AllowedSubnets, as.(string))
 		}
@@ -349,14 +349,14 @@ func expandCloudAccessPolicyConditions(condition []interface{}) gcom.NullablePos
 	return *gcom.NewNullablePostAccessPoliciesRequestConditions(&result)
 }
 
-func expandCloudAccessPolicyRealm(realm []interface{}) []gcom.PostAccessPoliciesRequestRealmsInner {
+func expandCloudAccessPolicyRealm(realm []any) []gcom.PostAccessPoliciesRequestRealmsInner {
 	var result []gcom.PostAccessPoliciesRequestRealmsInner
 
 	for _, r := range realm {
-		r := r.(map[string]interface{})
+		r := r.(map[string]any)
 		labelPolicy := []gcom.PostAccessPoliciesRequestRealmsInnerLabelPoliciesInner{}
 		for _, lp := range r["label_policy"].(*schema.Set).List() {
-			lp := lp.(map[string]interface{})
+			lp := lp.(map[string]any)
 			labelPolicy = append(labelPolicy, gcom.PostAccessPoliciesRequestRealmsInnerLabelPoliciesInner{
 				Selector: lp["selector"].(string),
 			})