piculet 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9817fe6af6126f34099be55fd31fb0cccc652fdc
-  data.tar.gz: 64e1f92a4a193b03d96b15e462ec01e2e4dc9446
+  metadata.gz: e0055ebbe6b64ab5042daa9f1abcf85d70038256
+  data.tar.gz: d1ff3e39edd0b014616b25667baf7a34c334bff4
 SHA512:
-  metadata.gz: 757cb465f2b7eb5a485656a0452b8b30c03868af88edb2ae0c9edd73376cec4750e57ace9ec8ca63695b93b7467070ee13c53fbc8510a562cdc438bb6443e627
-  data.tar.gz: 2d30fe743b774e1f794a2eb11335192e332ad7895be13835b4deb25e8eb8d061ab7b600c7fea0a71b3827a7f77df88a35ddaa2147428dc4fc491670369d1a56d
+  metadata.gz: 58a1269880c8d577b03e35420f0c79d2e75e0845c9ed2a704cc76fbfba4e49bc539ae3916ad6e0c73d8f468b75094b9634318b016d179973fa3d8cef7d99add6
+  data.tar.gz: 4ed0a6eaf31f29c411d13283095acbfabcda04222cfff339a4fb1a7aa5a673941124f45919d48ec8fcc3f6ba67e9fdb9cb54068254111dd03271bb4a13ad178d

data/README.md

@@ -40,6 +40,7 @@ piculet -a               # apply `Groupfile` to EC2 SecurityGroup
 ```
 Usage: piculet [options]
     -p, --profile PROFILE_NAME
+        --credentials-path PATH
     -k, --access-key ACCESS_KEY
     -s, --secret-key SECRET_KEY
     -r, --region REGION
@@ -64,6 +65,11 @@ ec2 do
   security_group "default" do
     description "default group for EC2 Classic"
 
+    tags(
+      "key1" => "value1",
+      "key2" => "value2"
+    )
+
     ingress do
       permission :tcp, 0..65535 do
         groups(
@@ -98,6 +104,11 @@ ec2 "vpc-XXXXXXXX" do
   security_group "default" do
     description "default VPC security group"
 
+    tags(
+      "key1" => "value1",
+      "key2" => "value2"
+    )
+
     ingress do
       permission :tcp, 22..22 do
         ip_ranges(
@@ -140,6 +151,11 @@ ec2 "vpc-XXXXXXXX" do
   security_group "any_other_group" do
     description "any_other_group"
 
+    tags(
+      "key1" => "value1",
+      "key2" => "value2"
+    )
+
     egress do
       permission :any do
         ip_ranges(

data/bin/piculet

@@ -23,8 +23,10 @@ ARGV.options do |opt|
     secret_key = nil
     region = nil
     profile_name = nil
+    credentials_path = nil
 
     opt.on('-p', '--profile PROFILE_NAME')  {|v| profile_name                 = v       }
+    opt.on(''  , '--credentials-path PATH') {|v| credentials_path             = v       }
     opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
     opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
     opt.on('-r', '--region REGION')         {|v| region                       = v       }
@@ -46,10 +48,11 @@ ARGV.options do |opt|
         :access_key_id     => access_key,
         :secret_access_key => secret_key,
       }
-    elsif profile_name
-      provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(
-        :profile_name => profile_name
-      )
+    elsif profile_name or credentials_path
+      credentials_opts = {}
+      credentials_opts[:profile_name] = profile_name if profile_name
+      credentials_opts[:path] = credentials_path if credentials_path
+      provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(credentials_opts)
       aws_opts[:credential_provider] = provider
     elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
       puts opt.help

data/lib/piculet/dsl/converter.rb

@@ -35,6 +35,15 @@ end
       def output_security_group(security_group_id, security_group)
         name = security_group[:name].inspect
         description = security_group[:description].inspect
+        tags = ''
+
+        unless security_group[:tags].empty?
+          tags = "\n\n    tags(\n      " +
+                 security_group[:tags].map {|k, v|
+                   k.inspect + ' => ' + v.inspect
+                 }.join(",\n      ") +
+                 "\n    )"
+        end
 
         ingress = security_group.fetch(:ingress, [])
         egress = security_group.fetch(:egress, [])
@@ -49,6 +58,7 @@ end
         <<-EOS
   security_group #{name} do
     description #{description}#{
+    tags}#{
     ingress_egress}
   end
         EOS

data/lib/piculet/dsl/security-group.rb

@@ -8,6 +8,7 @@ module Piculet
 
           @result = OpenStruct.new({
             :name    => name,
+            :tags    => {},
             :ingress => [],
             :egress  => [],
           })
@@ -28,6 +29,19 @@ module Piculet
           @result.description = value
         end
 
+        def tags(values)
+          if @tags_is_defined
+            raise "SecurityGroup `#{@name}`: `tags` is already defined"
+          end
+
+          unless values.kind_of?(Hash)
+            raise "SecurityGroup `#{@name}`: argument of `tags` is wrong (expected Hash)"
+          end
+
+          @result.tags = values
+          @tags_is_defined = true
+        end
+
         def ingress(&block)
           if @ingress_is_defined
             raise "SecurityGroup `#{@name}`: `ingress` is already defined"

data/lib/piculet/exporter.rb

@@ -39,6 +39,7 @@ module Piculet
       {
         :name        => security_group.name,
         :description => security_group.description,
+        :tags        => tags_to_hash(security_group.tags),
         :owner_id    => security_group.owner_id,
         :ingress     => export_ip_permissions(security_group.ingress_ip_permissions),
         :egress      => export_ip_permissions(security_group.egress_ip_permissions),
@@ -68,5 +69,11 @@ module Piculet
         [ip_perm[:protocol], port_range.first, port_range.last]
       end
     end
+
+    def tags_to_hash(tags)
+      h = {}
+      tags.map {|k, v| h[k] = v }
+      h
+    end
   end # Exporter
 end # Piculet

data/lib/piculet/version.rb

@@ -1,3 +1,3 @@
 module Piculet
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/piculet/wrapper/security-group.rb

@@ -15,15 +15,18 @@ module Piculet
         end
 
         def eql?(dsl)
-          @security_group.description == dsl.description
+          description_eql?(dsl) and tags_eql?(dsl)
         end
 
         def update(dsl)
-          if @security_group.description != dsl.description
+          unless description_eql?(dsl)
             log(:warn, '`description` cannot be updated', :yellow, "#{vpc_id || :classic} > #{name}")
           end
 
-          # XXX:
+          unless tags_eql?(dsl)
+            log(:info, 'Update SecurityGroup', :green, "#{vpc_id || :classic} > #{name}")
+            update_tags(dsl)
+          end
         end
 
         def delete
@@ -39,6 +42,12 @@ module Piculet
           end
         end
 
+        def tags
+          h = {}
+          @security_group.tags.map {|k, v| h[k] = v }
+          h
+        end
+
         def ingress_ip_permissions
           PermissionCollection.new(@security_group, :ingress, @options)
         end
@@ -46,6 +55,44 @@ module Piculet
         def egress_ip_permissions
           PermissionCollection.new(@security_group, :egress, @options)
         end
+
+        private
+        def description_eql?(dsl)
+          @security_group.description == dsl.description
+        end
+
+        def tags_eql?(dsl)
+          self_tags = normalize_tags(self.tags)
+          dsl_tags = normalize_tags(dsl.tags)
+          self_tags == dsl_tags
+        end
+
+        def update_tags(dsl)
+          self_tags = normalize_tags(self.tags)
+          dsl_tags = normalize_tags(dsl.tags)
+
+          log(:info, "  set tags=#{dsl_tags.inspect}" , :green)
+
+          unless @options.dry_run
+            if dsl_tags.empty?
+              @security_group.tags.clear
+            else
+              delete_keys = self_tags.keys - dsl_tags.keys
+              # XXX: `delete` method does not remove the tag. It's seems a bug in the API
+              #@security_group.tags.delete(delete_keys) unless delete_keys.empty?
+              @security_group.tags.clear unless delete_keys.empty?
+              @security_group.tags.set(dsl_tags)
+            end
+
+            @options.updated = true
+          end
+        end
+
+        def normalize_tags(src)
+          normalized = {}
+          src.map {|k, v| normalized[k.to_s] = v.to_s }
+          normalized
+        end
       end # SecurityGroup
     end # SecurityGroupCollection
   end # EC2Wrapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk