Skip to content

Commit f0864ae

Browse files
authored
Merge pull request #106 from jaypipes/tags
support tag updates for DBInstance
2 parents 88df03e + 58ffa81 commit f0864ae

File tree

21 files changed

+390
-216
lines changed

21 files changed

+390
-216
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2022-08-02T17:57:11Z"
2+
build_date: "2022-08-04T21:32:49Z"
33
build_hash: fe61d04673fd4d9848d5f726b01e0689a16d3733
4-
go_version: go1.18.2
4+
go_version: go1.18.1
55
version: v0.19.3-1-gfe61d04
6-
api_directory_checksum: 8ada3ef8efbea428641119f90c05dbfb65069def
6+
api_directory_checksum: 6a967cc8a62d521d4f4816dbccc48f81d0cb271d
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.27
99
generator_config_info:
10-
file_checksum: 6b1659191eae1755bf1d223f90add0c6665e9eed
10+
file_checksum: dc22b2b5295201b27341f95c1cec0b0dcead98b3
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/db_instance.go

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

apis/v1alpha1/generator.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ignore:
2020
field_paths:
2121
- CreateDBInstanceInput.DBSecurityGroups
2222
- DBInstance.DBSecurityGroups
23+
# We handle Spec.Tags separately...
24+
- "DescribeDBInstancesOutput.DBInstances.DBInstance.TagList"
2325
operations:
2426
ModifyDBCluster:
2527
override_values:
@@ -128,6 +130,10 @@ resources:
128130
from:
129131
operation: RestoreDBClusterFromSnapshot
130132
path: SnapshotIdentifier
133+
Tags:
134+
compare:
135+
# We have a custom comparison function...
136+
is_ignored: true
131137
renames:
132138
operations:
133139
CreateDBCluster:
@@ -171,6 +177,10 @@ resources:
171177
from:
172178
operation: ModifyDBClusterParameterGroup
173179
path: Parameters
180+
Tags:
181+
compare:
182+
# We have a custom comparison function...
183+
is_ignored: true
174184
DBInstance:
175185
hooks:
176186
sdk_create_pre_build_request:
@@ -259,6 +269,10 @@ resources:
259269
from:
260270
operation: CreateDBInstanceReadReplica
261271
path: PreSignedUrl
272+
Tags:
273+
compare:
274+
# We have a custom comparison function...
275+
is_ignored: true
262276
renames:
263277
operations:
264278
CreateDBInstance:
@@ -312,6 +326,10 @@ resources:
312326
from:
313327
operation: ModifyDBParameterGroup
314328
path: Parameters
329+
Tags:
330+
compare:
331+
# We have a custom comparison function...
332+
is_ignored: true
315333
DBSubnetGroup:
316334
renames:
317335
operations:
@@ -346,6 +364,10 @@ resources:
346364
fields:
347365
Name:
348366
is_primary_key: true
367+
Tags:
368+
compare:
369+
# We have a custom comparison function...
370+
is_ignored: true
349371
DBProxy:
350372
exceptions:
351373
terminal_codes:

apis/v1alpha1/types.go

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

apis/v1alpha1/zz_generated.deepcopy.go

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

config/crd/bases/rds.services.k8s.aws_dbinstances.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,17 +1255,6 @@ spec:
12551255
type: string
12561256
type: object
12571257
type: array
1258-
tagList:
1259-
items:
1260-
description: Metadata assigned to an Amazon RDS resource consisting
1261-
of a key-value pair.
1262-
properties:
1263-
key:
1264-
type: string
1265-
value:
1266-
type: string
1267-
type: object
1268-
type: array
12691258
vpcSecurityGroups:
12701259
description: Provides a list of VPC security group elements that the
12711260
DB instance belongs to.

generator.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ignore:
2020
field_paths:
2121
- CreateDBInstanceInput.DBSecurityGroups
2222
- DBInstance.DBSecurityGroups
23+
# We handle Spec.Tags separately...
24+
- "DescribeDBInstancesOutput.DBInstances.DBInstance.TagList"
2325
operations:
2426
ModifyDBCluster:
2527
override_values:
@@ -128,6 +130,10 @@ resources:
128130
from:
129131
operation: RestoreDBClusterFromSnapshot
130132
path: SnapshotIdentifier
133+
Tags:
134+
compare:
135+
# We have a custom comparison function...
136+
is_ignored: true
131137
renames:
132138
operations:
133139
CreateDBCluster:
@@ -171,6 +177,10 @@ resources:
171177
from:
172178
operation: ModifyDBClusterParameterGroup
173179
path: Parameters
180+
Tags:
181+
compare:
182+
# We have a custom comparison function...
183+
is_ignored: true
174184
DBInstance:
175185
hooks:
176186
sdk_create_pre_build_request:
@@ -259,6 +269,10 @@ resources:
259269
from:
260270
operation: CreateDBInstanceReadReplica
261271
path: PreSignedUrl
272+
Tags:
273+
compare:
274+
# We have a custom comparison function...
275+
is_ignored: true
262276
renames:
263277
operations:
264278
CreateDBInstance:
@@ -312,6 +326,10 @@ resources:
312326
from:
313327
operation: ModifyDBParameterGroup
314328
path: Parameters
329+
Tags:
330+
compare:
331+
# We have a custom comparison function...
332+
is_ignored: true
315333
DBSubnetGroup:
316334
renames:
317335
operations:
@@ -346,6 +364,10 @@ resources:
346364
fields:
347365
Name:
348366
is_primary_key: true
367+
Tags:
368+
compare:
369+
# We have a custom comparison function...
370+
is_ignored: true
349371
DBProxy:
350372
exceptions:
351373
terminal_codes:

helm/crds/rds.services.k8s.aws_dbinstances.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,17 +1255,6 @@ spec:
12551255
type: string
12561256
type: object
12571257
type: array
1258-
tagList:
1259-
items:
1260-
description: Metadata assigned to an Amazon RDS resource consisting
1261-
of a key-value pair.
1262-
properties:
1263-
key:
1264-
type: string
1265-
value:
1266-
type: string
1267-
type: object
1268-
type: array
12691258
vpcSecurityGroups:
12701259
description: Provides a list of VPC security group elements that the
12711260
DB instance belongs to.

pkg/resource/db_cluster/delta.go

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

pkg/resource/db_cluster_parameter_group/delta.go

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

0 commit comments

Comments
 (0)