Merge pull request #39 from ShadowHealth/updateAwsSdk

Upgrade to the latest version of the sdk

Author: tmitchel2

flow/aws-sdk-promise.js renamed to flow/aws-sdk.js

@@ -1,5 +1,5 @@
 /* @flow */
-declare module 'aws-sdk-promise' {
+declare module 'aws-sdk' {
   declare class DynamoDB {
     constructor(dynamoDBConfig: DynamoDBConfig): void;
 
@@ -49,13 +49,9 @@ declare module 'aws-sdk-promise' {
   }
 
   declare class PromiseRequest<T> {
-    promise(): Promise<DataResponse<T>>;
+    promise(): Promise<T>;
   }
 
-  declare type DataResponse<T> = {
-    data: T,
-  };
-
   declare type ListTablesRequest = {
      ExclusiveStartTableName?: string,
      Limit?: number

package.json

@@ -26,8 +26,7 @@
   "dependencies": {},
   "devDependencies": {
     "async": "^2.0.0",
-    "aws-sdk": "2.2.48",
-    "aws-sdk-promise": "0.0.2",
+    "aws-sdk": "2.5.4",
     "babel": "^6.5.2",
     "babel-cli": "^6.7.7",
     "babel-eslint": "^6.0.4",

src/App.js

@@ -5,7 +5,7 @@ import CostEstimation from './utils/CostEstimation';
 import Throughput from './utils/Throughput';
 import CapacityCalculator from './CapacityCalculator';
 import { json, stats, log, invariant } from './Global';
-import type { UpdateTableRequest } from 'aws-sdk-promise';
+import type { UpdateTableRequest } from 'aws-sdk';
 
 export default class App {
   _provisioner: Provisioner;

src/CapacityCalculator.js

@@ -2,7 +2,7 @@
 import { invariant } from './Global';
 import { Region } from './configuration/Region';
 import CapacityCalculatorBase from './capacity/CapacityCalculatorBase';
-import type { GetMetricStatisticsResponse } from 'aws-sdk-promise';
+import type { GetMetricStatisticsResponse } from 'aws-sdk';
 import type { StatisticSettings } from './flow/FlowTypes';
 
 export default class CapacityCalculator extends CapacityCalculatorBase {

src/aws/CloudWatch.js

@@ -1,11 +1,11 @@
 /* @flow */
-import AWS from 'aws-sdk-promise';
+import AWS from 'aws-sdk';
 import { json, stats, warning, invariant } from '../Global';
 import type {
   CloudWatchOptions,
   GetMetricStatisticsRequest,
   GetMetricStatisticsResponse,
-} from 'aws-sdk-promise';
+} from 'aws-sdk';
 
 export default class CloudWatch {
   _cw: AWS.CloudWatch;
@@ -30,8 +30,7 @@ export default class CloudWatch {
     let sw = stats.timer('CloudWatch.getMetricStatisticsAsync').start();
     try {
       invariant(params != null, 'Parameter \'params\' is not set');
-      let res = await this._cw.getMetricStatistics(params).promise();
-      return res.data;
+      return await this._cw.getMetricStatistics(params).promise();
     } catch (ex) {
       warning(JSON.stringify({
         class: 'CloudWatch',

src/aws/DynamoDB.js

@@ -1,5 +1,5 @@
 /* @flow */
-import AWS from 'aws-sdk-promise';
+import AWS from 'aws-sdk';
 import { json, stats, warning, invariant } from '../Global';
 import Delay from '../utils/Delay';
 import Async from 'async';
@@ -11,7 +11,7 @@ import type {
   UpdateTableResponse,
   ListTablesRequest,
   ListTablesResponse,
-} from 'aws-sdk-promise';
+} from 'aws-sdk';
 
 export default class DynamoDB {
   _db: AWS.DynamoDB;
@@ -40,8 +40,7 @@ export default class DynamoDB {
   async listTablesAsync(params: ?ListTablesRequest): Promise<ListTablesResponse> {
     let sw = stats.timer('DynamoDB.listTablesAsync').start();
     try {
-      let res = await this._db.listTables(params).promise();
-      return res.data;
+      return await this._db.listTables(params).promise();
     } catch (ex) {
       warning(JSON.stringify({
         class: 'DynamoDB',
@@ -68,8 +67,7 @@ export default class DynamoDB {
     let sw = stats.timer('DynamoDB.describeTableAsync').start();
     try {
       invariant(params != null, 'Parameter \'params\' is not set');
-      let res = await this._db.describeTable(params).promise();
-      return res.data;
+      return await this._db.describeTable(params).promise();
     } catch (ex) {
       warning(JSON.stringify({
         class: 'DynamoDB',
@@ -128,15 +126,14 @@ export default class DynamoDB {
       await this.delayUntilTableIsActiveAsync(params.TableName);
     }
 
-    return response.data;
+    return response;
   }
 
   async updateTableAsync(params: UpdateTableRequest): Promise<UpdateTableResponse> {
     let sw = stats.timer('DynamoDB.updateTableAsync').start();
     try {
       invariant(params != null, 'Parameter \'params\' is not set');
-      let res = await this._db.updateTable(params).promise();
-      return res.data;
+      return await this._db.updateTable(params).promise();
     } catch (ex) {
       warning(JSON.stringify({
         class: 'DynamoDB',

src/capacity/CapacityCalculatorBase.js

@@ -10,7 +10,7 @@ import type {
   TableDescription,
   GetMetricStatisticsResponse,
   Dimension,
-} from 'aws-sdk-promise';
+} from 'aws-sdk';
 
 export default class CapacityCalculatorBase {
   cw: CloudWatch;

src/flow/FlowTypes.js

@@ -1,5 +1,5 @@
 /* @flow */
-import type { ProvisionedThroughput, Throughput } from 'aws-sdk-promise';
+import type { ProvisionedThroughput, Throughput } from 'aws-sdk';
 
 export type ThrottledEventsDescription = {
   ThrottledReadEvents: number,

src/provisioning/ProvisionerBase.js

@@ -1,7 +1,7 @@
 /* @flow */
 /* eslint-disable no-unused-vars */
 import { invariant } from '../Global';
-import type { TableDescription, UpdateTableRequest } from 'aws-sdk-promise';
+import type { TableDescription, UpdateTableRequest } from 'aws-sdk';
 import type { TableConsumedCapacityDescription } from '../flow/FlowTypes';
 import DynamoDB from '../aws/DynamoDB';
 import CloudWatch from '../aws/CloudWatch';

src/provisioning/ProvisionerConfigurableBase.js

@@ -7,7 +7,7 @@ import type {
   UpdateTableRequest,
   GlobalSecondaryIndexUpdate,
   Throughput,
-} from 'aws-sdk-promise';
+} from 'aws-sdk';
 import type {
   TableProvisionedAndConsumedThroughput,
   TableConsumedCapacityDescription,