chore: fix part of generating Cfn for dynamodb

Author: horike37

lib/package/dynamodb/compileIamRoleToDynamodb.js

@@ -11,7 +11,7 @@ module.exports = {
 
         return {
           tableName: serviceProxy.dynamodb.tableName,
-          action: this.getDynamodbAction(serviceProxy.dynamodb)
+          action: serviceProxy.dynamodb.action
         }
       })
     })

lib/package/dynamodb/compileIamRoleToDynamodb.test.js

@@ -31,7 +31,11 @@ describe('#compileIamRoleToDynamodb()', () => {
             path: '/dynamodb/v1',
             tableName: { Ref: 'mytable' },
             method: 'post',
-            hashKey: 'id'
+            action: 'PutItem',
+            hashKey: {
+              pathParam: 'id',
+              attributeType: 'S'
+            }
           }
         },
         {
@@ -55,16 +59,6 @@ describe('#compileIamRoleToDynamodb()', () => {
               queryStringParam: 'id'
             }
           }
-        },
-        {
-          dynamodb: {
-            path: '/dynamodb/v2',
-            tableName: 'mytable',
-            method: 'patch',
-            hashKey: {
-              queryStringParam: 'id'
-            }
-          }
         }
       ]
     }
@@ -132,18 +126,6 @@ describe('#compileIamRoleToDynamodb()', () => {
                         }
                       ]
                     }
-                  },
-                  {
-                    Effect: 'Allow',
-                    Action: 'dynamodb:UpdateItem',
-                    Resource: {
-                      'Fn::Sub': [
-                        'arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tableName}',
-                        {
-                          tableName: 'mytable'
-                        }
-                      ]
-                    }
                   }
                 ]
               }

lib/package/dynamodb/compileMethodsToDynamodb.js

@@ -6,7 +6,6 @@ module.exports = {
   compileMethodsToDynamodb() {
     this.validated.events.forEach((event) => {
       if (event.serviceName == 'dynamodb') {
-        event.http.action = this.getDynamodbAction(event.http)
         const resourceId = this.getResourceId(event.http.path)
         const resourceName = this.getResourceName(event.http.path)
 
@@ -44,25 +43,6 @@ module.exports = {
     })
   },
 
-  getDynamodbAction(http) {
-    if (!_.has(http, 'action')) {
-      switch (http.method.toUpperCase()) {
-        case 'PUT':
-          return 'PutItem'
-        case 'POST':
-          return 'PutItem'
-        case 'GET':
-          return 'GetItem'
-        case 'DELETE':
-          return 'DeleteItem'
-        case 'PATCH':
-          return 'UpdateItem'
-      }
-    }
-
-    return http.action
-  },
-
   getDynamodbMethodIntegration(http) {
     const integration = {
       IntegrationHttpMethod: 'POST',
@@ -153,20 +133,6 @@ module.exports = {
         attributeValue: `$input.params().querystring.${http.hashKey.queryStringParam}`
       }
     }
-
-    if (http.hashKey.bodyParam) {
-      return {
-        key: http.hashKey.bodyParam,
-        attributeType: http.hashKey.attributeType,
-        attributeValue: `$util.parseJson($input.body).${http.hashKey.bodyParam}`
-      }
-    }
-
-    return {
-      key: http.hashKey,
-      attributeType: 'S',
-      attributeValue: '$context.requestId'
-    }
   },
 
   getDynamodbObjectRangekeyParameter(http) {
@@ -185,30 +151,9 @@ module.exports = {
         attributeValue: `$input.params().querystring.${http.rangeKey.queryStringParam}`
       }
     }
-
-    if (http.rangeKey.bodyParam) {
-      return {
-        key: http.rangeKey.bodyParam,
-        attributeType: http.rangeKey.attributeType,
-        attributeValue: `$util.parseJson($input.body).${http.rangeKey.bodyParam}`
-      }
-    }
-
-    return {
-      key: http.rangeKey,
-      attributeType: 'S',
-      attributeValue: '$context.requestId'
-    }
   },
 
   getDefaultDynamodbResponseTemplates(http) {
-    if (http.action === 'PutItem' && _.isString(http.hashKey)) {
-      return {
-        'application/json': this.getPutItemDefaultDynamodbResponseTemplate(http),
-        'application/x-www-form-urlencoded': this.getPutItemDefaultDynamodbResponseTemplate(http)
-      }
-    }
-
     if (http.action === 'GetItem') {
       return {
         'application/json': this.getGetItemDefaultDynamodbResponseTemplate(),
@@ -223,19 +168,6 @@ module.exports = {
     return `#set($item = $input.path('$.Item')){#foreach($key in $item.keySet())#set ($value = $item.get($key))#foreach( $type in $value.keySet())"$key":"$value.get($type)"#if($foreach.hasNext()),#end#end#if($foreach.hasNext()),#end#end}`
   },
 
-  getPutItemDefaultDynamodbResponseTemplate(http) {
-    const objectRequestParam = this.getDynamodbObjectHashkeyParameter(http)
-    return {
-      'Fn::Sub': [
-        '{"${HashKey}": "${HashAttributeValue}"}',
-        {
-          HashKey: `${objectRequestParam.key}`,
-          HashAttributeValue: `${objectRequestParam.attributeValue}`
-        }
-      ]
-    }
-  },
-
   buildDefaultDynamodbRequestTemplate(http) {
     switch (http.action) {
       case 'PutItem':
@@ -244,8 +176,6 @@ module.exports = {
         return this.buildDefaultDynamodbGetItemRequestTemplate(http)
       case 'DeleteItem':
         return this.buildDefaultDynamodbDeleteItemRequestTemplate(http)
-      case 'UpdateItem':
-        return this.buildDefaultDynamodbUpdateItemRequestTemplate(http)
     }
   },
 
@@ -275,37 +205,6 @@ module.exports = {
     }
   },
 
-  buildDefaultDynamodbUpdateItemRequestTemplate(http) {
-    const fuSubValues = {
-      TableName: http.tableName
-    }
-
-    let requestTemplate = '{"TableName": "${TableName}","Key":{'
-    if (_.has(http, 'hashKey')) {
-      requestTemplate += '"${HashKey}": {"${HashAttributeType}": "${HashAttributeValue}"}'
-      Object.assign(fuSubValues, this.getDynamodbHashkeyFnSubValues(http))
-    }
-
-    if (_.has(http, 'rangeKey')) {
-      requestTemplate += ',"${RangeKey}": {"${RangeAttributeType}": "${RangeAttributeValue}"}'
-      Object.assign(fuSubValues, this.getDynamodbRangekeyFnSubValues(http))
-    }
-
-    requestTemplate += '}'
-    requestTemplate += `
-      #set ($body = $input.path('$'))
-      ,"UpdateExpression":"$body.UpdateExpression"
-      ,"ExpressionAttributeValues":$input.json('$.ExpressionAttributeValues')
-      #if ($body.ExpressionAttributeNames != "")
-        ,"ExpressionAttributeNames":$input.json('$.ExpressionAttributeNames')
-      #end
-    `
-    requestTemplate += '}'
-    return {
-      'Fn::Sub': [`${requestTemplate}`, fuSubValues]
-    }
-  },
-
   buildDefaultDynamodbGetItemRequestTemplate(http) {
     const fuSubValues = {
       TableName: http.tableName