opsicle 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5c24375ecdfc5f145c4629f7cd616e6606e311
-  data.tar.gz: a66ff71b1fd05c809d41af6ce5b728ba814c1884
+  metadata.gz: f4cc47663adbf7d7079db60f9dd4fd55c58c5f7d
+  data.tar.gz: cf583de4cb67fe7f9b291185c9bc070ca7af325e
 SHA512:
-  metadata.gz: 911b78c35cb0e6ad3f620f2a2ef9c2b9068246e6c10897f8fb35449f971927c3cef524bc346628eb27989b218c769a7e4443e85bc207d4183ca92ab8919b0874
-  data.tar.gz: 68b131b034da7f96aefd511ae4d2d343affe92b3c4d50fa19d66e4fe503239d0f2a3f9499b6a47c52ff00e60cffd065b3563a4f4daca065ae79a9fcaf4ea532b
+  metadata.gz: faa539c5e2238a4107c4d80774c083bbe02be70e4e3c459c9d0114d60ff1c4add9f61711429055e54d59272447853e4c3dfddf6cbeb665218b96518029029251
+  data.tar.gz: 5fcb498e1cf36b97413e95ed306e65812c77406d34709f6203347b9042a6d461965456a947f461b0249cd4589f0822ce952a52544af401ec7cf99ba5b3c6df91

data/lib/opsicle/client.rb

@@ -10,8 +10,9 @@ module Opsicle
       @config = Config.instance
       @config.configure_aws_environment!(environment)
       credentials = @config.aws_credentials
-      @opsworks = Aws::OpsWorks::Client.new(region: 'us-east-1', credentials: credentials)
-      @s3 = Aws::S3::Client.new(region: 'us-east-1', credentials: credentials)
+      region = @config.opsworks_region
+      @opsworks = Aws::OpsWorks::Client.new(region: region, credentials: credentials)
+      @s3 = Aws::S3::Client.new(region: region, credentials: credentials)
     end
 
     def run_command(command, command_args={}, options={})

data/lib/opsicle/config.rb

@@ -20,6 +20,10 @@ module Opsicle
       @opsworks_config ||= load_config(OPSICLE_CONFIG_PATH)
     end
 
+    def opsworks_region
+      opsworks_config[:region] || "us-east-1"
+    end
+
     def configure_aws_environment!(environment)
       @environment = environment.to_sym
     end
@@ -57,12 +61,13 @@ module Opsicle
     def authenticate_with_credentials
       profile_name = opsworks_config[:profile_name] || @environment.to_s
       credentials = Aws::SharedCredentials.new(profile_name: profile_name)
+      region = opsworks_region
 
       unless 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: 'us-east-1', credentials: credentials})
+      Aws.config.update({region: region, credentials: credentials})
 
       iam = Aws::IAM::Client.new
 

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/opsicle/client_spec.rb

@@ -10,6 +10,7 @@ module Opsicle
       mock_keys = {access_key_id: 'key', secret_access_key: 'secret'}
       allow(config).to receive(:aws_credentials).and_return(mock_keys)
       allow(config).to receive(:opsworks_config).and_return({ stack_id: 'stack', app_id: 'app', something_else: 'true' })
+      allow(config).to receive(:opsworks_region).and_return('us-east-1')
       allow(Config).to receive(:new).and_return(config)
       allow(Config).to receive(:instance).and_return(config)
       allow(Aws::OpsWorks::Client).to receive(:new).and_return(aws_client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk