Merge pull request #43 from radify/adds-ami-instance-question

Adds ami id question

Gulpfile.js

@@ -7,7 +7,7 @@ var istanbul  = require('gulp-istanbul');
 var paths = {
   'spec' : 'spec/**/*.js',
   'lib'  : 'lib/**/*.js'
-}
+};
 
 // Proofread the code
 gulp.task('lint', function() {

lib/questions.js

@@ -311,6 +311,16 @@
     default: function(answers) {
       return appendTagDefaultValue(answers, '.pem');
     }
+  }, {
+    type: 'input',
+    name: 'ami_id',
+    message: 'What AMI ID would you like to use? (E.g., ami-47a23a30)',
+    validate: function(value) {
+      var regex =  regexes.ami;
+      var errorMessage = 'The AMI ID must begin with \"ami-\" and must end' +
+        ' with exactly eight lowercase, alphanumeric characters.';
+      return validateInput(value, regex, errorMessage);
+    }
   }, {
     type: 'input',
     name: 'aws_key',

lib/regexes.js

@@ -4,6 +4,12 @@ module.exports = {
    */
   pem: /(.pem)$/,
 
+  /**
+   * The AMI ID must begin with "ami-" and must end with exactly eight,
+   * lowercase, alphanumeric characters.
+   */
+  ami: /^ami-[a-z0-9]{8}$/,
+
   /**
    * AWS Key validation
    *

lib/templates/immutable.yaml.mustache

@@ -7,8 +7,8 @@
     region: '{{ region }}'
     aws_zone: '{{ aws_zone }}'
   tasks:
-  - name: Launch instance (Ubuntu 14.04 hvm)
-    ec2: image='ami-9eaa1cf6'
+  - name: Launch Instance
+    ec2: image='{{ ami_id }}'
          instance_type="{{=<% %>=}}{{ instance_type }}<%={{ }}=%>"
          keypair='{{ keypair }}'
          instance_tags='{"Environment":"{{ environment }}","Class":"{{ className }}-immutable","Name":"{{ appName }} (immutable)"}'

spec/lib/questionsSpec.js

@@ -2,8 +2,8 @@ var questions = require('../../lib/questions.js');
 
 describe('questions.js', function() {
   describe('format', function() {
-    it('should be an array of 24 questions', function() {
-      expect(questions.length).toEqual(24);
+    it('should be an array of 25 questions', function() {
+      expect(questions.length).toEqual(25);
     });
   });
 });