aws-cfn-resources 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5c44a0aff255bc860fa8dfb43c5fceffc8224c
-  data.tar.gz: be93cc9d19a332a5818ea3826699bd96a6436960
+  metadata.gz: 05653f56afb0c8968dfe364b3a4651e2d1741494
+  data.tar.gz: c3884f0764220cbf61dce3678e798ef157804ae8
 SHA512:
-  metadata.gz: c1c2392ef612692b61a6800f7f789a55e81a03465ce11ddd2dcac98faa3bf5e2ee2d31c724af780cbe002d4238c517b0ed9e4ea71a775f0a798a5361ac91af5c
-  data.tar.gz: 5a404644a0f7594ef0b661a5a067937c5154a7d2ada20e21e61608b1b0b65993172d651ac3a0b1d467e02e09208c21aa2c47cd44fd6df80dcd8ae9473373c706
+  metadata.gz: f71c0f4d40229defe90037a124dd39a58d10032b451bdd89a9fe64bf56c64d7ff5bb143acafe441689750a9b73312bdd1b525deb497e8172ce5ea3910ed9ee59
+  data.tar.gz: 7e5c0ce5b3ae1da284fc3597deadb3997f3b1a43dbb7d5e29332043863f64634023b71555f846e52416816098269570ef3dc1298603ed43256c112ef49a8416b

data/lib/aws-cloudformation-stack.rb

@@ -6,9 +6,24 @@ require 'aws-sdk-v1'
 module AWS
   class CloudFormation
     class Stack
+
+      def initialize name, options = {}
+        @name = name
+        
+        @as = AWS::AutoScaling.new
+        @cw = AWS::CloudWatch.new
+        @ec2 = AWS::EC2.new
+        @elb = AWS::ELB.new
+        @iam = AWS::IAM.new
+        @rds = AWS::RDS.new
+        @s3 = AWS::S3.new
+
+        super
+      end
       
       def autoscaling_group(logical_id)
-        AWS::AutoScaling.new.groups[autoscaling_group_ids[logical_id.to_sym]]
+        id = autoscaling_group_ids[logical_id.to_sym]
+        @as.groups[id] if id
       end
 
       def autoscaling_groups
@@ -20,7 +35,8 @@ module AWS
       end
 
       def bucket(logical_id)
-        AWS::S3.new.buckets[bucket_ids[logical_id.to_sym]]
+        id = bucket_ids[logical_id.to_sym]
+        @s3.buckets[id] if id
       end
 
       def buckets
@@ -32,7 +48,8 @@ module AWS
       end
 
       def cloudwatch_alarm(logical_id)
-        AWS::CloudWatch.new.alarms[cloudwatch_alarm_ids[logical_id.to_sym]]
+        id = cloudwatch_alarm_ids[logical_id.to_sym]
+        @cw.alarms[id] if id
       end
 
       def cloudwatch_alarms
@@ -56,7 +73,8 @@ module AWS
       end
 
       def eip(logical_id)
-        AWS::EC2.new.elastic_ips[eip_ids[logical_id.to_sym]]
+        id = eip_ids[logical_id.to_sym]
+        @ec2.elastic_ips[id] if id
       end
 
       alias_method :elastic_ip, :eip
@@ -72,7 +90,8 @@ module AWS
       end
 
       def elb(logical_id)
-        AWS::ELB.new.load_balancers[elb_ids[logical_id.to_sym]]
+        id = elb_ids[logical_id.to_sym]
+        @elb.load_balancers[id] if id
       end
 
       def elbs
@@ -84,7 +103,13 @@ module AWS
       end
 
       def iam_access_key(user_logical_id, key_logical_id)
-        iam_user(user_logical_id).access_keys[iam_access_key_ids[key_logical_id.to_sym]]
+        id = iam_access_key_ids[key_logical_id.to_sym]
+        user = iam_user(user_logical_id)
+        if (id && user)
+          user.access_keys[id]
+        else
+          nil
+        end
       end
 
       def iam_access_key_ids
@@ -92,7 +117,8 @@ module AWS
       end
 
       def iam_group(logical_id)
-        AWS::IAM.new.groups[iam_group_ids[logical_id.to_sym]]
+        id = iam_group_ids[logical_id.to_sym]
+        @iam.groups[id] if id
       end
 
       def iam_groups
@@ -114,7 +140,8 @@ module AWS
       end
 
       def iam_user(logical_id)
-        AWS::IAM.new.users[iam_user_ids[logical_id.to_sym]]
+        id = iam_user_ids[logical_id.to_sym]
+        @iam.users[id] if id
       end
 
       def iam_users
@@ -126,7 +153,8 @@ module AWS
       end
 
       def instance(logical_id)
-        AWS::EC2.new.instances[instance_ids[logical_id.to_sym]]
+        id = instance_ids[logical_id.to_sym]
+        @ec2.instances[id] if id
       end
 
       def instances
@@ -138,7 +166,8 @@ module AWS
       end
 
       def internet_gateway(logical_id)
-        AWS::EC2.new.internet_gateways[internet_gateway_ids[logical_id.to_sym]]
+        id = internet_gateway_ids[logical_id.to_sym]
+        @ec2.internet_gateways[id] if id
       end
 
       alias_method :igw, :internet_gateway
@@ -148,7 +177,8 @@ module AWS
       end
 
       def launch_configuration(logical_id)
-        AWS::AutoScaling.new.launch_configurations[launch_configuration_ids[logical_id.to_sym]]
+        id = launch_configuration_ids[logical_id.to_sym]
+        @as.launch_configurations[id] if id
       end
 
       alias_method :launch_config, :launch_configuration
@@ -164,7 +194,8 @@ module AWS
       end
 
       def network_interface(logical_id)
-        AWS::EC2.new.network_interfaces[network_interface_ids[logical_id.to_sym]]
+        id = network_interface_ids[logical_id.to_sym]
+        @ec2.network_interfaces[id] if id
       end
 
       alias_method :nic, :network_interface
@@ -180,7 +211,8 @@ module AWS
       end
 
       def route_table(logical_id)
-        AWS::EC2.new.route_tables[route_table_ids[logical_id.to_sym]]
+        id = route_table_ids[logical_id.to_sym]
+        @ec2.route_tables[id] if id
       end
 
       def route_table_ids
@@ -189,8 +221,13 @@ module AWS
 
       def scaling_policy(as_group_logical_id, policy_logical_id)
         group = autoscaling_group(as_group_logical_id)
-        policy = scaling_policy_ids[policy_logical_id.to_sym].split('/')[-1]
-        AWS::AutoScaling::ScalingPolicy.new(group, policy)
+        id = scaling_policy_ids[policy_logical_id.to_sym]
+        policy = id.split('/')[-1] unless id.nil?
+        if (group && policy)
+          AWS::AutoScaling::ScalingPolicy.new(group, policy)
+        else
+          nil
+        end
       end
 
       def scaling_policies(as_group_logical_id)
@@ -202,7 +239,8 @@ module AWS
       end
 
       def security_group(logical_id)
-        AWS::EC2.new.security_groups.filter('group-id',security_group_ids[logical_id.to_sym]).first
+        id = security_group_ids[logical_id.to_sym]
+        @ec2.security_groups.filter('group-id',id).first if id
       end
       
       def security_groups
@@ -214,7 +252,8 @@ module AWS
       end
 
       def subnet(logical_id)
-        AWS::EC2.new.subnets[subnet_ids[logical_id.to_sym]]
+        id = subnet_ids[logical_id.to_sym]
+        @ec2.subnets[id] if id
       end
 
       def subnets
@@ -226,7 +265,8 @@ module AWS
       end
 
       def volume(logical_id)
-        AWS::EC2.new.volumes[volume_ids[logical_id.to_sym]]
+        id = volume_ids[logical_id.to_sym]
+        @ec2.volumes[id] if id
       end
 
       def volumes
@@ -238,7 +278,8 @@ module AWS
       end
 
       def vpc(logical_id)
-        AWS::EC2.new.vpcs[vpc_ids[logical_id.to_sym]]
+        id = vpc_ids[logical_id.to_sym]
+        @ec2.vpcs[id] if id
       end
 
       def vpcs
@@ -252,9 +293,7 @@ module AWS
       private
 
       def get_resources(resource_type)
-        hash = {}
-        resource_summaries.select { |rs| rs[:resource_type] == "#{resource_type}" }.collect { |r| hash[r[:logical_resource_id].to_sym] = r[:physical_resource_id] }
-        return hash
+        resource_summaries.select { |rs| rs[:resource_type] == "#{resource_type}" }.inject({}) { |hash, r| hash[r[:logical_resource_id].to_sym] = r[:physical_resource_id]; hash }
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-resources
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shayne Clausson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc