Skip to content

Commit 5357ad5

Browse files
ewbankkitewbankkit
authored
Merge pull request #42548 from hashicorp/td-new-ServicePackageRegion-field-names
`ServicePackageResourceRegion`: Use factory functions
2 parents 17c081a + f06e675 commit 5357ad5

File tree

233 files changed

+2151
-8124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+2151
-8124
lines changed

‎internal/generate/servicepackage/file.gtpl

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@ func (p *servicePackage) EphemeralResources(ctx context.Context) []*inttypes.Ser
2929
{{- range $key, $value := .EphemeralResources }}
3030
{{- $regionOverrideEnabled := and (not $.IsGlobal) $value.RegionOverrideEnabled }}
3131
{
32-
Factory: {{ $value.FactoryName }},
33-
TypeName: "{{ $key }}",
34-
Name: "{{ $value.Name }}",
32+
Factory: {{ $value.FactoryName }},
33+
TypeName: "{{ $key }}",
34+
Name: "{{ $value.Name }}",
35+
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
36+
Region: unique.Make(inttypes.ResourceRegionDefault()),
37+
{{- else if not $regionOverrideEnabled }}
38+
Region: unique.Make(inttypes.ResourceRegionDisabled()),
39+
{{- else }}
3540
Region: unique.Make(inttypes.ServicePackageResourceRegion {
36-
IsOverrideEnabled: {{ $regionOverrideEnabled }},
37-
{{- if $regionOverrideEnabled }}
41+
IsOverrideEnabled: {{ $regionOverrideEnabled }},
3842
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
39-
{{- end }}
4043
}),
44+
{{- end }}
4145
},
4246
{{- end }}
4347
}
@@ -62,12 +66,16 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.S
6266
{{- end }}
6367
}),
6468
{{- end }}
69+
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
70+
Region: unique.Make(inttypes.ResourceRegionDefault()),
71+
{{- else if not $regionOverrideEnabled }}
72+
Region: unique.Make(inttypes.ResourceRegionDisabled()),
73+
{{- else }}
6574
Region: unique.Make(inttypes.ServicePackageResourceRegion {
66-
IsOverrideEnabled: {{ $regionOverrideEnabled }},
67-
{{- if $regionOverrideEnabled }}
75+
IsOverrideEnabled: {{ $regionOverrideEnabled }},
6876
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
69-
{{- end }}
7077
}),
78+
{{- end }}
7179
},
7280
{{- end }}
7381
}
@@ -91,12 +99,16 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser
9199
{{- end }}
92100
}),
93101
{{- end }}
102+
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
103+
Region: unique.Make(inttypes.ResourceRegionDefault()),
104+
{{- else if not $regionOverrideEnabled }}
105+
Region: unique.Make(inttypes.ResourceRegionDisabled()),
106+
{{- else }}
94107
Region: unique.Make(inttypes.ServicePackageResourceRegion {
95-
IsOverrideEnabled: {{ $regionOverrideEnabled }},
96-
{{- if $regionOverrideEnabled }}
108+
IsOverrideEnabled: {{ $regionOverrideEnabled }},
97109
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
98-
{{- end }}
99110
}),
111+
{{- end }}
100112
},
101113
{{- end }}
102114
}
@@ -120,12 +132,16 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.Service
120132
{{- end }}
121133
}),
122134
{{- end }}
135+
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
136+
Region: unique.Make(inttypes.ResourceRegionDefault()),
137+
{{- else if not $regionOverrideEnabled }}
138+
Region: unique.Make(inttypes.ResourceRegionDisabled()),
139+
{{- else }}
123140
Region: unique.Make(inttypes.ServicePackageResourceRegion {
124-
IsOverrideEnabled: {{ $regionOverrideEnabled }},
125-
{{- if $regionOverrideEnabled }}
141+
IsOverrideEnabled: {{ $regionOverrideEnabled }},
126142
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
127-
{{- end }}
128143
}),
144+
{{- end }}
129145
},
130146
{{- end }}
131147
}
@@ -149,12 +165,16 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa
149165
{{- end }}
150166
}),
151167
{{- end }}
168+
{{- if and $regionOverrideEnabled $value.ValidateRegionOverrideInPartition }}
169+
Region: unique.Make(inttypes.ResourceRegionDefault()),
170+
{{- else if not $regionOverrideEnabled }}
171+
Region: unique.Make(inttypes.ResourceRegionDisabled()),
172+
{{- else }}
152173
Region: unique.Make(inttypes.ServicePackageResourceRegion {
153-
IsOverrideEnabled: {{ $regionOverrideEnabled }},
154-
{{- if $regionOverrideEnabled }}
174+
IsOverrideEnabled: {{ $regionOverrideEnabled }},
155175
IsValidateOverrideInPartition: {{ $value.ValidateRegionOverrideInPartition }},
156-
{{- end }}
157176
}),
177+
{{- end }}
158178
},
159179
{{- end }}
160180
}

‎internal/provider/fwprovider/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ func (p *fwprovider) initialize(ctx context.Context) error {
431431
var diags diag.Diagnostics
432432
var overrideRegion string
433433

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

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

560-
if !tfunique.IsHandleNil(v.Region) && v.Region.Value().IsOverrideEnabled && getAttribute != nil {
560+
if isRegionOverrideEnabled && getAttribute != nil {
561561
var target types.String
562562
diags.Append(getAttribute(ctx, path.Root(names.AttrRegion), &target)...)
563563
if diags.HasError() {

‎internal/provider/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ func initialize(ctx context.Context, provider *schema.Provider) (map[string]conn
397397
bootstrapContext: func(ctx context.Context, getAttribute getAttributeFunc, meta any) (context.Context, error) {
398398
var overrideRegion string
399399

400-
if v := v.Region; !tfunique.IsHandleNil(v) && v.Value().IsOverrideEnabled && getAttribute != nil {
400+
if isRegionOverrideEnabled && getAttribute != nil {
401401
if region, ok := getAttribute(names.AttrRegion); ok {
402402
overrideRegion = region.(string)
403403
}

‎internal/service/accessanalyzer/service_package_gen.go

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/service/account/service_package_gen.go

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/service/acm/service_package_gen.go

Lines changed: 3 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/service/acmpca/service_package_gen.go

Lines changed: 7 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/service/amp/service_package_gen.go

Lines changed: 7 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)