kontena-plugin-aws 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca8c2bc0d5ee4a945f734701b60e5a8a29707c2
-  data.tar.gz: 63a8134d04363b9d990ab02169c62a88ffa8048e
+  metadata.gz: a28182797e437cd768edcfe0389d8e1f6d5697e2
+  data.tar.gz: e2a8e7500f1054b2adcd5d91368c7c8a1a732749
 SHA512:
-  metadata.gz: d18bf736802ed123874a7288bf757ad5e73dd25dbe337713dab047d8f7779bac64f1ffacdc7e46607c472dc9cda9a84e88d0772e876bcf1a88917bdac9af4a78
-  data.tar.gz: b05b77d2e41b8c9644078593fccab320248a8c824fbb2ffc7fc7faad986fb0baddf19f6fa18022095a0da34a09166b70283ee224bc434578f51cc35a30fc0ccf
+  metadata.gz: 6c1626f39fcfefdadf18521db20521ea5ebf6e1c146d599a499f41eea80dcfc3be2b2ade3d1591d385c4a59545a0f415de1a9575e1051f080da721c0726eddcb
+  data.tar.gz: da43074a23370c4913c151c931c3ed2bab55e67177aabaff9c83ec7fcd0332e8d5410c6517e4e193319454fa97d67d3d49d42ea9454db85bb25f2742918e920c

data/lib/kontena/plugin/aws.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Aws
-      VERSION = "0.2.4"
+      VERSION = "0.2.5"
     end
   end
 end

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

@@ -25,7 +25,7 @@ module Kontena::Plugin::Aws::Master
     option "--security-groups", "SECURITY_GROUPS", "Comma separated list of security groups (names) where the new instance will be attached (default: create 'kontena_master' group if not already existing)"
 
     def execute
-      require 'kontena/machine/aws'
+      require_relative '../../../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)

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

@@ -16,14 +16,15 @@ module Kontena::Plugin::Aws::Nodes
     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 "--[no-]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)"
 
+    requires_current_master
+
     def execute
-      require_api_url
       require_current_grid
 
-      require 'kontena/machine/aws'
+      require_relative '../../../machine/aws'
       grid = fetch_grid(current_grid)
       aws_access_key = ask_aws_access_key
       aws_secret_key = ask_aws_secret_key
@@ -36,7 +37,7 @@ module Kontena::Plugin::Aws::Nodes
       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 = provisioner(client, aws_access_key, aws_secret_key, aws_region)
       provisioner.run!(
           master_uri: api_url,
           grid_token: grid['token'],
@@ -58,7 +59,7 @@ module Kontena::Plugin::Aws::Nodes
     # @param [String] id
     # @return [Hash]
     def fetch_grid(id)
-      client(require_token).get("grids/#{id}")
+      client.get("grids/#{id}")
     end
 
     # @param [Kontena::Client] client

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

@@ -9,12 +9,12 @@ module Kontena::Plugin::Aws::Nodes
     option "--secret-key", "SECRET_KEY", "AWS secret access key", environment_variable: "AWS_SECRET_ACCESS_KEY"
     option "--region", "REGION", "EC2 Region", environment_variable: "AWS_REGION"
 
+    requires_current_master
+
     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}")
+      node_name = self.name || ask_node
+      node = client.get("grids/#{current_grid}/nodes/#{node_name}")
 
       aws_access_key = ask_aws_access_key
       aws_secret_key = ask_aws_secret_key

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

@@ -6,29 +6,29 @@ module Kontena::Plugin::Aws::Nodes
 
     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 "--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
 
+    requires_current_master
+
     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}")
+      node_name = self.name || ask_node
+      node = client.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), aws_access_key, aws_secret_key, aws_region)
+      require_relative '../../../machine/aws'
+      grid = client.get("grids/#{current_grid}")
+      destroyer = destroyer(aws_access_key, aws_secret_key, aws_region)
       destroyer.run!(grid, node_name)
     end
 
-    def destroyer(client, access_key, secret_key, region)
+    def destroyer(access_key, secret_key, region)
       Kontena::Machine::Aws::NodeDestroyer.new(client, access_key, secret_key, region)
     end
 

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

@@ -128,9 +128,9 @@ module Kontena::Plugin::Aws::Prompts
     end
   end
 
-  def ask_node(token)
+  def ask_node
     if self.name.nil?
-      nodes = client(token).get("grids/#{current_grid}/nodes")
+      nodes = client.get("grids/#{current_grid}/nodes")
       nodes = nodes['nodes'].select{ |n|
         n['labels'] && n['labels'].include?('provider=aws'.freeze)
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli