Skip to content

Commit 5990800

Browse files
authored
Make messages consistent, validate parameters modifications, and remove unnecessary terminal exceptions (#54)
Issue #, if available: 1. Some messages are not consistent. 2. e2e test only validates single parameter change for Parameter Group. 3. generator.yaml file has some unnecessary terminal exception. Description of changes: 1. Keep messages consistent. 2. Use e2e test to validate modifying every parameters at the same time. 4. Remove unnecessary terminal exceptions. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 8c9fb09 commit 5990800

File tree

11 files changed

+431
-93
lines changed

11 files changed

+431
-93
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2023-03-02T19:20:54Z"
2+
build_date: "2023-03-03T20:58:18Z"
33
build_hash: d0f3d78cbea8061f822cbceac3786128f091efe6
44
go_version: go1.19
55
version: v0.24.2
66
api_directory_checksum: 321c79032b9f73aba90926b35167e224f577ecd6
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93
99
generator_config_info:
10-
file_checksum: 99d34352ff773953425db4a1251affc22aa523e9
10+
file_checksum: c1d34ab8fe5fc4fa9f0fcc7098afa04a4701e675
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ resources:
1010
code: ClusterNotFoundFault
1111
terminal_codes:
1212
- ClusterAlreadyExistsFault
13-
- ClusterQuotaForCustomerExceededFault
14-
- NodeQuotaForClusterExceededFault
15-
- NodeQuotaForCustomerExceededFault
16-
- InsufficientClusterCapacityFault
17-
- ShardsPerClusterQuotaExceededFault
1813
- InvalidParameterValueException
1914
- InvalidParameterCombinationException
20-
- TagQuotaPerResourceExceeded
2115
- NoOperationFault
2216
renames:
2317
operations:
@@ -97,14 +91,10 @@ resources:
9791
404:
9892
code: SubnetGroupNotFoundFault
9993
terminal_codes:
100-
- SubnetGroupAlreadyExistsFault
101-
- SubnetGroupQuotaExceededFault
102-
- SubnetQuotaExceededFault
10394
- InvalidSubnet
104-
- SubnetNotAllowedFault
105-
- TagQuotaPerResourceExceeded
106-
- SubnetInUse
10795
- InvalidParameterValueException
96+
- SubnetGroupAlreadyExistsFault
97+
- SubnetNotAllowedFault
10898
fields:
10999
SubnetIDs:
110100
references:
@@ -145,10 +135,8 @@ resources:
145135
- ACLAlreadyExistsFault
146136
- DefaultUserRequired
147137
- DuplicateUserNameFault
148-
- ACLQuotaExceededFault
149138
- InvalidParameterValueException
150139
- InvalidParameterCombinationException
151-
- TagQuotaPerResourceExceeded
152140
fields:
153141
UserNames:
154142
references:
@@ -188,12 +176,10 @@ resources:
188176
404:
189177
code: UserNotFoundFault
190178
terminal_codes:
191-
- InvalidParameterValueException
192179
- UserAlreadyExistsFault
193-
- UserQuotaExceededFault
180+
- InvalidParameterValueException
194181
- DuplicateUserNameFault
195182
- InvalidParameterCombinationException
196-
- TagQuotaPerResourceExceeded
197183
fields:
198184
AuthenticationMode.Passwords:
199185
is_secret: true
@@ -233,12 +219,10 @@ resources:
233219
404:
234220
code: SnapshotNotFoundFault
235221
terminal_codes:
236-
- InvalidParameterCombinationException
237-
- SnapshotAlreadyExistsFault
238-
- SnapshotQuotaExceededFault
239-
- TagQuotaPerResourceExceeded
240-
- InvalidParameterValueException
241-
- InvalidParameter
222+
- InvalidParameterCombinationException
223+
- InvalidParameterValueException
224+
- InvalidParameter
225+
- SnapshotAlreadyExistsFault
242226
fields:
243227
SourceSnapshotName:
244228
from:
@@ -293,12 +277,10 @@ resources:
293277
404:
294278
code: ParameterGroupNotFoundFault
295279
terminal_codes:
296-
- ParameterGroupQuotaExceededFault
297-
- ParameterGroupAlreadyExistsFault
298280
- InvalidParameterGroupStateFault
299281
- InvalidParameterValueException
300282
- InvalidParameterCombinationException
301-
- TagQuotaPerResourceExceeded
283+
- ParameterGroupAlreadyExistsFault
302284
fields:
303285
Name:
304286
is_primary_key: true

generator.yaml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ resources:
1010
code: ClusterNotFoundFault
1111
terminal_codes:
1212
- ClusterAlreadyExistsFault
13-
- ClusterQuotaForCustomerExceededFault
14-
- NodeQuotaForClusterExceededFault
15-
- NodeQuotaForCustomerExceededFault
16-
- InsufficientClusterCapacityFault
17-
- ShardsPerClusterQuotaExceededFault
1813
- InvalidParameterValueException
1914
- InvalidParameterCombinationException
20-
- TagQuotaPerResourceExceeded
2115
- NoOperationFault
2216
renames:
2317
operations:
@@ -97,14 +91,10 @@ resources:
9791
404:
9892
code: SubnetGroupNotFoundFault
9993
terminal_codes:
100-
- SubnetGroupAlreadyExistsFault
101-
- SubnetGroupQuotaExceededFault
102-
- SubnetQuotaExceededFault
10394
- InvalidSubnet
104-
- SubnetNotAllowedFault
105-
- TagQuotaPerResourceExceeded
106-
- SubnetInUse
10795
- InvalidParameterValueException
96+
- SubnetGroupAlreadyExistsFault
97+
- SubnetNotAllowedFault
10898
fields:
10999
SubnetIDs:
110100
references:
@@ -145,10 +135,8 @@ resources:
145135
- ACLAlreadyExistsFault
146136
- DefaultUserRequired
147137
- DuplicateUserNameFault
148-
- ACLQuotaExceededFault
149138
- InvalidParameterValueException
150139
- InvalidParameterCombinationException
151-
- TagQuotaPerResourceExceeded
152140
fields:
153141
UserNames:
154142
references:
@@ -188,12 +176,10 @@ resources:
188176
404:
189177
code: UserNotFoundFault
190178
terminal_codes:
191-
- InvalidParameterValueException
192179
- UserAlreadyExistsFault
193-
- UserQuotaExceededFault
180+
- InvalidParameterValueException
194181
- DuplicateUserNameFault
195182
- InvalidParameterCombinationException
196-
- TagQuotaPerResourceExceeded
197183
fields:
198184
AuthenticationMode.Passwords:
199185
is_secret: true
@@ -233,12 +219,10 @@ resources:
233219
404:
234220
code: SnapshotNotFoundFault
235221
terminal_codes:
236-
- InvalidParameterCombinationException
237-
- SnapshotAlreadyExistsFault
238-
- SnapshotQuotaExceededFault
239-
- TagQuotaPerResourceExceeded
240-
- InvalidParameterValueException
241-
- InvalidParameter
222+
- InvalidParameterCombinationException
223+
- InvalidParameterValueException
224+
- InvalidParameter
225+
- SnapshotAlreadyExistsFault
242226
fields:
243227
SourceSnapshotName:
244228
from:
@@ -293,12 +277,10 @@ resources:
293277
404:
294278
code: ParameterGroupNotFoundFault
295279
terminal_codes:
296-
- ParameterGroupQuotaExceededFault
297-
- ParameterGroupAlreadyExistsFault
298280
- InvalidParameterGroupStateFault
299281
- InvalidParameterValueException
300282
- InvalidParameterCombinationException
301-
- TagQuotaPerResourceExceeded
283+
- ParameterGroupAlreadyExistsFault
302284
fields:
303285
Name:
304286
is_primary_key: true

pkg/resource/acl/sdk.go

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

pkg/resource/cluster/hooks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
)
3030

3131
var (
32-
condMsgCurrentlyDeleting = "cluster currently being deleted"
33-
condMsgNoDeleteWhileUpdating = "cluster is being updated. cannot delete"
32+
condMsgCurrentlyDeleting = "cluster is currently being deleted"
33+
condMsgNoDeleteWhileUpdating = "cluster is currently being updated. cannot delete"
3434
resourceStatusAvailable string = "available"
3535
)
3636

pkg/resource/cluster/sdk.go

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

pkg/resource/parameter_group/sdk.go

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

pkg/resource/snapshot/sdk.go

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

pkg/resource/subnet_group/sdk.go

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

pkg/resource/user/sdk.go

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

0 commit comments

Comments
 (0)