kontena-plugin-cloud 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fd5d4936d0b4d5b4ad2d5679c7b83414b24a79
-  data.tar.gz: 5f819102b0986dd1c5dcdc141bf7be1646316cd1
+  metadata.gz: 5ae8fbe7ad9b70e0f0bc5c56b841dbc57991b245
+  data.tar.gz: a9663fc54506816ac95156e46c86ed401bab7e7b
 SHA512:
-  metadata.gz: 4dedac3e0968c4f84c9d54a4d8f41e4ab4445f239142d32da653be42b675903e2a57237ec909c8e09ab78b200a01c7ee0407dae9fc943d97d632d1610cae8924
-  data.tar.gz: 1be0dc1b7c1c958b865febf435982009ce7d335867028b24fa6c4d3503c8717bb22f0856cd03466681d848b5277e9e80be30efc77b8edfb08b7b4c4c430e38c3
+  metadata.gz: d34d7bafe586d8dc217210bb6f1209501da31ddc9ff7da86cd730b013a589670825bc65c02b62e919f7d1fc13cf9d43b4e3f0b883bb48eeb01eef5ac272c4a90
+  data.tar.gz: 73db780fb7f58fef28c64060d04d809adbc8ce0e7eef29b8b03e64487dc465a8e83f42422319732882567dccf5878228b00140c17659ac39a8a2c24341bf40b9

data/lib/kontena/plugin/cloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.1.0"
+      VERSION = "1.1.1"
 
       module Organization
         module User; end

data/lib/kontena/plugin/cloud/platform/common.rb

@@ -78,8 +78,12 @@ module Kontena::Plugin::Cloud::Platform::Common
     !self.config.find_server_by(name: name).nil?
   end
 
-  def find_platform_by_name(name, org)
-    if platform = cached_platforms.find{|p| p.name == name && p.organization == org }
+  # @param name [String]
+  # @param org [String]
+  # @param cache [Boolean]
+  # @return [Kontena::Cli::Models::Platform, NilClass]
+  def find_platform_by_name(name, org, cache = true)
+    if cache && platform = cached_platforms.find{|p| p.name == name && p.organization == org }
       platform
     else
       data = cloud_client.get("/organizations/#{org}/platforms/#{name}")['data']

data/lib/kontena/plugin/cloud/platform/create_command.rb

@@ -8,7 +8,7 @@ class Kontena::Plugin::Cloud::Platform::CreateCommand < Kontena::Command
   parameter "[NAME]", "Platform name"
 
   option ['--organization', '--org'], 'ORG', 'Organization name', environment_variable: 'KONTENA_ORGANIZATION'
-  option ['--region'], 'region', 'Region (us-east, eu-west)'
+  option ['--region'], 'region', 'Region (us-east-1, eu-west-1)'
   option ['--initial-size', '-i'], 'SIZE', 'Initial size (number of nodes) for platform'
   option '--[no-]use', :flag, 'Switch to use created platform', default: true
   option '--version', 'VERSION', 'Platform version', visible: false

data/lib/kontena/plugin/cloud/platform/upgrade_command.rb

@@ -13,32 +13,39 @@ class Kontena::Plugin::Cloud::Platform::UpgradeCommand < Kontena::Command
   def execute
     require_platform(name)
 
+    to_version = self.version
     platform = find_platform_by_name(current_platform, current_organization)
-    unless version
-      version = prompt_version(platform)
-      if Gem::Version.new(version) < Gem::Version.new(platform.version)
-        exit_with_error "Dowgrade is not supported"
+    unless to_version
+      to_version = prompt_version(platform)
+      if Gem::Version.new(to_version) < Gem::Version.new(platform.version)
+        exit_with_error "Downgrade is not supported"
       end
     end
     data = {
       attributes: {
         name: platform.name,
-        version: platform.version
+        version: to_version
       }
     }
-    cloud_client.put("/organizations/#{current_organization}/platforms/#{platform.name}", { data: data })
+    spinner "Upgrading platform #{pastel.cyan(name)} to version #{to_version}" do
+      cloud_client.put("/organizations/#{current_organization}/platforms/#{platform.name}", { data: data })
+      while platform.version != to_version do
+        sleep 5
+        platform = find_platform_by_name(platform.id, current_organization, false)
+      end
+    end
   end
 
-  # @param
+  # @param platform [Platform]
   def prompt_version(platform)
     versions = cloud_client.get("/platform_versions")['data']
 
     platform_version = Gem::Version.new(platform.version)
     versions = versions.select { |v| Gem::Version.new(v['id']) > platform_version }
 
-    default_version = versions.find_index{ |v| v['id'] == platform.version } + 1
+    exit_with_error "Platform is already on the latest version" if versions.size == 0
+
     prompt.select("Upgrade to version:") do |menu|
-      menu.default default_version
       versions.each do |v|
         menu.choice v['id']
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli