refactor: using Fn::Sub around SQS

Author: horike37

lib/package/sqs/compileMethodsToSqs.js

@@ -47,31 +47,16 @@ module.exports = {
   },
 
   getSqsMethodIntegration(http) {
-    let queueName = http.queueName
-    if (typeof http.queueName == 'string') {
-      queueName = `"${queueName}"`
-    }
     const integration = {
       IntegrationHttpMethod: 'POST',
       Type: 'AWS',
       Credentials: {
         'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn']
       },
       Uri: {
-        'Fn::Join': [
-          '',
-          [
-            'arn:aws:apigateway:',
-            {
-              Ref: 'AWS::Region'
-            },
-            ':sqs:path//',
-            {
-              Ref: 'AWS::AccountId'
-            },
-            '/',
-            queueName
-          ]
+        'Fn::Sub': [
+          'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+          { queueName: http.queueName }
         ]
       },
       RequestParameters: _.merge(

lib/package/sqs/compileMethodsToSqs.test.js

@@ -67,16 +67,11 @@ describe('#compileMethodsToSqs()', () => {
             Type: 'AWS',
             Credentials: { 'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn'] },
             Uri: {
-              'Fn::Join': [
-                '',
-                [
-                  'arn:aws:apigateway:',
-                  { Ref: 'AWS::Region' },
-                  ':sqs:path//',
-                  { Ref: 'AWS::AccountId' },
-                  '/',
-                  '"myQueue"'
-                ]
+              'Fn::Sub': [
+                'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+                {
+                  queueName: 'myQueue'
+                }
               ]
             },
             RequestParameters: {
@@ -171,16 +166,11 @@ describe('#compileMethodsToSqs()', () => {
             Type: 'AWS',
             Credentials: { 'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn'] },
             Uri: {
-              'Fn::Join': [
-                '',
-                [
-                  'arn:aws:apigateway:',
-                  { Ref: 'AWS::Region' },
-                  ':sqs:path//',
-                  { Ref: 'AWS::AccountId' },
-                  '/',
-                  '"myQueue"'
-                ]
+              'Fn::Sub': [
+                'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+                {
+                  queueName: 'myQueue'
+                }
               ]
             },
             RequestParameters: {
@@ -274,16 +264,11 @@ describe('#compileMethodsToSqs()', () => {
             Type: 'AWS',
             Credentials: { 'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn'] },
             Uri: {
-              'Fn::Join': [
-                '',
-                [
-                  'arn:aws:apigateway:',
-                  { Ref: 'AWS::Region' },
-                  ':sqs:path//',
-                  { Ref: 'AWS::AccountId' },
-                  '/',
-                  '"myQueue"'
-                ]
+              'Fn::Sub': [
+                'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+                {
+                  queueName: 'myQueue'
+                }
               ]
             },
             RequestParameters: {
@@ -365,16 +350,11 @@ describe('#compileMethodsToSqs()', () => {
             Type: 'AWS',
             Credentials: { 'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn'] },
             Uri: {
-              'Fn::Join': [
-                '',
-                [
-                  'arn:aws:apigateway:',
-                  { Ref: 'AWS::Region' },
-                  ':sqs:path//',
-                  { Ref: 'AWS::AccountId' },
-                  '/',
-                  '"myQueue"'
-                ]
+              'Fn::Sub': [
+                'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+                {
+                  queueName: 'myQueue'
+                }
               ]
             },
             RequestParameters: {
@@ -456,16 +436,11 @@ describe('#compileMethodsToSqs()', () => {
             Type: 'AWS',
             Credentials: { 'Fn::GetAtt': ['ApigatewayToSqsRole', 'Arn'] },
             Uri: {
-              'Fn::Join': [
-                '',
-                [
-                  'arn:aws:apigateway:',
-                  { Ref: 'AWS::Region' },
-                  ':sqs:path//',
-                  { Ref: 'AWS::AccountId' },
-                  '/',
-                  '"myQueue"'
-                ]
+              'Fn::Sub': [
+                'arn:aws:apigateway:${AWS::Region}:sqs:path//${AWS::AccountId}/${queueName}',
+                {
+                  queueName: 'myQueue'
+                }
               ]
             },
             RequestParameters: {