Merge branch 'next' into yihuaf/mconn-1060/fix-mconn-resources

Author: vaishakdinesh

.stats.yml

@@ -1,4 +1,4 @@
-configured_endpoints: 1782
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-6cea8c0c5482c999b7241fa9a19362dd8504dfee40bb5f704f88822a73abd134.yml
-openapi_spec_hash: e3cadc523ac8c8a891d9aa1104b1c357
-config_hash: eda5b3d9487ce675d1fadf88153b457d
+configured_endpoints: 1783
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-e408a7cdec2dae3d1a18842dcc59280c56050fb042569139aec3fe0f12e0d461.yml
+openapi_spec_hash: 7e210c76f5dd4c79b3e67204ad279b81
+config_hash: a433f3793b734bc6fcc9d9e0c27ff8c2

examples/data-sources/cloudflare_queue_consumer/data-source.tf

@@ -1,4 +1,5 @@
 data "cloudflare_queue_consumer" "example_queue_consumer" {
   account_id = "023e105f4ecef8ad9ca31a8372d0c353"
   queue_id = "023e105f4ecef8ad9ca31a8372d0c353"
+  consumer_id = "023e105f4ecef8ad9ca31a8372d0c353"
 }

examples/data-sources/cloudflare_queue_consumers/data-source.tf

@@ -0,0 +1,4 @@
+data "cloudflare_queue_consumers" "example_queue_consumers" {
+  account_id = "023e105f4ecef8ad9ca31a8372d0c353"
+  queue_id = "023e105f4ecef8ad9ca31a8372d0c353"
+}

examples/resources/cloudflare_regional_hostname/resource.tf

@@ -2,5 +2,5 @@ resource "cloudflare_regional_hostname" "example_regional_hostname" {
   zone_id = "023e105f4ecef8ad9ca31a8372d0c353"
   hostname = "foo.example.com"
   region_key = "ca"
-  routing = "routing"
+  routing = "dns"
 }

examples/resources/cloudflare_snippet_rules/resource.tf

@@ -1,7 +1,7 @@
 resource "cloudflare_snippet_rules" "example_snippet_rules" {
   zone_id = "9f1839b6152d298aca64c4e906b6d074"
-  body = [{
-    expression = "ip.src ne 1.1.1.1"
+  rules = [{
+    expression = "ip.src eq 1.1.1.1"
     snippet_name = "my_snippet"
     description = "Execute my_snippet when IP address is 1.1.1.1."
     enabled = true

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.34
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.63.0
 	github.com/cloudflare/cloudflare-go v0.104.0
-	github.com/cloudflare/cloudflare-go/v4 v4.6.0
+	github.com/cloudflare/cloudflare-go/v5 v5.0.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/terraform-plugin-docs v0.21.0

go.sum

@@ -0,0 +1,105 @@
+package customvalidator
+
+import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	"strings"
+)
+
+func RequiresOtherStringAttributeToNotBeOneOf(pathExpr path.Expression, wantStrValues ...string) requiresOtherAttributeToNotBeOneOfValidator {
+	var wantValues []attr.Value
+	for _, v := range wantStrValues {
+		wantValues = append(wantValues, types.StringValue(v))
+	}
+	return requiresOtherAttributeToNotBeOneOfValidator{
+		pathExpr,
+		wantValues,
+	}
+}
+
+type requiresOtherAttributeToNotBeOneOfValidator struct {
+	pathExpr   path.Expression
+	wantValues []attr.Value
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) Description(ctx context.Context) string {
+	var wantValuesAsStrings []string
+	for _, v := range i.wantValues {
+		wantValuesAsStrings = append(wantValuesAsStrings, v.String())
+	}
+	return fmt.Sprintf("can not be set if %q is one of: %s", i.pathExpr, strings.Join(wantValuesAsStrings, ", "))
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) MarkdownDescription(ctx context.Context) string {
+	return i.Description(ctx)
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) validateAny(ctx context.Context, cfg *tfsdk.Config, attrPathExpr path.Expression, attrPath path.Path, value attr.Value, resDiagnostics *diag.Diagnostics) {
+	if value.IsNull() || value.IsUnknown() {
+		return
+	}
+
+	expression := attrPathExpr.Merge(i.pathExpr)
+	matchedPaths, diags := cfg.PathMatches(ctx, expression)
+	resDiagnostics.Append(diags...)
+
+	for _, mp := range matchedPaths {
+		// If the user specifies the same attribute this validator is applied to,
+		// also as part of the input, skip it
+		if mp.Equal(attrPath) {
+			continue
+		}
+
+		var mpVal attr.Value
+		resDiagnostics.Append(cfg.GetAttribute(ctx, mp, &mpVal)...)
+
+		// Collect all errors
+		if diags.HasError() {
+			continue
+		}
+
+		// Delay validation until all involved attribute have a known value
+		if mpVal.IsUnknown() {
+			return
+		}
+
+		foundMatch := false
+		for _, wantValue := range i.wantValues {
+			if mpVal.Equal(wantValue) {
+				foundMatch = true
+				break
+			}
+		}
+
+		if foundMatch {
+			description := fmt.Sprintf("%q %s", attrPath, i.Description(ctx))
+			resDiagnostics.Append(validatordiag.InvalidAttributeCombinationDiagnostic(
+				attrPath,
+				description,
+			))
+		}
+	}
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) ValidateBool(ctx context.Context, req validator.BoolRequest, res *validator.BoolResponse) {
+	i.validateAny(ctx, &req.Config, req.PathExpression, req.Path, req.ConfigValue, &res.Diagnostics)
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) ValidateString(ctx context.Context, req validator.StringRequest, res *validator.StringResponse) {
+	i.validateAny(ctx, &req.Config, req.PathExpression, req.Path, req.ConfigValue, &res.Diagnostics)
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) ValidateObject(ctx context.Context, req validator.ObjectRequest, res *validator.ObjectResponse) {
+	i.validateAny(ctx, &req.Config, req.PathExpression, req.Path, req.ConfigValue, &res.Diagnostics)
+}
+
+func (i requiresOtherAttributeToNotBeOneOfValidator) ValidateList(ctx context.Context, req validator.ListRequest, res *validator.ListResponse) {
+	i.validateAny(ctx, &req.Config, req.PathExpression, req.Path, req.ConfigValue, &res.Diagnostics)
+}

internal/customvalidator/requires_other_attribute_to_not_be_one_of_validator.go

@@ -9,7 +9,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/cloudflare/cloudflare-go/v4/option"
+	"github.com/cloudflare/cloudflare-go/v5/option"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 )

internal/logging/logging.go

@@ -7,10 +7,9 @@ import (
 	"fmt"
 	"os"
 	"regexp"
-
-	"github.com/cloudflare/cloudflare-go/v4"
-	"github.com/cloudflare/cloudflare-go/v4/option"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
+	"github.com/cloudflare/cloudflare-go/v5"
+	"github.com/cloudflare/cloudflare-go/v5/option"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/services/access_rule"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/services/account"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/services/account_api_token_permission_groups"
@@ -708,6 +707,7 @@ func (p *CloudflareProvider) DataSources(ctx context.Context) []func() datasourc
 		queue.NewQueueDataSource,
 		queue.NewQueuesDataSource,
 		queue_consumer.NewQueueConsumerDataSource,
+		queue_consumer.NewQueueConsumersDataSource,
 		api_shield.NewAPIShieldDataSource,
 		api_shield_discovery_operation.NewAPIShieldDiscoveryOperationsDataSource,
 		api_shield_operation.NewAPIShieldOperationDataSource,