Merge branch 'master' into benisrae/eks-add-manifest-to-imported-cluster

packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts

@@ -248,8 +248,8 @@ export class UsagePlan extends Resource {
       validateInteger(rateLimit, 'Throttle rate limit');
 
       ret = {
-        burstLimit: burstLimit ? burstLimit : undefined,
-        rateLimit: rateLimit ? rateLimit : undefined,
+        burstLimit: burstLimit,
+        rateLimit: rateLimit,
       };
     }
     return ret!;

packages/@aws-cdk/aws-apigateway/test/test.usage-plan.ts

@@ -34,7 +34,7 @@ export = {
     const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
     const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
     const usagePlanName = 'Basic';
-    const usagePlanDescription = 'Basic Usage Plan with no throttling limits';
+    const usagePlanDescription = 'Basic Usage Plan with throttling limits';
 
     // WHEN
     new apigateway.UsagePlan(stack, 'my-usage-plan', {
@@ -82,6 +82,60 @@ export = {
 
   },
 
+  'usage plan with blocked methods'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigateway.RestApi(stack, 'my-api', { cloudWatchRole: false, deploy: true, deployOptions: { stageName: 'test' } });
+    const method: apigateway.Method = api.root.addMethod('GET'); // Need at least one method on the api
+    const usagePlanName = 'Basic';
+    const usagePlanDescription = 'Basic Usage Plan with throttling limits';
+
+    // WHEN
+    new apigateway.UsagePlan(stack, 'my-usage-plan', {
+      name: usagePlanName,
+      description: usagePlanDescription,
+      apiStages: [
+        {
+          stage: api.deploymentStage,
+          throttle: [
+            {
+              method,
+              throttle: {
+                burstLimit: 0,
+                rateLimit: 0,
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    // THEN
+    expect(stack).to(haveResource(RESOURCE_TYPE, {
+      UsagePlanName: usagePlanName,
+      Description: usagePlanDescription,
+      ApiStages: [
+        {
+          ApiId: {
+            Ref: 'myapi4C7BF186',
+          },
+          Stage: {
+            Ref: 'myapiDeploymentStagetest4A4AB65E',
+          },
+          Throttle: {
+            '//GET': {
+              BurstLimit: 0,
+              RateLimit: 0,
+            },
+          },
+        },
+      ],
+    }, ResourcePart.Properties));
+
+    test.done();
+
+  },
+
   'usage plan with quota limits'(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();

packages/@aws-cdk/aws-glue/lib/data-format.ts

@@ -137,6 +137,45 @@ export class SerializationLibrary {
   constructor(public readonly className: string) {}
 }
 
+/**
+ * Classification string given to tables with this data format.
+ *
+ * @see https://docs.aws.amazon.com/glue/latest/dg/add-classifier.html#classifier-built-in
+ */
+export class ClassificationString {
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-avro
+   */
+  public static readonly AVRO = new ClassificationString('avro');
+
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-csv
+   */
+  public static readonly CSV = new ClassificationString('csv');
+
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-json
+   */
+  public static readonly JSON = new ClassificationString('json');
+
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-xml
+   */
+  public static readonly XML = new ClassificationString('xml');
+
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-parquet
+   */
+  public static readonly PARQUET = new ClassificationString('parquet');
+
+  /**
+   * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-format.html#aws-glue-programming-etl-format-orc
+   */
+  public static readonly ORC = new ClassificationString('orc');
+
+  constructor(public readonly value: string) {}
+}
+
 /**
  * Properties of a DataFormat instance.
  */
@@ -155,6 +194,13 @@ export interface DataFormatProps {
    * Serialization library for this data format.
    */
   readonly serializationLibrary: SerializationLibrary;
+
+  /**
+   * Classification string given to tables with this data format.
+   *
+   * @default - No classification is specified.
+   */
+  readonly classificationString?: ClassificationString;
 }
 
 /**
@@ -181,6 +227,7 @@ export class DataFormat {
     inputFormat: InputFormat.AVRO,
     outputFormat: OutputFormat.AVRO,
     serializationLibrary: SerializationLibrary.AVRO,
+    classificationString: ClassificationString.AVRO,
   });
 
   /**
@@ -203,6 +250,7 @@ export class DataFormat {
     inputFormat: InputFormat.TEXT,
     outputFormat: OutputFormat.HIVE_IGNORE_KEY_TEXT,
     serializationLibrary: SerializationLibrary.OPEN_CSV,
+    classificationString: ClassificationString.CSV,
   });
 
   /**
@@ -215,6 +263,7 @@ export class DataFormat {
     inputFormat: InputFormat.TEXT,
     outputFormat: OutputFormat.HIVE_IGNORE_KEY_TEXT,
     serializationLibrary: SerializationLibrary.OPENX_JSON,
+    classificationString: ClassificationString.JSON,
   });
 
   /**
@@ -237,6 +286,7 @@ export class DataFormat {
     inputFormat: InputFormat.ORC,
     outputFormat: OutputFormat.ORC,
     serializationLibrary: SerializationLibrary.ORC,
+    classificationString: ClassificationString.ORC,
   });
 
   /**
@@ -248,6 +298,7 @@ export class DataFormat {
     inputFormat: InputFormat.PARQUET,
     outputFormat: OutputFormat.PARQUET,
     serializationLibrary: SerializationLibrary.PARQUET,
+    classificationString: ClassificationString.PARQUET,
   });
 
   /**
@@ -276,9 +327,15 @@ export class DataFormat {
    */
   public readonly serializationLibrary: SerializationLibrary;
 
+  /**
+   * Classification string given to tables with this data format.
+   */
+  public readonly classificationString?: ClassificationString;
+
   public constructor(props: DataFormatProps) {
     this.inputFormat = props.inputFormat;
     this.outputFormat = props.outputFormat;
     this.serializationLibrary = props.serializationLibrary;
+    this.classificationString = props.classificationString;
   }
 }

packages/@aws-cdk/aws-glue/lib/table.ts

@@ -260,6 +260,7 @@ export class Table extends Resource implements ITable {
         partitionKeys: renderColumns(props.partitionKeys),
 
         parameters: {
+          classification: props.dataFormat.classificationString?.value,
           has_encrypted_data: this.encryption !== TableEncryption.UNENCRYPTED,
         },
         storageDescriptor: {

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

@@ -123,7 +123,14 @@
       "docs-public-apis:@aws-cdk/aws-glue.SerializationLibrary.ORC",
       "docs-public-apis:@aws-cdk/aws-glue.SerializationLibrary.PARQUET",
       "docs-public-apis:@aws-cdk/aws-glue.SerializationLibrary.REGEXP",
-      "docs-public-apis:@aws-cdk/aws-glue.SerializationLibrary.className"
+      "docs-public-apis:@aws-cdk/aws-glue.SerializationLibrary.className",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.AVRO",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.CSV",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.JSON",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.XML",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.PARQUET",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.ORC",
+      "docs-public-apis:@aws-cdk/aws-glue.ClassificationString.value"
     ]
   },
   "awscdkio": {

packages/@aws-cdk/aws-glue/test/database.test.ts

@@ -1,7 +1,7 @@
+import { deepEqual, throws } from 'assert';
 import { expect } from '@aws-cdk/assert';
 import '@aws-cdk/assert/jest';
 import { Stack } from '@aws-cdk/core';
-import { deepEqual, throws } from 'assert';
 import * as glue from '../lib';
 
 test('default database does not create a bucket', () => {

packages/@aws-cdk/aws-glue/test/integ.table.expected.json

@@ -29,6 +29,7 @@
           "Description": "avro_table generated by CDK",
           "Name": "avro_table",
           "Parameters": {
+            "classification": "avro",
             "has_encrypted_data": false
           },
           "PartitionKeys": [
@@ -98,6 +99,7 @@
           "Description": "csv_table generated by CDK",
           "Name": "csv_table",
           "Parameters": {
+            "classification": "csv",
             "has_encrypted_data": false
           },
           "PartitionKeys": [
@@ -167,6 +169,7 @@
           "Description": "json_table generated by CDK",
           "Name": "json_table",
           "Parameters": {
+            "classification": "json",
             "has_encrypted_data": false
           },
           "PartitionKeys": [
@@ -236,6 +239,7 @@
           "Description": "parquet_table generated by CDK",
           "Name": "parquet_table",
           "Parameters": {
+            "classification": "parquet",
             "has_encrypted_data": false
           },
           "PartitionKeys": [
@@ -397,6 +401,7 @@
           "Description": "my_encrypted_table generated by CDK",
           "Name": "my_encrypted_table",
           "Parameters": {
+            "classification": "json",
             "has_encrypted_data": true
           },
           "PartitionKeys": [
@@ -827,4 +832,4 @@
       }
     }
   }
-}
+}

packages/@aws-cdk/aws-glue/test/table.test.ts

@@ -1,10 +1,10 @@
+import { deepEqual, doesNotThrow, equal, notEqual, ok } from 'assert';
 import { expect as cdkExpect, haveResource, ResourcePart } from '@aws-cdk/assert';
 import '@aws-cdk/assert/jest';
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as cdk from '@aws-cdk/core';
-import { deepEqual, doesNotThrow, equal, notEqual, ok } from 'assert';
 import * as glue from '../lib';
 
 test('unpartitioned JSON table', () => {
@@ -43,6 +43,7 @@ test('unpartitioned JSON table', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: false,
       },
       StorageDescriptor: {
@@ -114,6 +115,7 @@ test('partitioned JSON table', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: false,
       },
       PartitionKeys: [
@@ -185,6 +187,7 @@ test('compressed table', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: false,
       },
       StorageDescriptor: {
@@ -274,6 +277,7 @@ test('encrypted table: SSE-S3', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -417,6 +421,7 @@ test('encrypted table: SSE-KMS (implicitly created key)', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -550,6 +555,7 @@ test('encrypted table: SSE-KMS (explicitly created key)', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -628,6 +634,7 @@ test('encrypted table: SSE-KMS_MANAGED', () => {
       Name: 'table',
       Description: 'table generated by CDK',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -741,6 +748,7 @@ test('encrypted table: CSE-KMS (implicitly created key)', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -856,6 +864,7 @@ test('encrypted table: CSE-KMS (explicitly created key)', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -973,6 +982,7 @@ test('encrypted table: CSE-KMS (explicitly passed bucket and key)', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: true,
       },
       StorageDescriptor: {
@@ -1040,6 +1050,7 @@ test('explicit s3 bucket and prefix', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: false,
       },
       StorageDescriptor: {
@@ -1107,6 +1118,7 @@ test('explicit s3 bucket and with empty prefix', () => {
       Description: 'table generated by CDK',
       Name: 'table',
       Parameters: {
+        classification: 'json',
         has_encrypted_data: false,
       },
       StorageDescriptor: {