opsicle 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c103ae75216d110fb6a062790979e73905f37ec7
-  data.tar.gz: 1d69eb62eacff5ecc5ae5cc686e7b013b8142f9b
+  metadata.gz: 9e709d4cd1f9b258fae81ec63bbc659c1db1db44
+  data.tar.gz: 16c3c0ee8f9ac500176497998f551cb885e23d61
 SHA512:
-  metadata.gz: a3e47337f95b9c4276dd23df6e2c0ff19215d9137eb61c5ce87ce18cc97808c04a6182b95b90171ec72de372b167155affff387e22168387fd00dc8ac524117f
-  data.tar.gz: 7f809339f8cb9f9aa3975d9d950859c0a06640478f4a7a299dfee52be5355ef16a9c92c169dcf596651b908e27bdfca272687bb58746a31442edf194fbd12e9f
+  metadata.gz: aeaa6a8211aba81c3d125ab90059493e45df684dd89c31ec62690f3e3a0e037593fa1876160dcfa47b544273079bf86eb3bd5a0e57b2a3a46f6ac1197f4ffe63
+  data.tar.gz: 1a47aae0831ec1e2a9afa3a44475629eb18b6961660d4ea1bffb73289a28fb4513556a642c41d8d855730b34ea24c7dde85221d90837c34dbe1b82b838b2740e

data/lib/opsicle/client.rb

@@ -11,8 +11,10 @@ module Opsicle
       @config.configure_aws_environment!(environment)
       credentials = @config.aws_credentials
       region = @config.opsworks_region
-      @opsworks = Aws::OpsWorks::Client.new(region: region, credentials: credentials)
-      @s3 = Aws::S3::Client.new(region: region, credentials: credentials)
+      aws_opts = {region: region}
+      aws_opts[:credentials] = credentials unless credentials.nil?
+      @opsworks = Aws::OpsWorks::Client.new aws_opts
+      @s3 = Aws::S3::Client.new aws_opts
     end
 
     def run_command(command, command_args={}, options={})

data/lib/opsicle/cloneable_instance.rb

@@ -45,7 +45,7 @@ module Opsicle
       if old_hostname =~ /\d\d\z/
         new_instance_hostname = increment_hostname(old_hostname, all_sibling_hostnames)
       else
-        new_instance_hostname = old_hostname << "_clone"
+        new_instance_hostname = old_hostname << "-clone"
       end
         
       puts "\nAutomatically generated hostname: #{new_instance_hostname}\n"

data/lib/opsicle/config.rb

@@ -60,14 +60,24 @@ module Opsicle
 
     def authenticate_with_credentials
       profile_name = opsworks_config[:profile_name] || @environment.to_s
-      credentials = Aws::SharedCredentials.new(profile_name: profile_name)
+      begin
+        credentials = Aws::SharedCredentials.new(profile_name: profile_name)
+      rescue Aws::Errors::NoSuchProfileError
+        if ENV['AWS_SESSION_TOKEN']
+          Output.say('AWS profile not found; falling back to environment credentials', :debug)
+        else
+          raise Aws::Errors::NoSuchProfileError, "AWS profile #{profile_name} not found"
+        end
+      end
       region = opsworks_region
 
-      unless credentials.set?
+      if !credentials.nil? && !credentials.set?
         abort('Opsicle can no longer authenticate through your ~/.fog file. Please run `opsicle legacy-credential-converter` before proceeding.')
       end
 
-      Aws.config.update({region: region, credentials: credentials})
+      aws_opts = {region: region}
+      aws_opts[:credentials] = credentials unless credentials.nil?
+      Aws.config.update aws_opts
 
       iam = Aws::IAM::Client.new
 

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement