awsdsl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae154e947361276d4545c34fffffbc0eb07caf3e
-  data.tar.gz: b0a01325a610b74f8d8a9b38bf314a79e9f85324
+  metadata.gz: f39a342a2486e3fd3343e1e3cd1a6ae412c621e8
+  data.tar.gz: 736e80a97726524a1185e091d04cb76660884fa7
 SHA512:
-  metadata.gz: 5537d5bfd37391d089dec9988d5af873d04c4b0a9e5a4ee748684a061a51d4b5e6535b06523d686b0f24a595b5efc85e235b96cded6251e8c1738119a4a0f929
-  data.tar.gz: eedb01fb25690bd8c417f9dadfc3cd6f7f65ea1088ace302a50bc8538e88d6920724b929151d316a6bd113f73a0b608b8606b877aa9bfe8619f479024873d851
+  metadata.gz: 0805eda968d74aba3988fcd39f738601f7ce7fe5a0b5b9efc18648bbe23bb327df9047295a5ba2c663eee330139fb348d5eafb41edf48234a3dfa341f09f990b
+  data.tar.gz: 31d374d5e9655dfe00ff2581ad34ea5e32a8d72b888cc52dffa01bd1aa8300e38a177cd7513d4317abba291665325fae79d1410282c5d341b967720208fb7642

data/README.md

@@ -14,13 +14,23 @@ Install
 -------
 
 For now I recommending using Bundler to install and manage AWS DSL.
-Simply add this to your Gemfile
+Simply add this to your Gemfile to use the development version
 
 ```ruby
 gem 'awsdsl', git: 'https://github.com/josephglanville/awsdsl'
 ```
 
-I will publish the gem to RubyGems when I feel it's stabilized.
+Or the currently released version (not currently recommended)
+
+```ruby
+gem 'awsdsl', '~> 0.0.1'
+```
+
+However you can also install from RubyGems
+
+    $ gem install awsdsl
+
+When the gem is in-use in production I will push the version to 1.0 and follow Semver from there.
 
 Getting Started
 ---------------

data/lib/awsdsl/cfn_builder.rb

@@ -23,6 +23,7 @@ module AWSDSL
       AWS.memoize do
         build_vpcs
         build_elasticaches
+        build_buckets
         build_roles
       end
       @t
@@ -66,6 +67,15 @@ module AWSDSL
                                      ToPort: port,
                                      CidrIp: '0.0.0.0/0'
               end
+              lb.allows.each do |rule|
+                ports = rule[:ports].is_a?(Array) ? rule[:ports] : [rule[:ports]]
+                ports.each do |port|
+                  SecurityGroupIngress IpProtocol: rule[:proto] || 'tcp',
+                                       FromPort: port,
+                                       ToPort: port,
+                                       SourceSecurityGroupId: Ref("#{rule[:role].capitalize}SG")
+                end
+              end
             end
           end
 
@@ -143,6 +153,7 @@ module AWSDSL
         # Launch Configuration
         security_groups = resolve_security_groups(role.vpc, role.security_groups)
         block_devices = format_block_devices(role.block_devices)
+        vars = (stack.vars || {}).merge(role.vars || {})
         @t.declare do
           LaunchConfiguration "#{role_name}LaunchConfig" do
             ImageId role.ami
@@ -154,6 +165,9 @@ module AWSDSL
             IamInstanceProfile Ref("#{role_name}InstanceProfile")
             BlockDeviceMappings block_devices
             KeyName role.key_pair if role.key_pair
+            vars.each do |k,v|
+              Metadata k.to_s, v
+            end
           end
         end
 
@@ -356,5 +370,17 @@ module AWSDSL
         end
       end
     end
+
+    def build_buckets
+      stack = @stack
+      stack.buckets.each do |bucket|
+        @t.declare do
+          Bucket "#{bucket.name.capitalize}Bucket" do
+            BucketName bucket.bucket_name if bucket.bucket_name
+            AccessControl bucket.access_control if bucket.access_control
+          end
+        end
+      end
+    end
   end
 end

data/lib/awsdsl/dsl/bucket.rb

@@ -0,0 +1,7 @@
+module AWSDSL
+  class Bucket
+    include DSL
+    # TODO(jpg): CORS, Lifecycle config etc.
+    attributes :bucket_name, :access_control, :tags
+  end
+end

data/lib/awsdsl/dsl/elasticache.rb

@@ -2,6 +2,6 @@ module AWSDSL
   class Elasticache
     include DSL
     multi_attributes :allow, :subnet
-    attributes :engine, :node_type, :port, :num_nodes, :vpc
+    attributes :engine, :node_type, :port, :num_nodes, :vpc, :tags
   end
 end

data/lib/awsdsl/dsl/load_balancer.rb

@@ -1,7 +1,7 @@
 module AWSDSL
   class LoadBalancer
     include DSL
-    multi_attributes :listener, :dns_record, :security_group, :subnet
-    attributes :health_check, :internal, :connection_settings
+    multi_attributes :listener, :dns_record, :security_group, :subnet, :allow
+    attributes :health_check, :internal, :connection_settings, :tags
   end
 end

data/lib/awsdsl/dsl/role.rb

@@ -21,6 +21,7 @@ module AWSDSL
                :vpc,
                :base_ami,
                :vars,
-               :key_pair
+               :key_pair,
+               :tags
   end
 end

data/lib/awsdsl/dsl/role_profile.rb

@@ -21,7 +21,8 @@ module AWSDSL
                :vpc,
                :base_ami,
                :vars,
-               :key_pair
+               :key_pair,
+               :tags
 
     def initialize(name, &block)
       @block = block if block_given?

data/lib/awsdsl/dsl/stack.rb

@@ -1,8 +1,8 @@
 module AWSDSL
   class Stack
     include DSL
-    attributes :description, :vars
-    sub_components :role, :role_profile, :elasticache, :vpc
+    attributes :description, :vars, :tags
+    sub_components :role, :role_profile, :elasticache, :vpc, :bucket
 
     def mixin_profiles
       @roles.each do |role|

data/lib/awsdsl/dsl/subnet.rb

@@ -1,7 +1,7 @@
 module AWSDSL
   class Subnet
     include DSL
-    attributes :igw
+    attributes :igw, :tags
     multi_attributes :az
   end
 end

data/lib/awsdsl/dsl/vpc.rb

@@ -2,6 +2,6 @@ module AWSDSL
   class Vpc
     include DSL
     sub_components :subnet
-    attributes :cidr, :dns, :dns_hostnames, :igw, :region, :subnet_bits
+    attributes :cidr, :dns, :dns_hostnames, :igw, :region, :subnet_bits, :tags
   end
 end

data/lib/awsdsl/loader.rb

@@ -6,6 +6,7 @@ require 'awsdsl/dsl/load_balancer'
 require 'awsdsl/dsl/elasticache'
 require 'awsdsl/dsl/vpc'
 require 'awsdsl/dsl/subnet'
+require 'awsdsl/dsl/bucket'
 require 'awsdsl/fn'
 
 module AWSDSL

data/lib/awsdsl/version.rb

@@ -1,3 +1,3 @@
 module AWSDSL
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/fixtures/test_stack.rb

@@ -67,9 +67,11 @@ stack 'logs' do
     instance_type 't2.micro'
     block_device name: '/dev/sda1', size: 20
     chef_provisioner runlist: 'elasticsearch'
+    tags Cluster: 'ESCluster'
     allow role: 'logstash', ports: 9200
     allow role: 'utility', ports: 9200
     allow role: 'elasticsearch', ports: 9200
+    vars Cluster: 'ESCluster'
   end
 
   role 'utility' do
@@ -97,4 +99,9 @@ stack 'logs' do
     node_type 't2.micro'
     allow role: 'logstash'
   end
+
+  bucket 'builds' do
+    bucket_name 'builds'
+    access_control 'Public'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsdsl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joseph Glanville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -117,6 +117,7 @@ files:
 - lib/awsdsl/cfn_helpers.rb
 - lib/awsdsl/command_line.rb
 - lib/awsdsl/dsl.rb
+- lib/awsdsl/dsl/bucket.rb
 - lib/awsdsl/dsl/elasticache.rb
 - lib/awsdsl/dsl/load_balancer.rb
 - lib/awsdsl/dsl/role.rb