kontena-plugin-aws 0.2.0.pre1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkzMTFkZDliMjJjNTI1NzhjYWFmMGZkYzllMzFmZDM2NjQxMzgwMQ==
+    OWYyM2NkMmM4YTdkZGU5ZDAzZWRiMzUyMjYwZDFjMDA0ZmI0ZTRkOA==
   data.tar.gz: !binary |-
-    ODIyMjJlNDM3NTRhOWNiM2UwZTJkZDRmZmEyY2U2ZDM0NjM1YTcxNQ==
+    MWM3MmY3NTgzMzQzZWFkZjQyODA2OTg5Yzk0ZmFkOTZiNTI3OTA0Nw==
 SHA512:
   metadata.gz: !binary |-
-    MmUwNDkwZTdjNjRkMWQyNGYzYjM0M2ZmYjc0ODI3MDczYzA5YWQxZWFiODcx
-    ZDBhMzI0OTEyMWY4N2M1MmRlYzI2ZjRmNjE5ZGExZjEwY2E1OWE1NWYxMzk4
-    NTYxYjY1OTUxNWU4ZTg1MTgyMjUyNTJiZDgwODM0MjQ4ZDljY2Y=
+    YTBhODExYWY2NzZkZjc0YTgxNTJhNjM5MDFhOGI0NTY0YTMyOTkxMzhmMmJm
+    Y2E1N2Y4NDJkNjc5MGMwZDQzMzY1YWFhMTUzY2VjZDM1ZDM2YTM3N2U0NDAw
+    MGU3MjNiMDBhYzI3YjZmYWMzZGQ5YjA4ODVlNWY1ZTc2OWY5ZjA=
   data.tar.gz: !binary |-
-    NjM4MGQ2YjMzZjUxMGE2ZTY3ODQ4ZTAzYmYzNDE5YmQ1Njc3OGQ3Nzg4YTcx
-    MTk3NzA1OWI0OWE4MjI4NjQyZWQ5ZTMxODIwM2M2MjYwYzJkOWE4Nzc5NDNl
-    ZjBlZDllOWVmNmY3MDY5MjI5YjM0MGMwZTVmM2MxOWJlNWM0NzY=
+    MWUyZDlhY2Y5NzQ5MjQ0NTU0Njc4NTJmMjYxMmE0ZTJlZThkZjhmNzlkZGEw
+    NDE0MDliYWRmYjJkMmRkZmRlOGM3ZDU4YjlkYTNhODhhM2QzOTAyODg2YjFl
+    NGQ5MTczMDY0MjJhY2ZiZTJlNzAyMGZkNDY3YjI0MjczYzkwZjY=

data/lib/kontena/machine/aws/cloudinit.yml

@@ -33,7 +33,16 @@ coreos:
         DOMAINS=kontena.local
         [DHCP]
         UseDNS=false
-
+    - name: etcd2.service
+      command: start
+      enable: true
+      content: |
+        Description=etcd 2.0
+        After=docker.service
+        [Service]
+        Restart=always
+        RestartSec=5
+        ExecStart=/usr/bin/docker logs --tail=10 -f kontena-etcd
     - name: 10-weave.network
       runtime: false
       content: |

data/lib/kontena/machine/aws/cloudinit_master.yml

@@ -89,11 +89,11 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
   <% end -%>
-  <% if server_name %>
-            -e KONTENA_SERVER_NAME=<%= server_name %> \
+  <% if server_name -%>
+            -e SERVER_NAME=<%= server_name %> \
   <% end -%>
-  <% if initial_admin_code %>
-            -e KONTENA_INITIAL_ADMIN_CODE=<%= intial_admin_code %> \
+  <% if initial_admin_code -%>
+            -e INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
   <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}

data/lib/kontena/machine/aws/master_provisioner.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'securerandom'
+require 'json'
 
 require_relative 'common'
 
@@ -10,7 +11,7 @@ module Kontena::Machine::Aws
     include Kontena::Machine::RandomName
     include Kontena::Machine::CertHelper
     include Common
-    include Kontena::Cli::ShellSpinner
+    include Kontena::Cli::Common
 
     attr_reader :ec2, :http_client, :region
 
@@ -30,7 +31,7 @@ module Kontena::Machine::Aws
         abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
         ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
       else
-        spinner "Generating self-signed SSL certificate" do
+        spinner "Generating a self-signed SSL certificate" do
           ssl_cert = generate_self_signed_cert
         end
       end
@@ -89,10 +90,11 @@ module Kontena::Machine::Aws
         ]
       })
 
-      spinner "Creating AWS instance #{name.colorize(:cyan)} " do
+      spinner "Creating an AWS instance #{name.colorize(:cyan)} " do
         sleep 1 until ec2_instance.reload.state.name == 'running'
       end
       public_ip = ec2_instance.reload.public_ip_address
+      master_version = nil
       if public_ip.nil?
         master_url = "https://#{ec2_instance.private_ip_address}"
         puts "Could not get public IP for the created master, private connect url is: #{master_url}"
@@ -101,16 +103,21 @@ module Kontena::Machine::Aws
         Excon.defaults[:ssl_verify_peer] = false
         http_client = Excon.new(master_url, :connect_timeout => 10)
         spinner "Waiting for #{name.colorize(:cyan)} to start " do
-          sleep 1 until master_running?(http_client)
+          sleep 0.5 until master_running?(http_client)
         end
+
+        spinner "Retrieving Kontena Master version" do
+          master_version = JSON.parse(http_client.get(path: '/').body)["version"] rescue nil
+        end
+
+        spinner "Kontena Master #{master_version} is now running at #{master_url}"
       end
-      puts
-      puts "Kontena Master is now running at #{master_url}".colorize(:green)
-      puts
       {
         name: name.sub('kontena-master-', ''),
         public_ip: public_ip,
-        code: opts[:initial_admin_code]
+        code: opts[:initial_admin_code],
+        provider: 'aws',
+        version: master_version
       }
     end
 

data/lib/kontena/machine/aws/node_provisioner.rb

@@ -33,69 +33,82 @@ module Kontena::Machine::Aws
           resolve_security_groups_to_ids(opts[:security_groups], opts[:vpc]) :
           ensure_security_group(opts[:grid], opts[:vpc])
 
-      name = opts[:name ] || generate_name
-
       if opts[:subnet].nil?
         subnet = default_subnet(opts[:vpc], region+opts[:zone])
       else
         subnet = ec2.subnet(opts[:subnet])
       end
       dns_server = aws_dns_supported?(opts[:vpc]) ? '169.254.169.253' : '8.8.8.8'
-      userdata_vars = {
-        name: name,
-        version: opts[:version],
-        master_uri: opts[:master_uri],
-        grid_token: opts[:grid_token],
-        dns_server: dns_server
-      }
-
-      ec2_instance = ec2.create_instances({
-        image_id: ami,
-        min_count: 1,
-        max_count: 1,
-        instance_type: opts[:type],
-        key_name: opts[:key_pair],
-        user_data: Base64.encode64(user_data(userdata_vars)),
-        block_device_mappings: [
-          {
-            device_name: '/dev/xvda',
-            virtual_name: 'Root',
-            ebs: {
-              volume_size: opts[:storage],
-              volume_type: 'gp2'
-            }
-          }
-        ],
-        network_interfaces: [
-         {
-           device_index: 0,
-           subnet_id: subnet.subnet_id,
-           groups: security_groups,
-           associate_public_ip_address: opts[:associate_public_ip],
-           delete_on_termination: true
-         }
-        ]
-      }).first
-      ec2_instance.create_tags({
-        tags: [
-          {key: 'Name', value: name},
-          {key: 'kontena_grid', value: opts[:grid]}
-        ]
-      })
+      instances = []
+      opts[:count].to_i.times do |i|
+        if opts[:name] && opts[:count].to_i > 1
+          name = "#{opts[:name]}-#{i+1}"
+        elsif opts[:name]
+          name = opts[:name]
+        else
+          name = generate_name
+        end
 
-      spinner "Creating AWS instance #{name.colorize(:cyan)} " do
-        sleep 1 until ec2_instance.reload.state.name == 'running'
+        userdata_vars = {
+          name: name,
+          version: opts[:version],
+          master_uri: opts[:master_uri],
+          grid_token: opts[:grid_token],
+          dns_server: dns_server
+        }
+
+        ec2_instance = ec2.create_instances({
+          image_id: ami,
+          min_count: 1,
+          max_count: 1,
+          instance_type: opts[:type],
+          key_name: opts[:key_pair],
+          user_data: Base64.encode64(user_data(userdata_vars)),
+          block_device_mappings: [
+            {
+              device_name: '/dev/xvda',
+              virtual_name: 'Root',
+              ebs: {
+                volume_size: opts[:storage],
+                volume_type: 'gp2'
+              }
+            }
+          ],
+          network_interfaces: [
+           {
+             device_index: 0,
+             subnet_id: subnet.subnet_id,
+             groups: security_groups,
+             associate_public_ip_address: opts[:associate_public_ip],
+             delete_on_termination: true
+           }
+          ]
+        }).first
+        ec2_instance.create_tags({
+          tags: [
+            {key: 'Name', value: name},
+            {key: 'kontena_grid', value: opts[:grid]}
+          ]
+        })
+
+        spinner "Creating AWS instance #{name.colorize(:cyan)} " do
+          sleep 1 until ec2_instance.reload.state.name == 'running'
+        end
+        instances << name
       end
-      node = nil
-      spinner "Waiting for node #{name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
-        sleep 1 until node = instance_exists_in_grid?(opts[:grid], name)
+      instances.each do |instance_name|
+        node = nil
+        spinner "Waiting for node #{instance_name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+          sleep 1 until node = instance_exists_in_grid?(opts[:grid], instance_name)
+        end
+        labels = [
+          "region=#{region}",
+          "az=#{opts[:zone]}",
+          "provider=aws",
+          "type=#{opts[:type]}"
+        ]
+        set_labels(node, labels)
       end
-      labels = [
-        "region=#{region}",
-        "az=#{opts[:zone]}",
-        "provider=aws"
-      ]
-      set_labels(node, labels)
     end
 
     ##

data/lib/kontena/plugin/aws.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Aws
-      VERSION = "0.2.0.pre1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/kontena/plugin/aws/master/create_command.rb

@@ -1,20 +1,22 @@
 require 'securerandom'
+require_relative '../prompts'
 
 module Kontena::Plugin::Aws::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Plugin::Aws::Prompts
 
     option "--name", "[NAME]", "Set Master name"
-    option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
-    option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
-    option "--key-pair", "KEY_PAIR", "EC2 key pair name", required: true
+    option "--access-key", "ACCESS_KEY", "AWS access key ID", environment_variable: "AWS_ACCESS_KEY_ID"
+    option "--secret-key", "SECRET_KEY", "AWS secret access key", environment_variable: "AWS_SECRET_ACCESS_KEY"
+    option "--key-pair", "KEY_PAIR", "EC2 key pair name"
     option "--ssl-cert", "SSL CERT", "SSL certificate file (default: generate self-signed cert)"
-    option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
-    option "--zone", "ZONE", "EC2 Availability Zone", default: 'a'
-    option "--vpc-id", "VPC ID", "Virtual Private Cloud (VPC) ID (default: default vpc)"
-    option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into (default: first subnet from vpc/az)"
-    option "--type", "SIZE", "Instance type", default: 't2.small'
-    option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
+    option "--region", "REGION", "EC2 Region", environment_variable: "AWS_REGION"
+    option "--zone", "ZONE", "EC2 Availability Zone (a,b,c,d,e)"
+    option "--vpc-id", "VPC ID", "Virtual Private Cloud (VPC) ID"
+    option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into (default: first subnet in vpc/az)"
+    option "--type", "SIZE", "Instance type"
+    option "--storage", "STORAGE", "Storage size (GiB)"
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (default: generate random secret)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (default: generate random iv)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
@@ -24,18 +26,28 @@ module Kontena::Plugin::Aws::Master
 
     def execute
       require 'kontena/machine/aws'
+      aws_access_key = ask_aws_access_key
+      aws_secret_key = ask_aws_secret_key
+      aws_region = ask_aws_region(aws_access_key, aws_secret_key)
+      aws_zone = ask_aws_az(aws_access_key, aws_secret_key, aws_region)
+      aws_vpc_id = ask_aws_vpc(aws_access_key, aws_secret_key, aws_region)
 
-      provisioner = provisioner(access_key, secret_key, region)
+      exit_with_error("Could not find any Virtual Private Cloud (VPC). Please create one in the AWS console first.") unless aws_vpc_id
+      aws_subnet_id = ask_aws_subnet(aws_access_key, aws_secret_key, aws_region, aws_zone, aws_vpc_id)
+      aws_key_pair = ask_aws_key_pair(aws_access_key, aws_secret_key, aws_region)
+      aws_type = ask_aws_instance_type
+      aws_storage = ask_aws_storage
+      provisioner = provisioner(aws_access_key, aws_secret_key, aws_region)
       provisioner.run!(
           name: name,
-          type: type,
-          vpc: vpc_id,
-          zone: zone,
-          subnet: subnet_id,
+          type: aws_type,
+          vpc: aws_vpc_id,
+          zone: aws_zone,
+          subnet: aws_subnet_id,
           ssl_cert: ssl_cert,
-          storage: storage,
+          storage: aws_storage,
           version: version,
-          key_pair: key_pair,
+          key_pair: aws_key_pair,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),
           mongodb_uri: mongodb_uri,

data/lib/kontena/plugin/aws/nodes/create_command.rb

@@ -2,17 +2,19 @@ module Kontena::Plugin::Aws::Nodes
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::Aws::Prompts
 
     parameter "[NAME]", "Node name"
-    option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
-    option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
-    option "--key-pair", "KEY_PAIR", "EC2 Key Pair", required: true
-    option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
-    option "--zone", "ZONE", "EC2 Availability Zone", default: 'a'
+    option "--access-key", "ACCESS_KEY", "AWS access key ID", environment_variable: "AWS_ACCESS_KEY_ID"
+    option "--secret-key", "SECRET_KEY", "AWS secret access key", environment_variable: "AWS_SECRET_ACCESS_KEY"
+    option "--key-pair", "KEY_PAIR", "EC2 Key Pair"
+    option "--region", "REGION", "EC2 Region", environment_variable: "AWS_REGION"
+    option "--zone", "ZONE", "EC2 Availability Zone (a,b,c,d,e)"
     option "--vpc-id", "VPC ID", "Virtual Private Cloud (VPC) ID (default: default vpc)"
     option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into (default: first subnet in vpc/az)"
-    option "--type", "SIZE", "Instance type", default: 't2.small'
-    option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
+    option "--type", "SIZE", "Instance type"
+    option "--storage", "STORAGE", "Storage size (GiB)"
+    option "--count", "COUNT", "How many instances to create"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--associate-public-ip-address", :flag, "Whether to associated public IP in case the VPC defaults to not doing it", default: true, attribute_name: :associate_public_ip
     option "--security-groups", "SECURITY GROUPS", "Comma separated list of security groups (names) where the new instance will be attached (default: create grid specific group if not already existing)"
@@ -23,19 +25,31 @@ module Kontena::Plugin::Aws::Nodes
 
       require 'kontena/machine/aws'
       grid = fetch_grid(current_grid)
-      provisioner = provisioner(client(require_token), access_key, secret_key, region)
+      aws_access_key = ask_aws_access_key
+      aws_secret_key = ask_aws_secret_key
+      aws_region = ask_aws_region(aws_access_key, aws_secret_key)
+      aws_zone = ask_aws_az(aws_access_key, aws_secret_key, aws_region)
+      aws_vpc_id = ask_aws_vpc(aws_access_key, aws_secret_key, aws_region)
+      exit_with_error("Could not find any Virtual Private Cloud (VPC). Please create one in the AWS console first.") unless aws_vpc_id
+      aws_subnet_id = ask_aws_subnet(aws_access_key, aws_secret_key, aws_region, aws_zone, aws_vpc_id)
+      aws_key_pair = ask_aws_key_pair(aws_access_key, aws_secret_key, aws_region)
+      aws_type = ask_aws_instance_type
+      aws_storage = ask_aws_storage
+      aws_count = ask_instance_count
+      provisioner = provisioner(client(require_token), aws_access_key, aws_secret_key, aws_region)
       provisioner.run!(
           master_uri: api_url,
           grid_token: grid['token'],
           grid: current_grid,
           name: name,
-          type: type,
-          vpc: vpc_id,
-          zone: zone,
-          subnet: subnet_id,
-          storage: storage,
+          type: aws_type,
+          vpc: aws_vpc_id,
+          zone: aws_zone,
+          subnet: aws_subnet_id,
+          storage: aws_storage,
           version: version,
-          key_pair: key_pair,
+          key_pair: aws_key_pair,
+          count: aws_count,
           associate_public_ip: associate_public_ip?,
           security_groups: security_groups
       )
@@ -55,5 +69,13 @@ module Kontena::Plugin::Aws::Nodes
     def provisioner(client, access_key, secret_key, region)
       Kontena::Machine::Aws::NodeProvisioner.new(client, access_key, secret_key, region)
     end
+
+    def ask_instance_count
+      if self.count.nil?
+        prompt.ask('How many instances?: ', default: 1)
+      else
+        self.count
+      end
+    end
   end
 end

data/lib/kontena/plugin/aws/nodes/restart_command.rb

@@ -1,25 +1,40 @@
 module Kontena::Plugin::Aws::Nodes
-  class RestartCommand < Clamp::Command
+  class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::Aws::Prompts
 
-    parameter "NAME", "Node name"
-    option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
-    option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
-    option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
+    parameter "[NAME]", "Node name"
+    option "--access-key", "ACCESS_KEY", "AWS access key ID", environment_variable: "AWS_ACCESS_KEY_ID"
+    option "--secret-key", "SECRET_KEY", "AWS secret access key", environment_variable: "AWS_SECRET_ACCESS_KEY"
+    option "--region", "REGION", "EC2 Region", environment_variable: "AWS_REGION"
 
     def execute
       require_api_url
       require_current_grid
+      token = require_token
+      node_name = self.name || ask_node(token)
+      node = client(token).get("grids/#{current_grid}/nodes/#{node_name}")
 
+      aws_access_key = ask_aws_access_key
+      aws_secret_key = ask_aws_secret_key
+      aws_region = self.region || resolve_or_ask_region(node, aws_access_key, aws_secret_key)
       require_relative '../../../machine/aws'
 
-      restarter = restarter(access_key, secret_key, region)
-      restarter.run!(name)
+      restarter = restarter(aws_access_key, aws_secret_key, aws_region)
+      restarter.run!(node_name)
     end
 
     def restarter(access_key, secret_key, region)
       Kontena::Machine::Aws::NodeRestarter.new(access_key, secret_key, region)
     end
+
+    def resolve_or_ask_region(node, access_key, secret_key)
+      if node['labels'] && region_label = node['labels'].find{ |l| l.split('=').first == 'region' }
+        region = region_label.split('=').last
+      end
+      region = ask_aws_region(access_key, secret_key) unless region
+      region
+    end
   end
 end

data/lib/kontena/plugin/aws/nodes/terminate_command.rb

@@ -1,25 +1,43 @@
 module Kontena::Plugin::Aws::Nodes
-  class TerminateCommand < Clamp::Command
+  class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::Aws::Prompts
 
-    parameter "NAME", "Node name"
-    option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
-    option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
-    option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
+    parameter "[NAME]", "Node name"
+    option "--access-key", "ACCESS_KEY", "AWS access key ID", environment_variable: "AWS_ACCESS_KEY_ID"
+    option "--secret-key", "SECRET_KEY", "AWS secret access key", environment_variable: "AWS_SECRET_ACCESS_KEY"    
+    option "--region", "REGION", "EC2 Region (default: node's region)", environment_variable: "AWS_REGION"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       require_current_grid
 
+      token = require_token
+      node_name = self.name || ask_node(token)
+      node = client(token).get("grids/#{current_grid}/nodes/#{node_name}")
+      aws_access_key = ask_aws_access_key
+      aws_secret_key = ask_aws_secret_key
+      aws_region = self.region || resolve_or_ask_region(node, aws_access_key, aws_secret_key)
+
+      confirm_command(node_name) unless forced?
       require 'kontena/machine/aws'
       grid = client(require_token).get("grids/#{current_grid}")
-      destroyer = destroyer(client(require_token), access_key, secret_key, region)
-      destroyer.run!(grid, name)
+      destroyer = destroyer(client(require_token), aws_access_key, aws_secret_key, aws_region)
+      destroyer.run!(grid, node_name)
     end
 
     def destroyer(client, access_key, secret_key, region)
       Kontena::Machine::Aws::NodeDestroyer.new(client, access_key, secret_key, region)
     end
+
+    def resolve_or_ask_region(node, access_key, secret_key)
+      if node['labels'] && region_label = node['labels'].find{ |l| l.split('=').first == 'region' }
+        region = region_label.split('=').last
+      end
+      region = ask_aws_region(access_key, secret_key) unless region
+      region
+    end
   end
 end

data/lib/kontena/plugin/aws/prompts.rb

@@ -0,0 +1,148 @@
+require 'aws-sdk'
+module Kontena::Plugin::Aws::Prompts
+
+  def ask_aws_access_key
+    if self.access_key.nil?
+      prompt.ask('AWS access key: ', echo: false)
+    else
+      self.access_key
+    end
+  end
+
+  def ask_aws_secret_key
+    if self.secret_key.nil?
+      prompt.ask('AWS secret key: ', echo: false)
+    else
+      self.secret_key
+    end
+  end
+
+  def ask_aws_key_pair(access_key, secret_key, region)
+    if self.key_pair.nil?
+      prompt.select("Choose EC2 key pair: ") do |menu|
+        aws_client = ::Aws::EC2::Client.new(access_key_id: access_key, secret_access_key: secret_key, region: region)
+        aws_client.describe_key_pairs.key_pairs.each{ |key_pair|
+          menu.choice key_pair.key_name, key_pair.key_name
+        }
+      end
+    else
+      self.key_pair
+    end
+  end
+
+  def ask_aws_region(access_key, secret_key, default = 'eu-west-1')
+    if self.region.nil?
+      prompt.select("Choose EC2 region: ") do |menu|
+        aws_client = ::Aws::EC2::Client.new(access_key_id: access_key, secret_access_key: secret_key, region: 'eu-west-1')
+        i = 1
+        aws_client.describe_regions.regions.sort_by{|r| r.region_name }.each{ |region|
+          menu.choice region.region_name, region.region_name
+          if region.region_name == default
+            menu.default i
+          end
+          i += 1
+        }
+      end
+    else
+      self.region
+    end
+  end
+
+  def ask_aws_az(access_key, secret_key, region)
+    if self.zone.nil?
+      prompt.select("Choose EC2 Availability Zone: ") do |menu|
+        aws_client = ::Aws::EC2::Client.new(access_key_id: access_key, secret_access_key: secret_key, region: region)
+        aws_client.describe_availability_zones.availability_zones.sort_by{|r| r.zone_name }.each{ |zone|
+          if zone.state == 'available'
+            menu.choice zone.zone_name, zone.zone_name.sub(zone.region_name, '')
+          end
+        }
+      end
+    else
+      self.zone
+    end
+  end
+
+  def ask_aws_vpc(access_key, secret_key, region)
+    if self.vpc_id.nil?
+      aws_client = ::Aws::EC2::Client.new(access_key_id: access_key, secret_access_key: secret_key, region: region)
+      vpcs = aws_client.describe_vpcs.vpcs
+      return nil if vpcs.size == 0
+      if vpcs.size == 1 && vpcs.first.state == "available"
+        vpcs.first.vpc_id
+      else
+        prompt.select("Choose Virtual Private Cloud (VPC) ID: ") do |menu|
+          vpcs.each{ |vpc|
+            if vpc.state == 'available'
+              name = vpc.vpc_id
+              name += ' (default)' if vpc.is_default
+              menu.choice name, vpc.vpc_id
+            end
+          }
+        end
+      end
+    else
+      self.vpc_id
+    end
+  end
+
+  def ask_aws_subnet(access_key, secret_key, region, zone, vpc)
+    if self.subnet_id.nil?
+      aws_client = ::Aws::EC2::Client.new(access_key_id: access_key, secret_access_key: secret_key, region: region)
+      subnets_result = aws_client.describe_subnets(filters: [
+        { name: "vpc-id", values: [vpc] },
+        { name: "availability-zone", values: [zone]}
+      ])
+      subnets = subnets_result.subnets.sort_by{|s| s.cidr_block}
+      return nil if subnets.size == 0
+      if subnets.size == 1 && subnets.first.state == "available"
+        puts "Using Subnet (#{subnets.first.subnet_id})"
+        subnets.first.subnet_id
+      else
+        prompt.select("Specify subnet to launch instance into: ") do |menu|
+          subnets.each{ |subnet|
+            if subnet.state == 'available'
+              menu.choice "#{subnet.subnet_id} (#{subnet.cidr_block})", subnet.subnet_id
+            end
+          }
+        end
+      end
+    else
+      self.subnet_id
+    end
+  end
+
+  def ask_aws_instance_type(default = 't2.small')
+    if self.type.nil?
+      prompt.ask('Instance type: ', default: default)
+    else
+      self.type
+    end
+  end
+
+  def ask_aws_storage(default = '30')
+    if self.storage.nil?
+      prompt.ask('Storage size (GiB): ', default: default)
+    else
+      self.storage
+    end
+  end
+
+  def ask_node(token)
+    if self.name.nil?
+      nodes = client(token).get("grids/#{current_grid}/nodes")
+      nodes = nodes['nodes'].select{ |n|
+        n['labels'] && n['labels'].include?('provider=aws'.freeze)
+      }
+      raise "Did not find any nodes with label provider=aws" if nodes.size == 0
+      prompt.select("Select node: ") do |menu|
+        nodes.sort_by{|n| n['node_number'] }.reverse.each do |node|
+          initial = node['initial_member'] ? '(initial) ' : ''
+          menu.choice "#{node['name']} #{initial}", node['name']
+        end
+      end
+    else
+      self.name
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -102,6 +102,7 @@ files:
 - lib/kontena/plugin/aws/nodes/create_command.rb
 - lib/kontena/plugin/aws/nodes/restart_command.rb
 - lib/kontena/plugin/aws/nodes/terminate_command.rb
+- lib/kontena/plugin/aws/prompts.rb
 - lib/kontena/plugin/aws_command.rb
 - lib/kontena_cli_plugin.rb
 homepage: https://github.com/kontena/kontena-plugin-aws
@@ -119,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5