Use region from package.json when generating api.json (#298)

* add vim swp files

* use region from shep config in package.json if provided

* fix lint errors

Author: daviskoh

.gitignore

@@ -2,3 +2,4 @@ node_modules/*
 npm-debug.log
 lib/
 tmp/
+*.swp

src/generate-endpoint/index.js

@@ -8,7 +8,7 @@ const { MissingShepConfiguration } = load
 
 const integration = 'x-amazon-apigateway-integration'
 
-export default async function ({ accountId, path, method, logger = () => {} }) {
+export default async function ({ accountId, path, method, region, logger = () => {} }) {
   if (!accountId) {
     throw new MissingShepConfiguration('Unable to determine your AWS Account ID. Please set it in the `shep` section of package.json')
   }
@@ -23,7 +23,7 @@ export default async function ({ accountId, path, method, logger = () => {} }) {
     await generateFunction({ name, quiet: true })
 
     logger({ type: 'start', body: 'Setup Endpoint' })
-    addPath(api, path, method, accountId, fullName)
+    addPath(api, path, method, accountId, fullName, region)
 
     logger({ type: 'start', body: 'Setup CORS' })
     setupCORS(api, path)
@@ -39,7 +39,7 @@ export default async function ({ accountId, path, method, logger = () => {} }) {
   return path
 }
 
-function addPath (api, path, method, accountId, functionName) {
+function addPath (api, path, method, accountId, functionName, region = 'us-east-1') {
   if (method === 'any') { method = 'x-amazon-apigateway-any-method' }
 
   if (!api.paths) {
@@ -50,7 +50,7 @@ function addPath (api, path, method, accountId, functionName) {
   if (api.paths[path][method] !== undefined) { throw new DuplicateEndpointError(method, path) }
   api.paths[path][method] = api.paths[path][method] || {}
   api.paths[path][method][integration] = {
-    uri: `arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:${accountId}:function:${functionName}:\${stageVariables.functionAlias}/invocations`,
+    uri: `arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${region}:${accountId}:function:${functionName}:\${stageVariables.functionAlias}/invocations`,
     passthroughBehavior: 'when_no_match',
     httpMethod: 'POST',
     type: 'aws_proxy'

test-ava/generate-endpoint/index.js

@@ -10,19 +10,57 @@ const path = '/foo'
 const method = 'get'
 const accountId = 'testid'
 
+let shep
+
 td.when(fs.readJSON('package.json')).thenResolve({ name: 'bar', shep: {} })
 td.when(fs.writeJSON(), { ignoreExtraArgs: true }).thenResolve()
-td.when(load.api()).thenResolve({ paths: {} })
 
-test.before(() => {
-  const shep = require('../../src/index')
-  return shep.generateEndpoint({ accountId, path, method })
+const functionName = 'noice-name-bro'
+const generateName = td.replace('../../src/util/generate-name')
+td.when(generateName(), { ignoreExtraArgs: true }).thenResolve({
+  fullName: functionName
+})
+
+test.before(async () => {
+  shep = require('../../src/index')
 })
 
-test('Writes a new api.json', () => {
+test.beforeEach((t) => {
+  t.context.paths = {}
+
+  td.when(load.api()).thenResolve({ paths: t.context.paths })
+})
+
+test('Writes a new api.json file', async () => {
+  await shep.generateEndpoint({ accountId, path, method })
+
   td.verify(fs.writeJSON('api.json'), { ignoreExtraArgs: true })
 })
 
-test('Generates a new function', () => {
+test('Generates a new function', async () => {
+  await shep.generateEndpoint({ accountId, path, method })
   td.verify(generateFunction(td.matchers.contains({ name: '/foo get' })))
 })
+
+const integration = 'x-amazon-apigateway-integration'
+
+const constructIntegrationObject = (accountId, region) => ({
+  uri: `arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${region}:${accountId}:function:${functionName}:\${stageVariables.functionAlias}/invocations`,
+  passthroughBehavior: 'when_no_match',
+  httpMethod: 'POST',
+  type: 'aws_proxy'
+})
+
+test('adds a basic api path', async (t) => {
+  const region = 'us-west-2'
+
+  await shep.generateEndpoint({ accountId, path, method, region })
+
+  t.deepEqual(t.context.paths[path][method][integration], constructIntegrationObject(accountId, region))
+})
+
+test('defaults to us-east-1 region', async (t) => {
+  await shep.generateEndpoint({ accountId, path, method })
+
+  t.deepEqual(t.context.paths[path][method][integration], constructIntegrationObject(accountId, 'us-east-1'))
+})