Skip to content

Commit 27267cd

Browse files
committed
overwrite json tag from type_ to type
1 parent 239a645 commit 27267cd

File tree

7 files changed

+35
-31
lines changed

7 files changed

+35
-31
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2024-08-14T20:57:57Z"
3-
build_hash: 959eaa58cf17d1fd3ce540bf4e9b4184d08f65b5
2+
build_date: "2024-08-20T10:41:38Z"
3+
build_hash: c21388119d9be1199723e540ec0104b313584348
44
go_version: go1.22.4
5-
version: v0.37.0-2-g959eaa5
6-
api_directory_checksum: 9439fa48b95ef9c3a8f4c185837a26d9a22d92be
5+
version: v0.37.0-3-gc213881
6+
api_directory_checksum: 1fa0bea0d73a6d3247f20681705b27270d0479f9
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.51.21
99
generator_config_info:
10-
file_checksum: e4f1c19e9e20c5be89330c64ff3459004564f080
10+
file_checksum: 5b59fb2b115cdbf88fdd8ea6723a7f1a90470f7d
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ resources:
4848
is_immutable: true
4949
Capacity:
5050
is_immutable: true
51+
Rules.Statement.ByteMatchStatement.TextTransformations.Type:
52+
go_tag: json:"type,omitempty"
5153
hooks:
5254
sdk_read_one_pre_build_request:
5355
template_path: hooks/rulegroup/sdk_read_one_pre_build_request.go.tpl

apis/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/wafv2.services.k8s.aws_rulegroups.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ spec:
814814
priority:
815815
format: int64
816816
type: integer
817-
type_:
817+
type:
818818
type: string
819819
type: object
820820
type: array
@@ -1789,7 +1789,7 @@ spec:
17891789
priority:
17901790
format: int64
17911791
type: integer
1792-
type_:
1792+
type:
17931793
type: string
17941794
type: object
17951795
type: array
@@ -1840,7 +1840,7 @@ spec:
18401840
priority:
18411841
format: int64
18421842
type: integer
1843-
type_:
1843+
type:
18441844
type: string
18451845
type: object
18461846
type: array
@@ -1911,7 +1911,7 @@ spec:
19111911
priority:
19121912
format: int64
19131913
type: integer
1914-
type_:
1914+
type:
19151915
type: string
19161916
type: object
19171917
type: array
@@ -1932,7 +1932,7 @@ spec:
19321932
priority:
19331933
format: int64
19341934
type: integer
1935-
type_:
1935+
type:
19361936
type: string
19371937
type: object
19381938
type: array
@@ -1953,7 +1953,7 @@ spec:
19531953
priority:
19541954
format: int64
19551955
type: integer
1956-
type_:
1956+
type:
19571957
type: string
19581958
type: object
19591959
type: array
@@ -2329,7 +2329,7 @@ spec:
23292329
priority:
23302330
format: int64
23312331
type: integer
2332-
type_:
2332+
type:
23332333
type: string
23342334
type: object
23352335
type: array
@@ -2683,7 +2683,7 @@ spec:
26832683
priority:
26842684
format: int64
26852685
type: integer
2686-
type_:
2686+
type:
26872687
type: string
26882688
type: object
26892689
type: array
@@ -3324,7 +3324,7 @@ spec:
33243324
priority:
33253325
format: int64
33263326
type: integer
3327-
type_:
3327+
type:
33283328
type: string
33293329
type: object
33303330
type: array
@@ -3669,7 +3669,7 @@ spec:
36693669
priority:
36703670
format: int64
36713671
type: integer
3672-
type_:
3672+
type:
36733673
type: string
36743674
type: object
36753675
type: array
@@ -4012,7 +4012,7 @@ spec:
40124012
priority:
40134013
format: int64
40144014
type: integer
4015-
type_:
4015+
type:
40164016
type: string
40174017
type: object
40184018
type: array

generator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ resources:
4848
is_immutable: true
4949
Capacity:
5050
is_immutable: true
51+
Rules.Statement.ByteMatchStatement.TextTransformations.Type:
52+
go_tag: json:"type,omitempty"
5153
hooks:
5254
sdk_read_one_pre_build_request:
5355
template_path: hooks/rulegroup/sdk_read_one_pre_build_request.go.tpl

helm/crds/wafv2.services.k8s.aws_rulegroups.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ spec:
814814
priority:
815815
format: int64
816816
type: integer
817-
type_:
817+
type:
818818
type: string
819819
type: object
820820
type: array
@@ -1789,7 +1789,7 @@ spec:
17891789
priority:
17901790
format: int64
17911791
type: integer
1792-
type_:
1792+
type:
17931793
type: string
17941794
type: object
17951795
type: array
@@ -1840,7 +1840,7 @@ spec:
18401840
priority:
18411841
format: int64
18421842
type: integer
1843-
type_:
1843+
type:
18441844
type: string
18451845
type: object
18461846
type: array
@@ -1911,7 +1911,7 @@ spec:
19111911
priority:
19121912
format: int64
19131913
type: integer
1914-
type_:
1914+
type:
19151915
type: string
19161916
type: object
19171917
type: array
@@ -1932,7 +1932,7 @@ spec:
19321932
priority:
19331933
format: int64
19341934
type: integer
1935-
type_:
1935+
type:
19361936
type: string
19371937
type: object
19381938
type: array
@@ -1953,7 +1953,7 @@ spec:
19531953
priority:
19541954
format: int64
19551955
type: integer
1956-
type_:
1956+
type:
19571957
type: string
19581958
type: object
19591959
type: array
@@ -2329,7 +2329,7 @@ spec:
23292329
priority:
23302330
format: int64
23312331
type: integer
2332-
type_:
2332+
type:
23332333
type: string
23342334
type: object
23352335
type: array
@@ -2683,7 +2683,7 @@ spec:
26832683
priority:
26842684
format: int64
26852685
type: integer
2686-
type_:
2686+
type:
26872687
type: string
26882688
type: object
26892689
type: array
@@ -3324,7 +3324,7 @@ spec:
33243324
priority:
33253325
format: int64
33263326
type: integer
3327-
type_:
3327+
type:
33283328
type: string
33293329
type: object
33303330
type: array
@@ -3669,7 +3669,7 @@ spec:
36693669
priority:
36703670
format: int64
36713671
type: integer
3672-
type_:
3672+
type:
36733673
type: string
36743674
type: object
36753675
type: array
@@ -4012,7 +4012,7 @@ spec:
40124012
priority:
40134013
format: int64
40144014
type: integer
4015-
type_:
4015+
type:
40164016
type: string
40174017
type: object
40184018
type: array

test/e2e/resources/rule_group_simple.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ spec:
2828
positionalConstraint: STARTS_WITH
2929
searchString: c29tZXRoaW5n
3030
textTransformations:
31-
- type_: NONE
32-
priority: 0
31+
- type: NONE
32+
priority: 0
3333
- name: rule-2
3434
priority: 2
3535
action:
@@ -45,4 +45,4 @@ spec:
4545
- CA
4646
forwardedIPConfig:
4747
headerName: "X-Forwarded-For"
48-
fallbackBehavior: MATCH
48+
fallbackBehavior: MATCH

0 commit comments

Comments
 (0)