Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add tagging parameter for createGlobalCluster #568

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add tagging parameter for createGlobalCluster #568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20d5c32
add tagging parameter for createGlobalCluster
akwan224 Sep 19, 2024
d460365
update global cluster taggable to be true
akwan224 Oct 28, 2024
97cc3cf
update tagging section for rds-global-cluster
akwan224 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion aws-rds-globalcluster/aws-rds-globalcluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
"aurora-postgresql"
]
},
"Tags": {
"type": "array",
"maxItems": 50,
"uniqueItems": true,
"insertionOrder": false,
"description": "An array of key-value pairs to apply to this resource.",
"items": {
"$ref": "#/definitions/Tag"
}
},
"EngineLifecycleSupport": {
"description": "The life cycle type of the global cluster. You can use this setting to enroll your global cluster into Amazon RDS Extended Support.",
"type": "string"
Expand Down Expand Up @@ -46,6 +56,30 @@
"type": "boolean"
}
},
"definitions": {
"Tag": {
"description": "A key-value pair to associate with a resource.",
"type": "object",
"additionalProperties": false,
"properties": {
"Key": {
"type": "string",
"description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. ",
"minLength": 1,
"maxLength": 128
},
"Value": {
"type": "string",
"description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -. ",
"minLength": 0,
"maxLength": 256
}
},
"required": [
"Key"
]
}
},
"oneOf": [
{
"required": [
Expand Down Expand Up @@ -87,7 +121,9 @@
"update": {
"permissions": [
"rds:ModifyGlobalCluster",
"rds:DescribeGlobalClusters"
"rds:DescribeGlobalClusters",
"rds:AddTagsToResource",
"rds:RemoveTagsFromResource"
]
},
"delete": {
Expand Down
2 changes: 1 addition & 1 deletion aws-rds-globalcluster/src/main/java/software/amazon/rds/globalcluster/BaseHandlerStd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ protected ProgressEvent<ResourceModel, CallbackContext> createGlobalClusterWithS
.done((describeDbClusterRequest, describeDbClusterResponse, proxyClient2, resourceModel, callbackContext) -> {
final String arn = describeDbClusterResponse.dbClusters().get(0).dbClusterArn();
try {
proxyClient2.injectCredentialsAndInvokeV2(Translator.createGlobalClusterRequest(resourceModel, arn), proxyClient2.client()::createGlobalCluster);
proxyClient2.injectCredentialsAndInvokeV2(Translator.createGlobalClusterRequest(resourceModel, arn, Tagging.TagSet.emptySet()), proxyClient2.client()::createGlobalCluster);
callbackContext.setGlobalClusterCreated(true);
} catch (GlobalClusterAlreadyExistsException e) {
throw new CfnAlreadyExistsException(e);
Expand Down
5 changes: 3 additions & 2 deletions aws-rds-globalcluster/src/main/java/software/amazon/rds/globalcluster/Translator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
public class Translator {

static CreateGlobalClusterRequest createGlobalClusterRequest(final ResourceModel model) {
return createGlobalClusterRequest(model, null);
return createGlobalClusterRequest(model, null, Tagging.TagSet.emptySet());
}

static CreateGlobalClusterRequest createGlobalClusterRequest(final ResourceModel model, String dbClusterArn) {
static CreateGlobalClusterRequest createGlobalClusterRequest(final ResourceModel model, String dbClusterArn, final Tagging.TagSet tagSet) {
return CreateGlobalClusterRequest.builder()
.engine(model.getEngine())
.engineVersion(model.getEngineVersion())
Expand All @@ -33,6 +33,7 @@ static CreateGlobalClusterRequest createGlobalClusterRequest(final ResourceModel
.sourceDBClusterIdentifier(StringUtils.isBlank(dbClusterArn) ? model.getSourceDBClusterIdentifier() : dbClusterArn)
.storageEncrypted(model.getStorageEncrypted())
.engineLifecycleSupport(model.getEngineLifecycleSupport())
.tags(Tagging.translateTagsToSdk(tagSet))
.build();
}

Expand Down