hygroscope 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30412dca6b04d119cc3faeaa816022ce900feb0
-  data.tar.gz: 06409b36b30e590c074b02cbb29e0aea6bf9d13f
+  metadata.gz: 6843b8aec13ea4cea7186e3e0d303bf9fb9a3fcc
+  data.tar.gz: e8892054ee9e904e1c3d668c56866d01d5f9e624
 SHA512:
-  metadata.gz: c646b4a25667cc80db36202ceda848984557723d27f14fc83fe484df0b4d3266dc3a1782f7603aadda64fe3ca072342e28cc1151f67a41b49bafb3a9160aed4c
-  data.tar.gz: c578d854060fd6c4aba017d04320d6c92b479118f3d168228de1c9abf0d4552939dc56d85200bc5811cb148380c8b15c2e96f66cb9a5fc60c0bf5e22a1f4a6b1
+  metadata.gz: cd09dd561634d91ce8ed58851c58b58e445cfb5e275119923ee6fb7a977d66e486d96143e035ac8566d70a257cc3f51c07e2adfacb9a165724e424fbde5d6552
+  data.tar.gz: 8b508549617eee3670492368d9616bba7293e6072d6199ebe944fe9553b74e8a487b03fa4e4ac7f8d06caecf989639ad8cf1024481d30c686002c157be657248

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 Gemfile.lock
+.ruby-version

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 1.2.0 (2015-10-08)
+- Support AWS credential profiles and multiple regions using new --region and
+  --profile options.
+
 ## 1.1.6 (2015-03-23)
 
-- Bugfix for tag functionality (failed if no tags are specified)
+- Bugfix for tag functionality (failed if no tags are specified).
 
 ## 1.1.5 (2015-03-23)
 

data/hygroscope.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hygroscope'
-  s.version     = '1.1.7'
+  s.version     = '1.2.0'
   s.summary     = 'CloudFormation launcher'
   s.description = 'A tool for managing the launch of complex CloudFormation stacks'
   s.authors     = ['Daniel Silverman']

data/lib/hygroscope/cli.rb

@@ -78,10 +78,23 @@ module Hygroscope
       end
     end
 
+    # NOTE: Profiles cannot assume roles, see:
+    # https://github.com/aws/aws-sdk-ruby/issues/910
+    class_option :profile,
+                  aliases: '-p',
+                  type: :string,
+                  default: 'default',
+                  desc: 'AWS account credentials profile name'
+    class_option :region,
+                  aliases: '-r',
+                  type: :string,
+                  default: 'us-east-1',
+                  desc: 'AWS region'
+
     desc 'prepare', 'Prepare to create or update a stack by generating the template, assembling parameters, and managing payload upload', hide: true
     def prepare
       # Generate the template
-      t = Hygroscope::Template.new(template_path)
+      t = Hygroscope::Template.new(template_path, options[:region], options[:profile])
 
       # If the paramset exists load it, otherwise instantiate an empty one
       p = Hygroscope::ParamSet.new(options[:paramset])
@@ -107,7 +120,7 @@ module Hygroscope
       options[:existing].each do |existing|
         # User specified an existing stack from which to pull outputs and
         # translate into parameters. Load the existing stack.
-        e = Hygroscope::Stack.new(existing)
+        e = Hygroscope::Stack.new(existing, options[:region], options[:profile])
         say_status('info', "Populating parameters from #{existing} stack", :blue)
 
         # Fill any template parameter that matches an output from the existing
@@ -168,7 +181,7 @@ module Hygroscope
       # Upload payload
       payload_path = File.join(Dir.pwd, 'payload')
       if File.directory?(payload_path)
-        payload = Hygroscope::Payload.new(payload_path)
+        payload = Hygroscope::Payload.new(payload_path, options[:region], options[:profile])
         payload.prefix = options[:name]
         payload.upload!
         p.set('HygroscopePayloadBucket', payload.bucket) if missing.include?('HygroscopePayloadBucket')
@@ -187,7 +200,7 @@ module Hygroscope
                   default: File.basename(Dir.pwd),
                   desc: 'Name of stack'
     method_option :paramset,
-                  aliases: '-p',
+                  aliases: '-s',
                   required: false,
                   desc: 'Name of saved paramset to use (optional)'
     method_option :existing,
@@ -213,23 +226,23 @@ module Hygroscope
       # Prepare task takes care of shared logic between "create" and "update"
       template, paramset = prepare
 
-      s = Hygroscope::Stack.new(options[:name])
-      s.parameters = paramset.parameters
-      s.template = template.compress
+      stack = Hygroscope::Stack.new(options[:name], options[:region], options[:profile])
+      stack.parameters = paramset.parameters
+      stack.template = template.compress
 
-      s.tags['X-Hygroscope-Template'] = hygro_name
+      stack.tags['X-Hygroscope-Template'] = hygro_name
       options[:tags].each do |tag|
         if paramset.get(tag)
-          s.tags[tag] = paramset.get(tag)
+          stack.tags[tag] = paramset.get(tag)
         else
           say_status('info', "Skipping tag #{tag} because it does not exist", :blue)
         end
       end
 
-      s.capabilities = ['CAPABILITY_IAM']
-      s.timeout = 60
+      stack.capabilities = ['CAPABILITY_IAM']
+      stack.timeout = 60
 
-      s.create!
+      stack.create!
 
       status
     end
@@ -240,7 +253,7 @@ module Hygroscope
                   default: File.basename(Dir.pwd),
                   desc: 'Name of stack'
     method_option :paramset,
-                  aliases: '-p',
+                  aliases: '-s',
                   required: false,
                   desc: 'Name of saved paramset to use (optional)'
     method_option :ask,
@@ -258,7 +271,7 @@ module Hygroscope
       # Prepare task takes care of shared logic between "create" and "update"
       template, paramset = prepare
 
-      s = Hygroscope::Stack.new(options[:name])
+      s = Hygroscope::Stack.new(options[:name], options[:region], options[:profile])
       s.parameters = paramset.parameters
       s.template = template.compress
       s.capabilities = ['CAPABILITY_IAM']
@@ -284,7 +297,7 @@ module Hygroscope
                    yes?("Really delete stack #{options[:name]} [y/N]?")
 
       say('Deleting stack!')
-      stack = Hygroscope::Stack.new(options[:name])
+      stack = Hygroscope::Stack.new(options[:name], options[:region], options[:profile])
       stack.delete!
       status
     end
@@ -296,7 +309,7 @@ module Hygroscope
                   desc: 'Name of stack'
     def status
       check_path
-      stack = Hygroscope::Stack.new(options[:name])
+      stack = Hygroscope::Stack.new(options[:name], options[:region], options[:profile])
 
       # Query and display the status of the stack and its resources. Refresh
       # every 10 seconds until the user aborts or an error is encountered.
@@ -363,7 +376,7 @@ module Hygroscope
                   desc: 'Colorize JSON output'
     def generate
       check_path
-      t = Hygroscope::Template.new(template_path)
+      t = Hygroscope::Template.new(template_path, options[:region], options[:profile])
       if options[:color]
         require 'json_color'
         puts JsonColor.colorize(t.process)
@@ -377,7 +390,7 @@ module Hygroscope
       check_path
 
       begin
-        t = Hygroscope::Template.new(template_path)
+        t = Hygroscope::Template.new(template_path, options[:region], options[:profile])
         t.validate
       rescue Aws::CloudFormation::Errors::ValidationError => e
         say_fail("Validation error: #{e.message}")

data/lib/hygroscope/payload.rb

@@ -6,18 +6,21 @@ module Hygroscope
     attr_writer :prefix
     attr_reader :path, :bucket, :archive, :key
 
-    def initialize(path)
+    def initialize(path, region, profile)
       @path = path
+      @region = region
+      @profile = profile
+      @credentials = Aws::SharedCredentials.new(profile_name: @profile)
 
       # TODO: This will fail if using root creds or lacking GetUser priv,
       # neither of which should be the case when using hygroscope -- but
       # we should check and error before getting to this point.
-      @account_id = Aws::IAM::Client.new.get_user.user.arn.split(':')[4]
+      @account_id = Aws::IAM::Client.new(region: @region, credentials: @credentials).get_user.user.arn.split(':')[4]
       @region = ENV['AWS_REGION'] || 'us-east-1'
       @bucket = "hygroscope-payloads-#{@account_id}-#{@region}"
       @name = "payload-#{Time.new.to_i}.zip"
 
-      @client = Aws::S3::Client.new
+      @client = Aws::S3::Client.new(region: @region, credentials: @credentials)
     end
 
     def prefix

data/lib/hygroscope/stack.rb

@@ -6,7 +6,7 @@ module Hygroscope
     attr_writer :template, :capabilities, :on_failure, :timeout
     attr_reader :client
 
-    def initialize(name)
+    def initialize(name, region, profile)
       @name = name
       @parameters = {}
       @tags = {}
@@ -14,7 +14,11 @@ module Hygroscope
       @capabilities = []
       @timeout = 15
       @on_failure = 'DO_NOTHING'
-      @client = Aws::CloudFormation::Client.new
+
+      @region = region
+      @profile = profile
+      @credentials = Aws::SharedCredentials.new(profile_name: @profile)
+      @client = Aws::CloudFormation::Client.new(region: @region, credentials: @credentials)
     end
 
     def create!

data/lib/hygroscope/template.rb

@@ -8,8 +8,10 @@ module Hygroscope
   class Template
     attr_reader :path
 
-    def initialize(path)
+    def initialize(path, region, profile)
       @path = path
+      @region = region
+      @profile = profile
     end
 
     # Process a set of files with cfoo and return JSON
@@ -59,7 +61,7 @@ module Hygroscope
       template = compress
 
       begin
-        stack = Hygroscope::Stack.new('template-validator')
+        stack = Hygroscope::Stack.new('template-validator', @region, @profile)
         stack.client.validate_template(template_body: template)
       rescue => e
         raise e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hygroscope
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Silverman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor