fix(athena): WorkGroup tags corruption

packages/@aws-cdk/aws-athena/package.json

@@ -65,6 +65,8 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "cdk-build-tools": "0.0.0",
+    "cdk-integ-tools": "0.0.0",
+    "nodeunit-shim": "0.0.0",
     "cfn2ts": "0.0.0",
     "pkglint": "0.0.0"
   },

packages/@aws-cdk/aws-athena/test/athena.test.ts

@@ -1,6 +1,72 @@
 import '@aws-cdk/assert/jest';
-import {} from '../lib';
+import { expect, haveResource } from '@aws-cdk/assert';
+import * as cdk from '@aws-cdk/core';
+import { CfnWorkGroup } from '../lib';
 
-test('No tests are specified for this package', () => {
-  expect(true).toBe(true);
+describe('Athena Workgroup Tags', () => {
+  test('test tag spec correction', () => {
+    const stack = new cdk.Stack();
+    new CfnWorkGroup(stack, 'Athena-Workgroup', {
+      name: 'HelloWorld',
+      description: 'A WorkGroup',
+      recursiveDeleteOption: true,
+      state: 'ENABLED',
+      tags: [
+        {
+          key: 'key1',
+          value: 'value1',
+        },
+        {
+          key: 'key2',
+          value: 'value2',
+        }],
+      workGroupConfiguration: {
+        requesterPaysEnabled: true,
+        resultConfiguration: {
+          outputLocation: 's3://fakebucketme/athena/results/',
+        },
+      },
+    });
+    expect(stack).to(haveResource('AWS::Athena::WorkGroup', {
+      Tags: [
+        {
+          Key: 'key1',
+          Value: 'value1',
+        },
+        {
+          Key: 'key2',
+          Value: 'value2',
+        },
+      ],
+    }));
+  });
+  test('test tag aspect spec correction', () => {
+    const stack = new cdk.Stack();
+    cdk.Tag.add(stack, 'key1', 'value1');
+    cdk.Tag.add(stack, 'key2', 'value2');
+    new CfnWorkGroup(stack, 'Athena-Workgroup', {
+      name: 'HelloWorld',
+      description: 'A WorkGroup',
+      recursiveDeleteOption: true,
+      state: 'ENABLED',
+      workGroupConfiguration: {
+        requesterPaysEnabled: true,
+        resultConfiguration: {
+          outputLocation: 's3://fakebucketme/athena/results/',
+        },
+      },
+    });
+    expect(stack).to(haveResource('AWS::Athena::WorkGroup', {
+      Tags: [
+        {
+          Key: 'key1',
+          Value: 'value1',
+        },
+        {
+          Key: 'key2',
+          Value: 'value2',
+        },
+      ],
+    }));
+  });
 });

packages/@aws-cdk/aws-athena/test/integ.workgroup.expected.json

@@ -0,0 +1,23 @@
+{
+  "Resources": {
+    "AthenaWorkgroup": {
+      "Type": "AWS::Athena::WorkGroup",
+      "Properties": {
+        "Name": "HelloWorld",
+        "Description": "A WorkGroup",
+        "RecursiveDeleteOption": true,
+        "State": "ENABLED",
+        "Tags": [
+          {
+            "Key": "key1",
+            "Value": "value1"
+          },
+          {
+            "Key": "key2",
+            "Value": "value2"
+          }
+        ]
+      }
+    }
+  }
+}

packages/@aws-cdk/aws-athena/test/integ.workgroup.ts

@@ -0,0 +1,23 @@
+import * as cdk from '@aws-cdk/core';
+import { CfnWorkGroup }from '../lib';
+
+const app = new cdk.App();
+const stack = new cdk.Stack(app, 'aws-cdk-athena-workgroup-tags');
+
+new CfnWorkGroup(stack, 'AthenaWorkgroup', {
+  name: 'HelloWorld',
+  description: 'A WorkGroup',
+  recursiveDeleteOption: true,
+  state: 'ENABLED',
+  tags: [
+    {
+      key: 'key1',
+      value: 'value1',
+    },
+    {
+      key: 'key2',
+      value: 'value2',
+    }],
+});
+
+app.synth();

packages/@aws-cdk/cfnspec/spec-source/570_Athena_Workgroup_Tags_patch.json

@@ -0,0 +1,36 @@
+{
+    "PropertyTypes": {
+        "AWS::Athena::WorkGroup.Tags": {
+            "patch": {
+                "description": "Corrects tag specification for AWS::Athena::WorkGroup.Tags",
+                "operations": [
+                    {
+                        "op": "remove",
+                        "path": "/Properties"
+                    },
+                    {
+                        "op": "add",
+                        "path": "/ItemType",
+                        "value": "Tag"
+                    },
+                    {
+                        "op": "add",
+                        "path": "/Required",
+                        "value": false
+                    },
+                    {
+                        "op": "add",
+                        "path": "/Type",
+                        "value": "List"
+                    },
+                    {
+                        "op": "add",
+                        "path": "/UpdateType",
+                        "value": "Mutable"
+                    }
+                ]
+            }
+        }
+    }
+}
+