[DBClusterEndpoint] Create new resource

.github/workflows/maven-verify.yml

@@ -74,3 +74,8 @@ jobs:
         cd "${GITHUB_WORKSPACE}/aws-rds-optiongroup"
         mvn clean verify --no-transfer-progress
         cat rpdk.log
+    - name: Verify AWS::RDS::DBClusterEndpoint
+      run: |
+        cd "${GITHUB_WORKSPACE}/aws-rds-dbclusterendpoint"
+        mvn clean verify --no-transfer-progress
+        cat rpdk.log

.pre-commit-config.yaml

@@ -1,19 +1,6 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.4.0
+- repo: https://github.com/aws-cloudformation/cfn-python-lint
+  rev: v0.61.0  # The version of cfn-lint to use
   hooks:
-  - id: check-case-conflict
-  - id: detect-private-key
-  - id: end-of-file-fixer
-  - id: mixed-line-ending
-    args:
-    - --fix=lf
-  - id: trailing-whitespace
-  - id: pretty-format-json
-    args:
-    - --autofix
-    - --indent=2
-    - --no-sort-keys
-  - id: check-merge-conflict
-  - id: check-yaml
-    exclude: codebuild-ci.yaml
+    - id: cfn-python-lint
+      files: aws-rds-dbclusterendpoint/contract-test-required-resources.template.yaml

aws-rds-cfn-common/src/main/java/software/amazon/rds/common/test/AbstractTestBase.java

@@ -74,24 +74,24 @@ protected Consumer<ProgressEvent<ModelT, CallbackT>> expectFailed(final HandlerE
 
     protected ProgressEvent<ModelT, CallbackT> test_handleRequest_base(
             final CallbackT context,
-            final Supplier<ResourceT> dbInstanceSupplier,
+            final Supplier<ResourceT> resourceSupplier,
             final Supplier<ModelT> desiredStateSupplier,
             final Consumer<ProgressEvent<ModelT, CallbackT>> expect
     ) {
-        return test_handleRequest_base(context, dbInstanceSupplier, null, desiredStateSupplier, expect);
+        return test_handleRequest_base(context, resourceSupplier, null, desiredStateSupplier, expect);
     }
 
     protected ProgressEvent<ModelT, CallbackT> test_handleRequest_base(
             final CallbackT context,
-            final Supplier<ResourceT> dbInstanceSupplier,
+            final Supplier<ResourceT> resourceSupplier,
             final Supplier<ModelT> previousStateSupplier,
             final Supplier<ModelT> desiredStateSupplier,
             final Consumer<ProgressEvent<ModelT, CallbackT>> expect
     ) {
         return test_handleRequest_base(
                 context,
                 ResourceHandlerRequest.<ModelT>builder(),
-                dbInstanceSupplier,
+                resourceSupplier,
                 previousStateSupplier,
                 desiredStateSupplier,
                 expect
@@ -101,13 +101,13 @@ protected ProgressEvent<ModelT, CallbackT> test_handleRequest_base(
     protected ProgressEvent<ModelT, CallbackT> test_handleRequest_base(
             final CallbackT context,
             final ResourceHandlerRequest.ResourceHandlerRequestBuilder<ModelT> builder,
-            final Supplier<ResourceT> dbInstanceSupplier,
+            final Supplier<ResourceT> resourceSupplier,
             final Supplier<ModelT> previousStateSupplier,
             final Supplier<ModelT> desiredStateSupplier,
             final Consumer<ProgressEvent<ModelT, CallbackT>> expect
     ) {
-        if (dbInstanceSupplier != null) {
-            expectResourceSupply(dbInstanceSupplier);
+        if (resourceSupplier != null) {
+            expectResourceSupply(resourceSupplier);
         }
 
         builder.desiredResourceState(desiredStateSupplier.get());

aws-rds-dbclusterendpoint/.gitignore

@@ -0,0 +1,20 @@
+# macOS
+.DS_Store
+._*
+
+# Maven outputs
+.classpath
+
+# IntelliJ
+*.iml
+.idea
+out.java
+out/
+.settings
+.project
+
+# auto-generated files
+target/
+
+# our logs
+rpdk.log

aws-rds-dbclusterendpoint/.pre-commit-config.yaml

@@ -0,0 +1,6 @@
+repos:
+- repo: https://github.com/aws-cloudformation/cfn-python-lint
+  rev: v0.61.0  # The version of cfn-lint to use
+  hooks:
+    - id: cfn-python-lint
+      files: contract-test-required-resources.template.yaml

aws-rds-dbclusterendpoint/.rpdk-config

@@ -0,0 +1,28 @@
+{
+    "artifact_type": "RESOURCE",
+    "typeName": "AWS::RDS::DBClusterEndpoint",
+    "language": "java",
+    "runtime": "java8",
+    "entrypoint": "software.amazon.rds.dbclusterendpoint.HandlerWrapper::handleRequest",
+    "testEntrypoint": "software.amazon.rds.dbclusterendpoint.HandlerWrapper::testEntrypoint",
+    "settings": {
+        "version": false,
+        "subparser_name": null,
+        "verbose": 0,
+        "force": false,
+        "type_name": null,
+        "artifact_type": null,
+        "endpoint_url": null,
+        "region": null,
+        "target_schemas": [],
+        "namespace": [
+            "software",
+            "amazon",
+            "rds",
+            "dbclusterendpoint"
+        ],
+        "codegen_template_path": "guided_aws",
+        "protocolVersion": "2.0.0"
+    },
+    "executableEntrypoint": "software.amazon.rds.dbclusterendpoint.HandlerWrapperExecutable"
+}

aws-rds-dbclusterendpoint/README.md

@@ -0,0 +1,17 @@
+# AWS::RDS::DBClusterEndpoint
+
+Congratulations on starting development! Next steps:
+
+1. Write the JSON schema describing your resource, `aws-rds-dblcusterendpoint.json`
+1. Implement your resource handlers.
+
+The RPDK will automatically generate the correct resource model from the schema whenever the project is built via Maven. You can also do this manually with the following command: `cfn generate`.
+
+> Please don't modify files under `target/generated-sources/rpdk`, as they will be automatically overwritten.
+
+The code uses [Lombok](https://projectlombok.org/), and [you may have to install IDE integrations](https://projectlombok.org/) to enable auto-complete for Lombok-annotated classes.
+
+To run contract tests locally, make sure to register required resources stack:
+```shell
+aws cloudformation --region <region> create-stack --stack-name dbclusterendpoint-contract-test-resources --template-body 'file://./contract-test-required-resources.template.yaml'
+```

aws-rds-dbclusterendpoint/aws-rds-dbclusterendpoint.json

@@ -0,0 +1,151 @@
+{
+  "typeName": "AWS::RDS::DBClusterEndpoint",
+  "description": "The AWS::RDS::DBClusterEndpoint resource allows you to create custom Aurora Cluster endpoint. For more information, see Using custom endpoints in the Amazon RDS Aurora Guide.",
+  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds",
+  "tagging": {
+    "taggable": true
+  },
+  "replacementStrategy": "delete_then_create",
+  "definitions": {
+    "Tag": {
+      "description": "A key-value pair to associate with a resource.",
+      "type": "object",
+      "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",
+        "Value"
+      ],
+      "additionalProperties": false
+    }
+  },
+  "properties": {
+    "DBClusterIdentifier": {
+      "description": "The DB cluster identifier of the DB cluster associated with the endpoint. This parameter is stored as a lowercase string.",
+      "type": "string",
+      "pattern": "^[a-zA-Z]{1}(?:-?[a-zA-Z0-9]){0,62}$",
+      "minLength": 1,
+      "maxLength": 63
+    },
+    "DBClusterEndpointIdentifier": {
+      "description": "The identifier to use for the new endpoint. This parameter is stored as a lowercase string.",
+      "type": "string",
+      "pattern": "^[a-z]{1}(?:-?[a-z0-9]){0,62}$",
+      "minLength": 1,
+      "maxLength": 63
+    },
+    "EndpointType": {
+      "description": "The type of the endpoint, one of: READER , WRITER , ANY",
+      "type": "string",
+      "enum": [
+        "READER",
+        "WRITER",
+        "ANY"
+      ]
+    },
+    "DBClusterEndpointArn": {
+      "type": "string",
+      "description": "The Amazon Resource Name (ARN) for the endpoint."
+    },
+    "Endpoint": {
+      "type": "string",
+      "description": "The DNS address of the endpoint."
+    },
+    "StaticMembers": {
+      "description": "List of DB instance identifiers that are part of the custom endpoint group.",
+      "type": "array",
+      "uniqueItems": true,
+      "insertionOrder": false,
+      "items": {
+        "type": "string"
+      }
+    },
+    "ExcludedMembers": {
+      "description": "List of DB instance identifiers that aren't part of the custom endpoint group. All other eligible instances are reachable through the custom endpoint. This parameter is relevant only if the list of static members is empty.",
+      "type": "array",
+      "uniqueItems": true,
+      "insertionOrder": false,
+      "items": {
+        "type": "string"
+      }
+    },
+    "Tags": {
+      "description": "An array of key-value pairs to apply to this resource.",
+      "type": "array",
+      "maxItems": 50,
+      "uniqueItems": true,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "DBClusterIdentifier",
+    "DBClusterEndpointIdentifier",
+    "EndpointType"
+  ],
+  "createOnlyProperties": [
+    "/properties/DBClusterEndpointIdentifier",
+    "/properties/DBClusterIdentifier"
+  ],
+  "primaryIdentifier": [
+    "/properties/DBClusterEndpointIdentifier"
+  ],
+  "readOnlyProperties": [
+    "/properties/Endpoint",
+    "/properties/DBClusterEndpointArn"
+  ],
+  "handlers": {
+    "create": {
+      "permissions": [
+        "rds:AddTagsToResource",
+        "rds:RemoveTagsFromResource",
+        "rds:CreateDBClusterEndpoint",
+        "rds:DescribeDBClusterEndpoints",
+        "rds:ListTagsForResource"
+      ]
+    },
+    "read": {
+      "permissions": [
+        "rds:DescribeDBClusterEndpoints",
+        "rds:ListTagsForResource"
+      ]
+    },
+    "update": {
+      "permissions": [
+        "rds:AddTagsToResource",
+        "rds:RemoveTagsFromResource",
+        "rds:DescribeDBClusterEndpoints",
+        "rds:ModifyDBClusterEndpoint",
+        "rds:ListTagsForResource"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "rds:DeleteDBClusterEndpoint",
+        "rds:DescribeDBClusterEndpoints",
+        "rds:ListTagsForResource"
+      ]
+    },
+    "list": {
+      "permissions": [
+        "rds:DescribeDBClusterEndpoints",
+        "rds:ListTagsForResource"
+      ]
+    }
+  }
+}

aws-rds-dbclusterendpoint/contract-test-required-resources.template.yaml

@@ -0,0 +1,38 @@
+Resources:
+  ContractTestSecret:
+    Type: AWS::SecretsManager::Secret
+    Properties:
+      Description: Superuser credentials for the DBCluster
+      GenerateSecretString:
+        SecretStringTemplate: '{"username": "admin"}'
+        GenerateStringKey: password
+        PasswordLength: 16
+        ExcludeCharacters: '"''@/\ ,'
+
+  DBClusterEndpointContractCluster:
+    Type: AWS::RDS::DBCluster
+    DependsOn:
+      - ContractTestSecret
+    Properties:
+      Engine: aurora-mysql
+      MasterUsername: !Sub '{{resolve:secretsmanager:${ContractTestSecret}:SecretString:username}}'
+      MasterUserPassword: !Sub '{{resolve:secretsmanager:${ContractTestSecret}:SecretString:password}}'
+
+  DBClusterEndpointContractInstance:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      DBClusterIdentifier: !Ref DBClusterEndpointContractCluster
+      DBInstanceClass: db.t3.small
+      Engine: "aurora-mysql"
+
+Outputs:
+  DBClusterIdentifier:
+    Value:
+      Ref: DBClusterEndpointContractCluster
+    Export:
+      Name: DBClusterEndpointContractCluster
+  DBInstanceIdentifier:
+    Value:
+      Ref: DBClusterEndpointContractInstance
+    Export:
+      Name: DBClusterEndpointContractInstance