Add CustomPlugin and WorkerConfiguration resources along with tagging…

… support for all resources

.github/workflows/pr-ci.yml

@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:

.gitignore

@@ -0,0 +1,39 @@
+# macOS
+.DS_Store
+._*
+
+# Maven outputs
+.classpath
+
+# IntelliJ
+*.iml
+.idea
+out.java
+out/
+.settings
+.project
+
+# Auto-generated files
+target/
+build
+.gradle
+gradle
+gradlew
+gradlew.bat
+wrapper
+*.zip
+# Allow CustomPlugin ZIP file to be uplaoded.
+!*/contract-tests-artifacts/**/*.zip
+.factorypath
+
+# Our logs
+rpdk.log*
+
+# Contains credentials
+sam-tests/
+
+# CFN Contract Tests V1 outputs
+.hypothesis
+
+# VS Code
+.vscode/

aws-kafkaconnect-connector/.rpdk-config

@@ -2,7 +2,7 @@
     "artifact_type": "RESOURCE",
     "typeName": "AWS::KafkaConnect::Connector",
     "language": "java",
-    "runtime": "java8",
+    "runtime": "java17",
     "entrypoint": "software.amazon.kafkaconnect.connector.HandlerWrapper::handleRequest",
     "testEntrypoint": "software.amazon.kafkaconnect.connector.HandlerWrapper::testEntrypoint",
     "settings": {
@@ -21,5 +21,6 @@
         "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
+    "logProcessorEnabled": "true",
     "executableEntrypoint": "software.amazon.kafkaconnect.connector.HandlerWrapperExecutable"
 }

aws-kafkaconnect-connector/aws-kafkaconnect-connector.json

@@ -2,7 +2,13 @@
   "typeName": "AWS::KafkaConnect::Connector",
   "description": "Resource Type definition for AWS::KafkaConnect::Connector",
   "additionalProperties": false,
-  "taggable": false,
+  "tagging": {
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": true,
+    "tagProperty": "/properties/Tags"
+  },
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-kafkaconnect.git",
   "properties": {
     "Capacity": {
@@ -65,6 +71,15 @@
       "type": "string",
       "pattern": "arn:(aws|aws-us-gov|aws-cn):iam:.*"
     },
+    "Tags": {
+      "description": "A collection of tags associated with a resource",
+      "type": "array",
+      "uniqueItems": true,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
+    },
     "WorkerConfiguration": {
       "$ref": "#/definitions/WorkerConfiguration"
     }
@@ -368,6 +383,25 @@
         "CpuUtilizationPercentage"
       ]
     },
+    "Tag": {
+      "type": "object",
+      "properties": {
+        "Key": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
+        },
+        "Value": {
+          "type": "string",
+          "maxLength": 256
+        }
+      },
+      "required": [
+        "Value",
+        "Key"
+      ],
+      "additionalProperties": false
+    },
     "Vpc": {
       "description": "Information about a VPC used with the connector.",
       "type": "object",
@@ -451,6 +485,11 @@
   "primaryIdentifier": [
     "/properties/ConnectorArn"
   ],
+  "additionalIdentifiers": [
+    [
+      "/properties/ConnectorName"
+    ]
+  ],
   "readOnlyProperties": [
     "/properties/ConnectorArn"
   ],
@@ -473,6 +512,8 @@
       "permissions": [
         "kafkaconnect:CreateConnector",
         "kafkaconnect:DescribeConnector",
+        "kafkaconnect:TagResource",
+        "kafkaconnect:ListTagsForResource",
         "iam:CreateServiceLinkedRole",
         "iam:PassRole",
         "ec2:CreateNetworkInterface",
@@ -492,7 +533,8 @@
     },
     "read": {
       "permissions": [
-        "kafkaconnect:DescribeConnector"
+        "kafkaconnect:DescribeConnector",
+        "kafkaconnect:ListTagsForResource"
       ]
     },
     "delete": {
@@ -508,6 +550,9 @@
       "permissions": [
         "kafkaconnect:UpdateConnector",
         "kafkaconnect:DescribeConnector",
+        "kafkaconnect:TagResource",
+        "kafkaconnect:ListTagsForResource",
+        "kafkaconnect:UntagResource",
         "iam:CreateServiceLinkedRole",
         "logs:UpdateLogDelivery",
         "logs:GetLogDelivery",
@@ -526,4 +571,4 @@
       ]
     }
   }
-}
+}