improve stage list

src/bin/aglex.js

@@ -118,10 +118,10 @@ switch (argv._[0]) {
         break
       case 'stages':
         console.log('Getting stage info for API ...')
-        aglex.getApiStages().then(data => {
-          _.forEach(data, (val, key) => {
-            console.log(`${key}: ${val}`)
-          })
+        aglex.getApiStages().then(stages => {
+          for (let stage of stages) {
+            console.log(`${stage.stageName}: ${stage.description} (${stage.invokeUrl})`)
+          }
           console.log('Completed.')
         }, err => {
           debug(err)

src/lib/aglex.js

@@ -22,13 +22,6 @@ class Aglex {
     debug('getApiStages called')
     const lib = aglexLib(this.config, this.logLevel)
     return lib.getApiStages()
-    .then(stages => {
-      const data = {}
-      for (let stage of stages) {
-        data[stage.stageName] = stage.description
-      }
-      return data
-    })
   }
 
   updateApi () {

src/lib/aglexLib.js

@@ -398,6 +398,7 @@ class AglexLib {
         logger.info((`cannot find api ${this.config.apiGateway.name}`).red)
         throw new Error('Error')
       }
+      logger.info(`found restApi ${api.name} ${api.id}`)
       return api.stages()
     }, err => {
       logger.info((err.toString()).red)

src/lib/apiGateway/restApi.js

@@ -5,11 +5,12 @@ const debug = Debug('aglex.apiGateway.restApi')
 
 import {resource} from './resource'
 import {deployment} from './deployment'
-import {Stage} from './stage'
+import {stage} from './stage'
 
 export const restApi = api => {
   const Resource = resource(api)
   const Deployment = deployment(api)
+  const Stage = stage(api)
 
   class RestApi {
     constructor (data) {

src/lib/apiGateway/stage.js

@@ -1,8 +1,13 @@
 import _ from 'lodash'
 
-export class Stage {
-  constructor (restApi, data) {
-    this._restApi = restApi
-    _.merge(this, data)
+export const stage = api => {
+  class Stage {
+    constructor (restApi, data) {
+      this._restApi = restApi
+      _.merge(this, data)
+      this.invokeUrl = `https://${restApi.id}.execute-api.${api.config.region}.amazonaws.com/${this.stageName}`
+    }
   }
+
+  return Stage
 }

test/apiGateway/resource.spec.js

@@ -11,9 +11,9 @@ target.__Rewire__('method', () => stub.method)
 describe('resource', () => {
   const apiGateway = new AWS.APIGateway()
   const RestApi = class {}
-  const api = new RestApi()
+  const restApi = new RestApi()
   const Resource = lib.resource(apiGateway)
-  const res = new Resource(api, {
+  const res = new Resource(restApi, {
     id: '12345abcde',
     path: '/',
     resourceMethods: {
@@ -39,7 +39,7 @@ describe('resource', () => {
   describe('Resource.create', () => {
     it('should return promise object', () => {
       sb.stub(apiGateway, 'createResourceAsync').returns(new Promise(() => {}))
-      const ret = Resource.create(api, {path: '/'})
+      const ret = Resource.create(restApi, {path: '/'})
 
       expect(ret).to.be.an.instanceof(Promise)
     })
@@ -49,7 +49,7 @@ describe('resource', () => {
         id: '12345abcde',
         path: '/'
       }))
-      const ret = Resource.create(api, {path: '/'})
+      const ret = Resource.create(restApi, {path: '/'})
 
       ret.done((data) => check(done, () => {
         expect(data).to.deep.equal({
@@ -63,7 +63,7 @@ describe('resource', () => {
 
   describe('constructor', () => {
     it('should generate a valid object', () => {
-      expect(res._restApi).to.equal(api)
+      expect(res._restApi).to.equal(restApi)
       expect(res).to.have.property('id', '12345abcde')
       expect(res).to.have.property('path', '/')
     })

test/apiGateway/stage.spec.js

@@ -1,14 +1,11 @@
-import { expect, sinon } from '../helper'
-import {Stage} from '../../src/lib/apiGateway/stage'
+import { AWS, expect, sinon } from '../helper'
+import * as lib from '../../src/lib/apiGateway/stage'
 
 describe('stage', () => {
+  const apiGateway = new AWS.APIGateway()
   const RestApi = class {}
   const restApi = new RestApi()
-  const stage = new Stage(restApi, {
-    stageName: 'foo',
-    deploymentId: '123abc',
-    createdDate: 'Fri, 01 Jan 2016 00:00:00 GMT'
-  })
+  const Stage = lib.stage(apiGateway)
   const sb = sinon.sandbox.create()
 
   before(() => {
@@ -21,7 +18,14 @@ describe('stage', () => {
 
   describe('constructor', () => {
     it('should generate a valid object', () => {
+      const stage = new Stage(restApi, {
+        stageName: 'foo',
+        deploymentId: '123abc',
+        createdDate: 'Fri, 01 Jan 2016 00:00:00 GMT'
+      })
+
       expect(stage._restApi).to.equal(restApi)
+      expect(stage).to.have.property('invokeUrl', 'https://12345abcde.execute-api.us-east-1.amazonaws.com/foo')
       expect(stage).to.have.property('stageName', 'foo')
       expect(stage).to.have.property('deploymentId', '123abc')
       expect(stage).to.have.property('createdDate', 'Fri, 01 Jan 2016 00:00:00 GMT')

test/helper.js

@@ -16,6 +16,11 @@ const AWS = {
   },
 
   APIGateway: class {
+    constructor () {
+      this.config = {
+        region: 'us-east-1'
+      }
+    }
     createDeploymentAsync () {}
     createResourceAsync () {}
     createRestApiAsync () {}