Skip to content

Commit fb108c7

Browse files
modular-magicianmodular-magician
authored
Upgrade DCL to v1.39.0 (#7791) (#14396)
Signed-off-by: Modular Magician <[email protected]>
1 parent 15b2492 commit fb108c7

8 files changed

+79
-7
lines changed

‎.changelog/7791.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:enhancement
2+
gkehub: moved `google_gke_hub_feature` from beta to ga
3+
```
4+
```release-note:enhancement
5+
compute: added `dest_address_groups` and `src_address_groups` fields to `google_compute_firewall_policy_rule` and `google_compute_network_firewall_policy_rule`
6+
```

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ go 1.19
33

44
require (
55
cloud.google.com/go/bigtable v1.17.0
6-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.38.0
6+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.39.0
77
github.com/apparentlymart/go-cidr v1.1.0
88
github.com/davecgh/go-spew v1.1.1
99
github.com/dnaeon/go-vcr v1.0.1

‎go.sum

+2-6
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
4747
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4848
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4949
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
50-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.37.0 h1:lTD1OrEwktUJDTZopou9HXXiVDcKQ3f0s7/P0wsgw3M=
51-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.37.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
5250
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
5351
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
5452
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
@@ -731,7 +729,5 @@ rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
731729
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
732730
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
733731
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
734-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.38.0 h1:V+wsGvuLEFV0ba4GxnZmDvRPc0W7bwuvVV3O374d/d8=
735-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.38.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
736-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.38.0 h1:V+wsGvuLEFV0ba4GxnZmDvRPc0W7bwuvVV3O374d/d8=
737-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.38.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
732+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.39.0 h1:js9wqpbWMsjRUWCezgiw+bmZ4Jke9nkcQJLjdnQZwpc=
733+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.39.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=

‎google/resource_compute_firewall_policy_rule.go

+18
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ func ComputeFirewallPolicyRuleMatchSchema() *schema.Resource {
140140
Elem: ComputeFirewallPolicyRuleMatchLayer4ConfigsSchema(),
141141
},
142142

143+
"dest_address_groups": {
144+
Type: schema.TypeList,
145+
Optional: true,
146+
Description: "Address groups which should be matched against the traffic destination. Maximum number of destination address groups is 10. Destination address groups is only supported in Egress rules.",
147+
Elem: &schema.Schema{Type: schema.TypeString},
148+
},
149+
143150
"dest_fqdns": {
144151
Type: schema.TypeList,
145152
Optional: true,
@@ -168,6 +175,13 @@ func ComputeFirewallPolicyRuleMatchSchema() *schema.Resource {
168175
Elem: &schema.Schema{Type: schema.TypeString},
169176
},
170177

178+
"src_address_groups": {
179+
Type: schema.TypeList,
180+
Optional: true,
181+
Description: "Address groups which should be matched against the traffic source. Maximum number of source address groups is 10. Source address groups is only supported in Ingress rules.",
182+
Elem: &schema.Schema{Type: schema.TypeString},
183+
},
184+
171185
"src_fqdns": {
172186
Type: schema.TypeList,
173187
Optional: true,
@@ -468,10 +482,12 @@ func expandComputeFirewallPolicyRuleMatch(o interface{}) *compute.FirewallPolicy
468482
obj := objArr[0].(map[string]interface{})
469483
return &compute.FirewallPolicyRuleMatch{
470484
Layer4Configs: expandComputeFirewallPolicyRuleMatchLayer4ConfigsArray(obj["layer4_configs"]),
485+
DestAddressGroups: expandStringArray(obj["dest_address_groups"]),
471486
DestFqdns: expandStringArray(obj["dest_fqdns"]),
472487
DestIPRanges: expandStringArray(obj["dest_ip_ranges"]),
473488
DestRegionCodes: expandStringArray(obj["dest_region_codes"]),
474489
DestThreatIntelligences: expandStringArray(obj["dest_threat_intelligences"]),
490+
SrcAddressGroups: expandStringArray(obj["src_address_groups"]),
475491
SrcFqdns: expandStringArray(obj["src_fqdns"]),
476492
SrcIPRanges: expandStringArray(obj["src_ip_ranges"]),
477493
SrcRegionCodes: expandStringArray(obj["src_region_codes"]),
@@ -485,10 +501,12 @@ func flattenComputeFirewallPolicyRuleMatch(obj *compute.FirewallPolicyRuleMatch)
485501
}
486502
transformed := map[string]interface{}{
487503
"layer4_configs": flattenComputeFirewallPolicyRuleMatchLayer4ConfigsArray(obj.Layer4Configs),
504+
"dest_address_groups": obj.DestAddressGroups,
488505
"dest_fqdns": obj.DestFqdns,
489506
"dest_ip_ranges": obj.DestIPRanges,
490507
"dest_region_codes": obj.DestRegionCodes,
491508
"dest_threat_intelligences": obj.DestThreatIntelligences,
509+
"src_address_groups": obj.SrcAddressGroups,
492510
"src_fqdns": obj.SrcFqdns,
493511
"src_ip_ranges": obj.SrcIPRanges,
494512
"src_region_codes": obj.SrcRegionCodes,

‎google/resource_compute_network_firewall_policy_rule.go

+18
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ func ComputeNetworkFirewallPolicyRuleMatchSchema() *schema.Resource {
154154
Elem: ComputeNetworkFirewallPolicyRuleMatchLayer4ConfigsSchema(),
155155
},
156156

157+
"dest_address_groups": {
158+
Type: schema.TypeList,
159+
Optional: true,
160+
Description: "Address groups which should be matched against the traffic destination. Maximum number of destination address groups is 10. Destination address groups is only supported in Egress rules.",
161+
Elem: &schema.Schema{Type: schema.TypeString},
162+
},
163+
157164
"dest_fqdns": {
158165
Type: schema.TypeList,
159166
Optional: true,
@@ -182,6 +189,13 @@ func ComputeNetworkFirewallPolicyRuleMatchSchema() *schema.Resource {
182189
Elem: &schema.Schema{Type: schema.TypeString},
183190
},
184191

192+
"src_address_groups": {
193+
Type: schema.TypeList,
194+
Optional: true,
195+
Description: "Address groups which should be matched against the traffic source. Maximum number of source address groups is 10. Source address groups is only supported in Ingress rules.",
196+
Elem: &schema.Schema{Type: schema.TypeString},
197+
},
198+
185199
"src_fqdns": {
186200
Type: schema.TypeList,
187201
Optional: true,
@@ -558,10 +572,12 @@ func expandComputeNetworkFirewallPolicyRuleMatch(o interface{}) *compute.Network
558572
obj := objArr[0].(map[string]interface{})
559573
return &compute.NetworkFirewallPolicyRuleMatch{
560574
Layer4Configs: expandComputeNetworkFirewallPolicyRuleMatchLayer4ConfigsArray(obj["layer4_configs"]),
575+
DestAddressGroups: expandStringArray(obj["dest_address_groups"]),
561576
DestFqdns: expandStringArray(obj["dest_fqdns"]),
562577
DestIPRanges: expandStringArray(obj["dest_ip_ranges"]),
563578
DestRegionCodes: expandStringArray(obj["dest_region_codes"]),
564579
DestThreatIntelligences: expandStringArray(obj["dest_threat_intelligences"]),
580+
SrcAddressGroups: expandStringArray(obj["src_address_groups"]),
565581
SrcFqdns: expandStringArray(obj["src_fqdns"]),
566582
SrcIPRanges: expandStringArray(obj["src_ip_ranges"]),
567583
SrcRegionCodes: expandStringArray(obj["src_region_codes"]),
@@ -576,10 +592,12 @@ func flattenComputeNetworkFirewallPolicyRuleMatch(obj *compute.NetworkFirewallPo
576592
}
577593
transformed := map[string]interface{}{
578594
"layer4_configs": flattenComputeNetworkFirewallPolicyRuleMatchLayer4ConfigsArray(obj.Layer4Configs),
595+
"dest_address_groups": obj.DestAddressGroups,
579596
"dest_fqdns": obj.DestFqdns,
580597
"dest_ip_ranges": obj.DestIPRanges,
581598
"dest_region_codes": obj.DestRegionCodes,
582599
"dest_threat_intelligences": obj.DestThreatIntelligences,
600+
"src_address_groups": obj.SrcAddressGroups,
583601
"src_fqdns": obj.SrcFqdns,
584602
"src_ip_ranges": obj.SrcIPRanges,
585603
"src_region_codes": obj.SrcRegionCodes,

‎google/resource_compute_region_network_firewall_policy_rule.go

+18
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ func ComputeRegionNetworkFirewallPolicyRuleMatchSchema() *schema.Resource {
162162
Elem: ComputeRegionNetworkFirewallPolicyRuleMatchLayer4ConfigsSchema(),
163163
},
164164

165+
"dest_address_groups": {
166+
Type: schema.TypeList,
167+
Optional: true,
168+
Description: "Address groups which should be matched against the traffic destination. Maximum number of destination address groups is 10. Destination address groups is only supported in Egress rules.",
169+
Elem: &schema.Schema{Type: schema.TypeString},
170+
},
171+
165172
"dest_fqdns": {
166173
Type: schema.TypeList,
167174
Optional: true,
@@ -190,6 +197,13 @@ func ComputeRegionNetworkFirewallPolicyRuleMatchSchema() *schema.Resource {
190197
Elem: &schema.Schema{Type: schema.TypeString},
191198
},
192199

200+
"src_address_groups": {
201+
Type: schema.TypeList,
202+
Optional: true,
203+
Description: "Address groups which should be matched against the traffic source. Maximum number of source address groups is 10. Source address groups is only supported in Ingress rules.",
204+
Elem: &schema.Schema{Type: schema.TypeString},
205+
},
206+
193207
"src_fqdns": {
194208
Type: schema.TypeList,
195209
Optional: true,
@@ -590,10 +604,12 @@ func expandComputeRegionNetworkFirewallPolicyRuleMatch(o interface{}) *compute.N
590604
obj := objArr[0].(map[string]interface{})
591605
return &compute.NetworkFirewallPolicyRuleMatch{
592606
Layer4Configs: expandComputeRegionNetworkFirewallPolicyRuleMatchLayer4ConfigsArray(obj["layer4_configs"]),
607+
DestAddressGroups: expandStringArray(obj["dest_address_groups"]),
593608
DestFqdns: expandStringArray(obj["dest_fqdns"]),
594609
DestIPRanges: expandStringArray(obj["dest_ip_ranges"]),
595610
DestRegionCodes: expandStringArray(obj["dest_region_codes"]),
596611
DestThreatIntelligences: expandStringArray(obj["dest_threat_intelligences"]),
612+
SrcAddressGroups: expandStringArray(obj["src_address_groups"]),
597613
SrcFqdns: expandStringArray(obj["src_fqdns"]),
598614
SrcIPRanges: expandStringArray(obj["src_ip_ranges"]),
599615
SrcRegionCodes: expandStringArray(obj["src_region_codes"]),
@@ -608,10 +624,12 @@ func flattenComputeRegionNetworkFirewallPolicyRuleMatch(obj *compute.NetworkFire
608624
}
609625
transformed := map[string]interface{}{
610626
"layer4_configs": flattenComputeRegionNetworkFirewallPolicyRuleMatchLayer4ConfigsArray(obj.Layer4Configs),
627+
"dest_address_groups": obj.DestAddressGroups,
611628
"dest_fqdns": obj.DestFqdns,
612629
"dest_ip_ranges": obj.DestIPRanges,
613630
"dest_region_codes": obj.DestRegionCodes,
614631
"dest_threat_intelligences": obj.DestThreatIntelligences,
632+
"src_address_groups": obj.SrcAddressGroups,
615633
"src_fqdns": obj.SrcFqdns,
616634
"src_ip_ranges": obj.SrcIPRanges,
617635
"src_region_codes": obj.SrcRegionCodes,

‎website/docs/r/compute_network_firewall_policy_rule.html.markdown

+8
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ The following arguments are supported:
107107

108108
The `match` block supports:
109109

110+
* `dest_address_groups` -
111+
(Optional)
112+
Address groups which should be matched against the traffic destination. Maximum number of destination address groups is 10. Destination address groups is only supported in Egress rules.
113+
110114
* `dest_fqdns` -
111115
(Optional)
112116
Domain names that will be used to match against the resolved domain name of destination of traffic. Can only be specified if DIRECTION is egress.
@@ -127,6 +131,10 @@ The `match` block supports:
127131
(Required)
128132
Pairs of IP protocols and ports that the rule should match.
129133

134+
* `src_address_groups` -
135+
(Optional)
136+
Address groups which should be matched against the traffic source. Maximum number of source address groups is 10. Source address groups is only supported in Ingress rules.
137+
130138
* `src_fqdns` -
131139
(Optional)
132140
Domain names that will be used to match against the resolved domain name of source of traffic. Can only be specified if DIRECTION is ingress.

‎website/docs/r/compute_region_network_firewall_policy_rule.html.markdown

+8
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ The following arguments are supported:
110110

111111
The `match` block supports:
112112

113+
* `dest_address_groups` -
114+
(Optional)
115+
Address groups which should be matched against the traffic destination. Maximum number of destination address groups is 10. Destination address groups is only supported in Egress rules.
116+
113117
* `dest_fqdns` -
114118
(Optional)
115119
Domain names that will be used to match against the resolved domain name of destination of traffic. Can only be specified if DIRECTION is egress.
@@ -130,6 +134,10 @@ The `match` block supports:
130134
(Required)
131135
Pairs of IP protocols and ports that the rule should match.
132136

137+
* `src_address_groups` -
138+
(Optional)
139+
Address groups which should be matched against the traffic source. Maximum number of source address groups is 10. Source address groups is only supported in Ingress rules.
140+
133141
* `src_fqdns` -
134142
(Optional)
135143
Domain names that will be used to match against the resolved domain name of source of traffic. Can only be specified if DIRECTION is ingress.

0 commit comments

Comments
 (0)