rivet 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Rivet CHANGELOG
 ===
 
+1.2.0 - Released 11/18/13
+---
+  * Adds functionality to apply tags to autoscaling groups
+  * Updates Rivet to handle the new AWS CLI config file format (profiles now include the world profile in them)
+
 1.1.0 - Released 11/12/13
 ---
   * Rivet no allows you to specify a directory with the -d [--definitions-directory] option

data/README.md

@@ -2,18 +2,18 @@
 
 Rivet
 =======
-Rivet is a small utility which allows you to describe an autoscaling groups and it's launch configurations as yaml.  You can then sync those changes to AWS.
+Rivet enables you to describe autoscaling groups and their launch configurations as yaml.  You can then sync those changes to Amazon Web Services (AWS.)
 
-Rivet allows you to provide a template and it's options which will be rendered as user-data for your launch configurations.  It is currently opinionated and assumes you are trying to build
-a bootstrap script for chef installed via gems.  You can of course provide it with any template you desire, and in future releases this system will become more flexible and less opinionated.
+You provide a template and it's options to render as user-data for your launch configurations to build a bootstrap script for chef, installed via gems.  
 
-Rivet is also opinionated about how it names launch configurations, as it generates unique deterministic names for them and automatically assigns the proper launch configuration to your
+Rivet generates unique deterministic names for launch configurations and automatically assigns the proper launch configuration to your
 autoscaling group based upon it's generated identity.
 
+
 Installation
 ============
 
-gem install rivet
+`gem install rivet`
 
 Setup
 =====
@@ -25,16 +25,16 @@ Rivet uses the python AWS CLI tools [https://github.com/aws/aws-cli] configurati
 
 Right now Rivet only uses the following options from the file:
 
-* profile name
-* aws\_access\_key\_id
-* aws\_secret\_access\_key
-* region
+* `profile name`
+* `aws_access_key_id`
+* `aws_secret_access_key`
+* `region`
 
 An example config could look as follows:
 
-```
+```ini
 [default]
-aws_access_key_id<YOUR ACCESS KEY ID>
+aws_access_key_id=<YOUR ACCESS KEY ID>
 aws_secret_access_key=<YOUR SECRET ACCESS KEY>
 region=us-east-1
 
@@ -44,9 +44,9 @@ aws_secret_access_key=<YOUR SECRET_ACCESS KEY>
 region=us-west-2
 ```
 
-Alternatively you can specify your AWS\_ACCESS\_KEY\_ID and AWS\_SECRET\_ACCESS\_KEY as environment variables. 
+Alternatively you can specify your `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` as environment variables. 
 
-You will still need to specify the region to use in your AWS\_CONFIG\_FILE.
+You will still need to specify the region to use in your `AWS_CONFIG_FILE`.
 
 Rivet will use the [default] profile if you do not specify a profile to use with the -p [--profile] option.
 
@@ -56,20 +56,21 @@ Autoscaling group definition directories and files
 
 Example files can be found in the example/ directory in the rivet git repository
 
-You should create an "autoscale" directory wherever you plan to run rivet from.  Currently it always looks in the current directory for definition files.  It expects a directory structure as such.
+Rivet will look in the directory specified on the command line (or ./autoscale by default) for some definitions.  It expects autoscale groups to have a directory named for them
+with a conf.yml inside of it as well as a defaults.yml in whatever directory you use for your autoscaling group definitions.
 
 ```
 ./autoscale
-      | - defaults.yml
-      | - <autoscale group name>
-                  | - conf.yml
+  `- defaults.yml
+     `- <autoscale group name>
+        `- conf.yml
 ```
 
 defaults.yml and conf.yml both accept all the same options.  A groups definition will be deep merged over the defaults.
 
 The yaml file format:
 
-```
+```yaml
 min_size: SIZE <integer>
 max_size: SIZE <integer>
 region: AWS REGION <STRING>
@@ -93,8 +94,8 @@ Availability zones should use the single character of the zone.  The region will
 
 The following files should exist in the configuration directory specified under the bootstrap -> config_dir key:
 
-A template file (specified by the bootstrap -> template file name)
-A validator pem (named by the bootstrap -> environment key as <environment>-validator.pem)
+* A template file (specified by the bootstrap -> template file name)
+* A validator pem (named by the bootstrap -> environment key as <environment>-validator.pem)
 
 
 Usage
@@ -106,22 +107,24 @@ Usage: rivet [options]
     -l, --log-level [LEVEL]          specify the log level (default is INFO)
     -p, --profile [PROFILE_NAME]     Selects the AWS profile to use (default is 'default')
     -s, --sync                       Sync the changes remotely to AWS
+    -d [PATH],                       The autoscale definitions directory to use (default is ./autoscale)
+        --definitions-directory
     -h
 ```
 
-Using rivet to check the differences for the example_group autoscaling group
+check the differences for the example_group autoscaling group
 
 ```bash
 rivet -g example_group
 ```
 
-Using rivet to check the differences for the example_group using the foobar profile
+check the differences for the example_group using the foobar profile
 
 ```bash
 rivet -g example_group -p foobar
 ```
 
-Using rivet to sync the differences for the example_group using the foobar profile
+sync the differences for the example_group using the foobar profile
 
 ```bash
 rivet -g example_group -p foobar -s

data/lib/rivet/autoscale.rb

@@ -3,12 +3,24 @@ module Rivet
 
     REQUIRED_FIELDS = [:min_size,:max_size,:launch_configuration,:availability_zones] 
 
-    attr_reader :min_size, :max_size, :name, :launch_configuration, :availability_zones
+    attr_reader :min_size, :max_size, :name, :launch_configuration
+    attr_reader :availability_zones, :tags
 
     def initialize(name,definition)
       @name = name
       @min_size = definition['min_size']
       @max_size = definition['max_size']
+
+      if definition.has_key?('tags')
+        definition['tags'].each do |t|
+          unless t.has_key?('propagate_at_launch')
+            t['propagate_at_launch'] = true
+          end
+        end
+        @tags = definition['tags']
+      else
+        @tags = Array.new
+      end
       @launch_config = LaunchConfig.new(definition)
 
       # Normalizing zones to match what the SDK expects, E.G. "<region><zone>"
@@ -53,6 +65,9 @@ module Rivet
         @launch_config.save
         create(options) unless group.exists?
 
+        Rivet::Log.debug("Updating autoscaling group with the follow options")
+        Rivet::Log.debug(options.inspect)
+
         group.update(options)
       else
         Rivet::Log.info("No autoscale differences to sync to AWS for #{@name}.")
@@ -78,7 +93,7 @@ module Rivet
     def get_differences
       remote = get_remote
       differences = Hash.new
-      [:min_size,:max_size,:launch_configuration].each do |a|
+      [:min_size,:max_size,:launch_configuration,:tags].each do |a|
         if remote[a.to_s] != self.send(a)
           differences[a.to_s] = { 'remote' => remote[a.to_s], 'local' => self.send(a) }
         end
@@ -91,6 +106,8 @@ module Rivet
       differences
     end
 
+    protected
+
     def get_remote
       autoscale = AWS::AutoScaling.new()
       remote_group = autoscale.groups[@name]
@@ -101,6 +118,11 @@ module Rivet
           accum
         end
 
+        # {:resource_id=>"venus", :propagate_at_launch=>true, :value=>"Venus", :key=>"Name", :resource_type=>"auto-scaling-group"}
+        remote_hash['tags'] = remote_group.tags.to_a.inject(Array.new) do |tags,current|
+          tags << normalize_tag(current)
+        end
+
         remote_hash['launch_configuration'] = remote_group.launch_configuration_name
 
         # Normalize their AWS::Core::Data::List to a sorted array
@@ -121,5 +143,15 @@ module Rivet
       end
     end
 
+    def normalize_tag(tag)
+      normalized_tag = Hash.new
+      tag.each_pair do |k,v|
+        unless (k == :resource_id || k == :resource_type)
+          normalized_tag[k.to_s] = v
+        end
+      end
+      normalized_tag
+    end
+
   end
 end

data/lib/rivet/aws_utils.rb

@@ -23,14 +23,14 @@ module Rivet
       if ENV['AWS_CONFIG_FILE']
 
         current_profile = nil
-        profile_matcher = /^\[(.*)\]/
+        profile_matcher = /^\[(profile+\s)?(\w+)\]/
         option_matcher  = /(\w.*)=(\S.*)\s*/
         aws_config      = Hash.new
 
         File.open(ENV['AWS_CONFIG_FILE'],"r").each_line do |line|
 
           if line =~ profile_matcher
-            current_profile = line.match(profile_matcher)[1]
+            current_profile = line.match(profile_matcher)[2]
             aws_config[current_profile] = Hash.new unless aws_config.has_key?(current_profile)
           end
 

data/lib/rivet/version.rb

@@ -1,4 +1,4 @@
 module Rivet
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk