Skip to content

ServicePackageResourceRegion: Use factory functions #42548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 13, 2025
Merged

ServicePackageResourceRegion: Use factory functions #42548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c63310e
ServicePackageResourceRegion: Fields only set for exceptions.
ewbankkit May 8, 2025
56774ba
Run 'make gen'.
ewbankkit May 8, 2025
bee779c
provider: Flip defaults.
ewbankkit May 8, 2025
152ce54
provider: Consistent use of 'isRegionOverrideEnabled'.
ewbankkit May 8, 2025
ff3e087
d/aws_cloudfront_log_delivery_canonical_user_id: CloudFront is a glob…
ewbankkit May 8, 2025
5a0633f
Revert "provider: Flip defaults."
ewbankkit May 13, 2025
5684aad
Revert "Run 'make gen'."
ewbankkit May 13, 2025
50be85c
Revert "ServicePackageResourceRegion: Fields only set for exceptions."
ewbankkit May 13, 2025
3aa9bc0
Merge branch 'release/6.0.0-beta' into td-new-ServicePackageRegion-fi…
ewbankkit May 13, 2025
97dc627
Add 'inttypes.ResourceRegionDefault'.
ewbankkit May 13, 2025
520f389
generate/servicepackage: Emit 'inttypes.ResourceRegionDefault()' for …
ewbankkit May 13, 2025
b8b0269
Run 'make gen'.
ewbankkit May 13, 2025
b7d0df4
Add 'inttypes.ResourceRegionDisabled'.
ewbankkit May 13, 2025
e713bc2
generate/servicepackage: Emit 'inttypes.ResourceRegionDisabled()' whe…
ewbankkit May 13, 2025
f06e675
Run 'make gen'.
ewbankkit May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 38 additions & 18 deletions internal/generate/servicepackage/file.gtpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ func (p *servicePackage) EphemeralResources(ctx context.Context) []*inttypes.Ser
{{- range $key, $value := .EphemeralResources }}
{{- $regionOverrideEnabled := and (not $.IsGlobal) $value.RegionOverrideEnabled }}
{
Factory: {{ $value.FactoryName }},
TypeName: "{{ $key }}",
Name: "{{ $value.Name }}",
Factory: {{ $value.FactoryName }},
TypeName: "{{ $key }}",
Name: "{{ $value.Name }}",
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
Region: unique.Make(inttypes.ResourceRegionDefault()),
{{- else if not $regionOverrideEnabled }}
Region: unique.Make(inttypes.ResourceRegionDisabled()),
{{- else }}
Region: unique.Make(inttypes.ServicePackageResourceRegion {
IsOverrideEnabled: {{ $regionOverrideEnabled }},
{{- if $regionOverrideEnabled }}
IsOverrideEnabled: {{ $regionOverrideEnabled }},
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
{{- end }}
}),
{{- end }}
},
{{- end }}
}
Expand All @@ -62,12 +66,16 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.S
{{- end }}
}),
{{- end }}
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
Region: unique.Make(inttypes.ResourceRegionDefault()),
{{- else if not $regionOverrideEnabled }}
Region: unique.Make(inttypes.ResourceRegionDisabled()),
{{- else }}
Region: unique.Make(inttypes.ServicePackageResourceRegion {
IsOverrideEnabled: {{ $regionOverrideEnabled }},
{{- if $regionOverrideEnabled }}
IsOverrideEnabled: {{ $regionOverrideEnabled }},
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
{{- end }}
}),
{{- end }}
},
{{- end }}
}
Expand All @@ -91,12 +99,16 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser
{{- end }}
}),
{{- end }}
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
Region: unique.Make(inttypes.ResourceRegionDefault()),
{{- else if not $regionOverrideEnabled }}
Region: unique.Make(inttypes.ResourceRegionDisabled()),
{{- else }}
Region: unique.Make(inttypes.ServicePackageResourceRegion {
IsOverrideEnabled: {{ $regionOverrideEnabled }},
{{- if $regionOverrideEnabled }}
IsOverrideEnabled: {{ $regionOverrideEnabled }},
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
{{- end }}
}),
{{- end }}
},
{{- end }}
}
Expand All @@ -120,12 +132,16 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.Service
{{- end }}
}),
{{- end }}
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
Region: unique.Make(inttypes.ResourceRegionDefault()),
{{- else if not $regionOverrideEnabled }}
Region: unique.Make(inttypes.ResourceRegionDisabled()),
{{- else }}
Region: unique.Make(inttypes.ServicePackageResourceRegion {
IsOverrideEnabled: {{ $regionOverrideEnabled }},
{{- if $regionOverrideEnabled }}
IsOverrideEnabled: {{ $regionOverrideEnabled }},
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
{{- end }}
}),
{{- end }}
},
{{- end }}
}
Expand All @@ -149,12 +165,16 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa
{{- end }}
}),
{{- end }}
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
Region: unique.Make(inttypes.ResourceRegionDefault()),
{{- else if not $regionOverrideEnabled }}
Region: unique.Make(inttypes.ResourceRegionDisabled()),
{{- else }}
Region: unique.Make(inttypes.ServicePackageResourceRegion {
IsOverrideEnabled: {{ $regionOverrideEnabled }},
{{- if $regionOverrideEnabled }}
IsOverrideEnabled: {{ $regionOverrideEnabled }},
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
{{- end }}
}),
{{- end }}
},
{{- end }}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/fwprovider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ func (p *fwprovider) initialize(ctx context.Context) error {
var diags diag.Diagnostics
var overrideRegion string

if !tfunique.IsHandleNil(v.Region) && v.Region.Value().IsOverrideEnabled && getAttribute != nil {
if isRegionOverrideEnabled && getAttribute != nil {
var target types.String
diags.Append(getAttribute(ctx, path.Root(names.AttrRegion), &target)...)
if diags.HasError() {
Expand Down Expand Up @@ -491,7 +491,7 @@ func (p *fwprovider) initialize(ctx context.Context) error {
var diags diag.Diagnostics
var overrideRegion string

if !tfunique.IsHandleNil(v.Region) && v.Region.Value().IsOverrideEnabled && getAttribute != nil {
if isRegionOverrideEnabled && getAttribute != nil {
var target types.String
diags.Append(getAttribute(ctx, path.Root(names.AttrRegion), &target)...)
if diags.HasError() {
Expand Down Expand Up @@ -557,7 +557,7 @@ func (p *fwprovider) initialize(ctx context.Context) error {
var diags diag.Diagnostics
var overrideRegion string

if !tfunique.IsHandleNil(v.Region) && v.Region.Value().IsOverrideEnabled && getAttribute != nil {
if isRegionOverrideEnabled && getAttribute != nil {
var target types.String
diags.Append(getAttribute(ctx, path.Root(names.AttrRegion), &target)...)
if diags.HasError() {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ func initialize(ctx context.Context, provider *schema.Provider) (map[string]conn
bootstrapContext: func(ctx context.Context, getAttribute getAttributeFunc, meta any) (context.Context, error) {
var overrideRegion string

if v := v.Region; !tfunique.IsHandleNil(v) && v.Value().IsOverrideEnabled && getAttribute != nil {
if isRegionOverrideEnabled && getAttribute != nil {
if region, ok := getAttribute(names.AttrRegion); ok {
overrideRegion = region.(string)
}
Expand Down
10 changes: 2 additions & 8 deletions internal/service/accessanalyzer/service_package_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions internal/service/account/service_package_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 3 additions & 12 deletions internal/service/acm/service_package_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 7 additions & 28 deletions internal/service/acmpca/service_package_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 7 additions & 28 deletions internal/service/amp/service_package_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading