fix(aws-glue): fix glue tableArn and integer schema name (#2585)

aws · May 21, 2019 · 99e173e · 99e173e
1 parent eb35807
commit 99e173e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/packages/@aws-cdk/aws-glue/lib/schema.ts b/packages/@aws-cdk/aws-glue/lib/schema.ts
@@ -72,7 +72,7 @@ export class Schema {
    */
   public static readonly integer: Type = {
     isPrimitive: true,
-    inputString: 'integer'
+    inputString: 'int'
   };
 
   /**

diff --git a/packages/@aws-cdk/aws-glue/lib/table.ts b/packages/@aws-cdk/aws-glue/lib/table.ts
@@ -179,6 +179,11 @@ export class Table extends Resource implements ITable {
    */
   public readonly database: IDatabase;
 
+  /**
+   * Indicates whether the table's data is compressed or not.
+   */
+  public readonly compressed: boolean;
+
   /**
    * The type of encryption enabled for the table.
    */
@@ -235,6 +240,7 @@ export class Table extends Resource implements ITable {
     this.columns = props.columns;
     this.partitionKeys = props.partitionKeys;
 
+    this.compressed = props.compressed === undefined ? false : props.compressed;
     const {bucket, encryption, encryptionKey} = createBucket(this, props);
     this.bucket = bucket;
     this.encryption = encryption;
@@ -256,7 +262,7 @@ export class Table extends Resource implements ITable {
         },
         storageDescriptor: {
           location: `s3://${this.bucket.bucketName}/${this.s3Prefix}`,
-          compressed: props.compressed === undefined ? false : props.compressed,
+          compressed: this.compressed,
           storedAsSubDirectories: props.storedAsSubDirectories === undefined ? false : props.storedAsSubDirectories,
           columns: renderColumns(props.columns),
           inputFormat: props.dataFormat.inputFormat.className,
@@ -271,7 +277,11 @@ export class Table extends Resource implements ITable {
     });
 
     this.tableName = tableResource.tableName;
-    this.tableArn = `${this.database.databaseArn}/${this.tableName}`;
+    this.tableArn = this.node.stack.formatArn({
+      service: 'glue',
+      resource: 'table',
+      resourceName: `${this.database.databaseName}/${this.tableName}`
+    });
   }
 
   /**

diff --git a/packages/@aws-cdk/aws-glue/test/integ.table.expected.json b/packages/@aws-cdk/aws-glue/test/integ.table.expected.json
@@ -296,7 +296,7 @@
                     {
                       "Ref": "AWS::AccountId"
                     },
-                    ":database/",
+                    ":table/",
                     {
                       "Ref": "MyDatabase1E2517DB"
                     },
@@ -373,7 +373,7 @@
                     {
                       "Ref": "AWS::AccountId"
                     },
-                    ":database/",
+                    ":table/",
                     {
                       "Ref": "MyDatabase1E2517DB"
                     },

diff --git a/packages/@aws-cdk/aws-glue/test/test.schema.ts b/packages/@aws-cdk/aws-glue/test/test.schema.ts
@@ -34,7 +34,7 @@ export = {
   },
 
   'integer type'(test: Test) {
-    test.equals(Schema.integer.inputString, 'integer');
+    test.equals(Schema.integer.inputString, 'int');
     test.equals(Schema.integer.isPrimitive, true);
     test.done();
   },
@@ -167,12 +167,12 @@ export = {
     test.done();
   },
 
-  'map<integer,string>'(test: Test) {
+  'map<int,string>'(test: Test) {
     const type = Schema.map(
       Schema.integer,
       Schema.string
     );
-    test.equals(type.inputString, 'map<integer,string>');
+    test.equals(type.inputString, 'map<int,string>');
     test.equals(type.isPrimitive, false);
     test.done();
   },

diff --git a/packages/@aws-cdk/aws-glue/test/test.table.ts b/packages/@aws-cdk/aws-glue/test/test.table.ts
@@ -1097,7 +1097,7 @@ export = {
                     {
                       Ref: "AWS::AccountId"
                     },
-                    ":database/",
+                    ":table/",
                     {
                       Ref: "DatabaseB269D8BB"
                     },
@@ -1201,7 +1201,7 @@ export = {
                     {
                       Ref: "AWS::AccountId"
                     },
-                    ":database/",
+                    ":table/",
                     {
                       Ref: "DatabaseB269D8BB"
                     },
@@ -1312,7 +1312,7 @@ export = {
                     {
                       Ref: "AWS::AccountId"
                     },
-                    ":database/",
+                    ":table/",
                     {
                       Ref: "DatabaseB269D8BB"
                     },