cloudutil 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68096f9d1dc06c6bc5e8d1c200ca5aaaf13a4455
-  data.tar.gz: fee3debc208932511be30e01a5585afd299ec5d1
+  metadata.gz: 849723cdf05020f6c584616d536ae41af8734ab7
+  data.tar.gz: 6c5d11c532f79f7c1db613fe0bdf219ce5c35646
 SHA512:
-  metadata.gz: a4461406ff58f5507d10947850f292107ba3f264a5d68a61961308cd4b8fe100bf31d6432968a39d6837e4f1a34c308028e5b7bae88ddae4fc894a550ec5fb5b
-  data.tar.gz: b5731e321ea25f227d239b9f84214dc40902c7debad9903b700c54e9e257c1972ca335995a18f1e436116468042cde6dbdaed113295c1ea10fd99a1d618e3037
+  metadata.gz: 3b2853968e0776e5569d83a63f08fcd38e05d6a954a59f2a0a39ab9698ec295cebf47a6c500cbf7226a3654a44f3b52a0c1b9986b4ca86641fae9fa5bf880f3c
+  data.tar.gz: 8b5bd8b1a520c7d7361235d9d77ba22a3bf746587998d8ba888c5020e3fa060a0dbf72bd64661bf0d2abe1ca70d5ef565fd15f2d093cccc08409422ec68a42f6

data/.rubocop.yml

@@ -22,3 +22,9 @@ CyclomaticComplexity:
 
 PerceivedComplexity:
   Max: 10
+
+AbcSize:
+  Max: 20
+
+ClassAndModuleChildren:
+  Enabled: false

data/cloudutil.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.6'
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'aws-sdk', '~> 1.44'
+  spec.add_dependency 'aws-sdk-v1', '~> 1.44'
 end

data/lib/cloudutil/aws/core.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-v1'
 
 module Cloudutil
   module AWS
@@ -25,7 +25,7 @@ module Cloudutil
       # be called to create one
       #
       def initialize(*args)
-        if args.respond_to? :to_h
+        if args.is_a? Hash
           _process_hash_init(args.to_h)
         elsif args[0].respond_to? :to_h
           _process_hash_init(args[0].to_h)

data/lib/cloudutil/aws/ec2.rb

@@ -89,7 +89,7 @@ module Cloudutil
       # Resolve the provided value to an array of AWS AMI objects.  By default, the search is not
       # case-sensitive, but that can be overridden by supplying 'false' as a second argument to this method.
       def lookup_ami(ami, ignore_case = true, nap = 2, retries = 5)
-        ec2 = ::AWS::EC2.new
+        ec2  = ::AWS::EC2.new
         amis = []
 
         begin
@@ -98,10 +98,7 @@ module Cloudutil
           else
             # Don't bother memoizing, this is fast
             imgs = ec2.images.filter('image-type', 'machine').filter('state', 'available')
-
-            amis = do_ami_lookup_by_name_tag(imgs, ami, ignore_case)
-            amis = do_private_ami_lookup_by_name(imgs, ami, ignore_case) if amis.nil? || amis.empty?
-            amis = do_ami_lookup_by_name(imgs, ami, ignore_case) if amis.nil? || amis.empty?
+            amis = lookup_amis(imgs, ami, ignore_case)
           end
         rescue ::AWS::EC2::Errors::RequestLimitExceeded, ::AWS::Errors::ServerError
           raise if retries < 1
@@ -120,16 +117,28 @@ module Cloudutil
 
       protected
 
+      def lookup_amis(filter, ami, ignore_case)
+        amis = do_ami_lookup_by_name_tag(filter, ami, ignore_case)
+
+        if amis.nil? || amis.empty
+          amis = do_private_ami_lookup_by_name(filter, ami, ignore_case)
+          amis = do_ami_lookup_by_name(filter, ami, ignore_case) if amis.nil? || amis.empty?
+        end
+
+        amis
+      end
+
       # Find an AMI based on the value of the 'Name' tag
       def do_ami_lookup_by_name_tag(filter, ami, ignore_case)
         # Using memoization, this is fast, relativly speaking (can be < 1 sec, 15-20 sec w/o memoization)
         ::AWS.memoize do
-          if ignore_case
-            filter.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.casecmp(ami) == 0 }
-          else
-            filter.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.eql?(ami) }
+          filter.tagged('Name').select do |obj|
+            !obj.tags.Name.nil? &&
+              if ignore_case
+                obj.tags.Name.casecmp(ami) == 0
+              else
+                obj.tags.Name.eql?(ami)
+              end
           end
         end
       end
@@ -165,12 +174,13 @@ module Cloudutil
       # Find a VPC subnet based on the 'Name' tag (subnets don't have a name attribute)
       def do_subnet_lookup(filter, subnet, ignore_case)
         ::AWS.memoize do
-          if ignore_case
-            filter.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.casecmp(subnet) == 0 }
-          else
-            filter.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.eql?(subnet) }
+          filter.tagged('Name').select do |obj|
+            !obj.tags.Name.nil? &&
+              if ignore_case
+                obj.tags.Name.casecmp(subnet) == 0
+              else
+                obj.tags.Name.eql?(subnet)
+              end
           end
         end
       end
@@ -189,12 +199,13 @@ module Cloudutil
       # Find a VPC security group based on the 'Name' tag
       def do_security_group_lookup_by_name_tag(ec2, group, ignore_case)
         ::AWS.memoize do
-          if ignore_case
-            ec2.security_groups.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.casecmp(group) == 0 }
-          else
-            ec2.security_groups.tagged('Name')
-              .select { |obj| !obj.tags.Name.nil? && obj.tags.Name.eql?(group) }
+          ec2.security_groups.tagged('Name').select do |obj|
+            !obj.tags.Name.nil? &&
+              if ignore_case
+                obj.tags.Name.casecmp(group) == 0
+              else
+                obj.tags.Name.eql?(group)
+              end
           end
         end
       end

data/lib/cloudutil/aws/iam.rb

@@ -0,0 +1,39 @@
+require_relative './core.rb'
+
+module Cloudutil::AWS
+  # A class of utility methods for the AWS IAM service
+  class SNS < Cloudutil::AWS::Core
+    IAM_ARN = 'arn:aws:iam:'
+
+    def resolve_server_certificate_arn(name, ignore_case = true, nap = 2, retries = 5)
+      iam = ::AWS::IAM.new
+      arn = nil
+
+      begin
+        if aws_server_certificate_arn? name
+          arn = name
+        else
+          arn = ::AWS.memoize do
+            if ignore_case
+              c_obj = iam.server_certificates.find { |c| c.name.casecmp(name) == 0 }
+            else
+              c_obj = iam.server_certificates[name]
+            end
+
+            c_obj.arn unless c_obj.nil?
+          end
+        end
+      rescue ::AWS::EC2::Errors::RequestLimitExceeded, ::AWS::Errors::ServerError
+        raise if retries < 1
+        sleep nap
+        resolve_server_certificate_arn(name, ignore_case, (nap * 2), (retries - 1))
+      end
+
+      arn
+    end
+
+    def aws_server_certificate_arn?(name)
+      name.strip.downcase.match("^#{IAM_ARN}:\w+:server-certificate\/\w+").nil?
+    end
+  end
+end

data/lib/cloudutil/aws/s3.rb

@@ -0,0 +1,20 @@
+require_relative './core.rb'
+
+module Cloudutil::AWS
+  # A class of utility methods for the AWS S3 service
+  class S3 < Cloudutil::AWS::Core
+    S3_ARN_PREFIX = 'arn:aws:s3:::'
+
+    def resolve_bucket_arn(name)
+      if aws_bucket_arn? name
+        name
+      else
+        S3_ARN_PREFIX + name
+      end
+    end
+
+    def aws_bucket_arn?(name)
+      name.strip.downcase.start_with? S3_ARN_PREFIX
+    end
+  end
+end

data/lib/cloudutil/aws/sns.rb

@@ -4,23 +4,16 @@ module Cloudutil
   module AWS
     # A class of utility methods for the AWS SNS service
     class SNS < Cloudutil::AWS::Core
+      SNS_ARN = 'arn:aws:sns:'
+
       def resolve_topic_arn(topic, ignore_case = true, nap = 2, retries = 5)
-        sns = ::AWS::SNS.new
         arn = nil
 
         begin
           if aws_topic_arn? topic
             arn = topic
           else
-            arn = ::AWS.memoize do
-              if ignore_case
-                t_obj = sns.topics.find { |t| t.name.casecmp(topic) == 0 }
-              else
-                t_obj = sns.topics.find { |t| t.name.eql? topic }
-              end
-
-              t_obj.arn unless t_obj.nil?
-            end
+            arn = lookup_topic_arn(topic)
           end
         rescue ::AWS::EC2::Errors::RequestLimitExceeded, ::AWS::Errors::ServerError
           raise if retries < 1
@@ -32,8 +25,25 @@ module Cloudutil
       end
 
       def aws_topic_arn?(topic)
-        return true if topic.strip.downcase.start_with? 'arn:aws:sns:'
-        false
+        topic.strip.downcase.start_with? SNS_ARN
+      end
+
+      private
+
+      def lookup_topic_arn(topic)
+        sns = ::AWS::SNS.new
+
+        ::AWS.memoize do
+          t_obj = sns.topics.find do |t|
+            if ignore_case
+              t.name.casecmp(topic) == 0
+            else
+              t.name.eql? topic
+            end
+          end
+
+          t_obj.arn unless t_obj.nil?
+        end
       end
     end
   end

data/lib/cloudutil/version.rb

@@ -1,4 +1,4 @@
 # Module to hold the version number for this library
 module Cloudutil
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cloudutil
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.44'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.44'
 description: |
@@ -125,8 +125,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -136,6 +136,8 @@ files:
 - lib/cloudutil/aws.rb
 - lib/cloudutil/aws/core.rb
 - lib/cloudutil/aws/ec2.rb
+- lib/cloudutil/aws/iam.rb
+- lib/cloudutil/aws/s3.rb
 - lib/cloudutil/aws/sns.rb
 - lib/cloudutil/version.rb
 - spec/aws_core_spec.rb
@@ -151,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A utility library for performing helpful tasks with various cloud platform