Merge pull request #5709 from helloimalastair/refresh-jurisdiction

musa-cf · web-flow · commit d5b89b3653a3 · 2025-07-07T17:49:04.000-05:00
R2-3068: Add `no_refresh` to Jurisdiction Fields in R2
diff --git a/internal/services/r2_bucket/data_source_model.go b/internal/services/r2_bucket/data_source_model.go
@@ -19,7 +19,7 @@ type R2BucketDataSourceModel struct {
 	AccountID    types.String `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String `tfsdk:"bucket_name" path:"bucket_name,required"`
 	CreationDate types.String `tfsdk:"creation_date" json:"creation_date,computed"`
-	Jurisdiction types.String `tfsdk:"jurisdiction" json:"jurisdiction,computed"`
+	Jurisdiction types.String `tfsdk:"jurisdiction" json:"jurisdiction,computed,no_refresh"`
 	Location     types.String `tfsdk:"location" json:"location,computed"`
 	Name         types.String `tfsdk:"name" json:"name,computed"`
 	StorageClass types.String `tfsdk:"storage_class" json:"storage_class,computed"`
diff --git a/internal/services/r2_bucket/model.go b/internal/services/r2_bucket/model.go
@@ -18,15 +18,15 @@ type R2BucketModel struct {
 	Location     types.String `tfsdk:"location" json:"location,computed_optional"`
 	StorageClass types.String `tfsdk:"storage_class" json:"storage_class,computed_optional"`
 	CreationDate types.String `tfsdk:"creation_date" json:"creation_date,computed"`
-	Jurisdiction types.String `tfsdk:"jurisdiction" json:"jurisdiction,computed_optional"`
+	Jurisdiction types.String `tfsdk:"jurisdiction" json:"jurisdiction,computed_optional,no_refresh"`
 }
 
 type CreateR2BucketModel struct {
 	ID           types.String `tfsdk:"id" json:"-,computed"`
 	Name         types.String `tfsdk:"name" json:"name,required"`
 	AccountID    types.String `tfsdk:"account_id" path:"account_id,required"`
 	Location     types.String `tfsdk:"location" json:"locationHint,computed_optional"`
-	Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	StorageClass types.String `tfsdk:"storage_class" json:"storageClass,computed_optional"`
 	CreationDate types.String `tfsdk:"creation_date" json:"-,computed"`
 }
diff --git a/internal/services/r2_bucket_cors/model.go b/internal/services/r2_bucket_cors/model.go
@@ -14,7 +14,7 @@ type R2BucketCORSResultEnvelope struct {
 type R2BucketCORSModel struct {
 	AccountID    types.String               `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String               `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String               `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String               `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Rules        *[]*R2BucketCORSRulesModel `tfsdk:"rules" json:"rules,optional"`
 }
 
diff --git a/internal/services/r2_bucket_event_notification/model.go b/internal/services/r2_bucket_event_notification/model.go
@@ -17,7 +17,7 @@ type R2BucketEventNotificationModel struct {
 	QueueID      types.String                            `tfsdk:"queue_id" path:"queue_id,required"`
 	Rules        *[]*R2BucketEventNotificationRulesModel `tfsdk:"rules" json:"rules,optional"`
 	QueueName    types.String                            `tfsdk:"queue_name" json:"queueName,computed"`
-	Jurisdiction types.String                            `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String                            `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 }
 
 func (m R2BucketEventNotificationModel) MarshalJSON() (data []byte, err error) {
diff --git a/internal/services/r2_bucket_lifecycle/model.go b/internal/services/r2_bucket_lifecycle/model.go
@@ -15,7 +15,7 @@ type R2BucketLifecycleResultEnvelope struct {
 type R2BucketLifecycleModel struct {
 	AccountID    types.String                    `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String                    `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String                    `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String                    `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Rules        *[]*R2BucketLifecycleRulesModel `tfsdk:"rules" json:"rules,optional"`
 }
 
diff --git a/internal/services/r2_bucket_lock/model.go b/internal/services/r2_bucket_lock/model.go
@@ -15,7 +15,7 @@ type R2BucketLockResultEnvelope struct {
 type R2BucketLockModel struct {
 	AccountID    types.String               `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String               `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String               `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String               `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Rules        *[]*R2BucketLockRulesModel `tfsdk:"rules" json:"rules,optional"`
 }
 
diff --git a/internal/services/r2_bucket_sippy/model.go b/internal/services/r2_bucket_sippy/model.go
@@ -14,7 +14,7 @@ type R2BucketSippyResultEnvelope struct {
 type R2BucketSippyModel struct {
 	AccountID    types.String                   `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String                   `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String                   `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String                   `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Destination  *R2BucketSippyDestinationModel `tfsdk:"destination" json:"destination,optional"`
 	Source       *R2BucketSippySourceModel      `tfsdk:"source" json:"source,optional"`
 	Enabled      types.Bool                     `tfsdk:"enabled" json:"enabled,computed"`
diff --git a/internal/services/r2_custom_domain/model.go b/internal/services/r2_custom_domain/model.go
@@ -15,7 +15,7 @@ type R2CustomDomainResultEnvelope struct {
 type R2CustomDomainModel struct {
 	AccountID    types.String                                        `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String                                        `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String                                        `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String                                        `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Domain       types.String                                        `tfsdk:"domain" json:"domain,required"`
 	ZoneID       types.String                                        `tfsdk:"zone_id" json:"zoneId,required"`
 	Enabled      types.Bool                                          `tfsdk:"enabled" json:"enabled,required"`
diff --git a/internal/services/r2_managed_domain/model.go b/internal/services/r2_managed_domain/model.go
@@ -14,7 +14,7 @@ type R2ManagedDomainResultEnvelope struct {
 type R2ManagedDomainModel struct {
 	AccountID    types.String `tfsdk:"account_id" path:"account_id,required"`
 	BucketName   types.String `tfsdk:"bucket_name" path:"bucket_name,required"`
-	Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
+	Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
 	Enabled      types.Bool   `tfsdk:"enabled" json:"enabled,required"`
 	BucketID     types.String `tfsdk:"bucket_id" json:"bucketId,computed"`
 	Domain       types.String `tfsdk:"domain" json:"domain,computed"`

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type R2BucketCORSResultEnvelope struct {`
`14`	`14`	`type R2BucketCORSModel struct {`
`15`	`15`	AccountID types.String `tfsdk:"account_id" path:"account_id,required"`
`16`	`16`	BucketName types.String `tfsdk:"bucket_name" path:"bucket_name,required"`
`17`		- Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
	`17`	+ Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
`18`	`18`	Rules []R2BucketCORSRulesModel `tfsdk:"rules" json:"rules,optional"`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type R2BucketEventNotificationModel struct {`
`17`	`17`	QueueID types.String `tfsdk:"queue_id" path:"queue_id,required"`
`18`	`18`	Rules []R2BucketEventNotificationRulesModel `tfsdk:"rules" json:"rules,optional"`
`19`	`19`	QueueName types.String `tfsdk:"queue_name" json:"queueName,computed"`
`20`		- Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
	`20`	+ Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func (m R2BucketEventNotificationModel) MarshalJSON() (data []byte, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type R2BucketLifecycleResultEnvelope struct {`
`15`	`15`	`type R2BucketLifecycleModel struct {`
`16`	`16`	AccountID types.String `tfsdk:"account_id" path:"account_id,required"`
`17`	`17`	BucketName types.String `tfsdk:"bucket_name" path:"bucket_name,required"`
`18`		- Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
	`18`	+ Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
`19`	`19`	Rules []R2BucketLifecycleRulesModel `tfsdk:"rules" json:"rules,optional"`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type R2BucketLockResultEnvelope struct {`
`15`	`15`	`type R2BucketLockModel struct {`
`16`	`16`	AccountID types.String `tfsdk:"account_id" path:"account_id,required"`
`17`	`17`	BucketName types.String `tfsdk:"bucket_name" path:"bucket_name,required"`
`18`		- Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional"`
	`18`	+ Jurisdiction types.String `tfsdk:"jurisdiction" json:"-,computed_optional,no_refresh"`
`19`	`19`	Rules []R2BucketLockRulesModel `tfsdk:"rules" json:"rules,optional"`
`20`	`20`	`}`
`21`	`21`