cfndsl 0.9.2 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkwNTFiYmFiYzFjODRlODlkYzJkMjdiNjgyNDk5NWEzZmI1NDQ4Ng==
+    ZTQ5MDZiNmQxMzc5OWNjN2RlNTAxYTFkM2VlOWNhYWZkMjcxNDBjYg==
   data.tar.gz: !binary |-
-    NmU4YzQzNWM3YzdjNTAxN2MyMjE3MmNiYmMwZGJiNWU4MjkzYzZlMg==
+    MDU1NmI3MTNkY2VlZDUyYTlkZjg2NzExMTY2ZmU3M2FmMDQ3NzJjNA==
 SHA512:
   metadata.gz: !binary |-
-    NzQ5NzYyZTBiNDU4ZTM0Nzg3MTA1ZDZkNWE5OTVjNWQ1YTUxNjQ0MzRkNWVi
-    Zjc3ODM4ZGEzZjU1MDMyMjFjNDdkMDNhZWY5MWU3MzczMmZhNWMxMWRmN2Ni
-    NjQ5NjViNjZmZTVlZDVkOWViMjcyZjM4OTE4Y2Q3OGZiZTBkMGU=
+    ZTI0YWYzMGM0MDg2MmZhODIzNjYyM2I4ZmVhYjhiNGE0MTVlYjgwNTMyY2Mz
+    MDhhZjExMWI3MjQwMDMyNDkxMWZmMTY4MzhlYTJjYzUwNTY5YzgwNzdjYTY1
+    NjhkMmYwMTg0NGFmMmQ4OGVkZTNjNGY1YThiZTFiNDhjNjgzMjk=
   data.tar.gz: !binary |-
-    YzAxYTM5MWM3MTRiZDExZDY0ZGQxNTNlM2MxNGNkNWZlNjMzMWJlZDEzYWNk
-    Y2Y4ZmMxZThlZGQ3ZDlhYTg4ZmU4YjlhYzNjZmYyNjg3NDc2NmRjYTA4NDA2
-    NmYxYzQ4OTdhNTYxOThiMDlhM2UzZDc0YTE1NTE4YWQ4NjZkOWE=
+    NWY0NWUyMmE2NTIwNjNmNTBhZmU4ZjZjNjUxYWVkNDUyYzA5N2U3YTI1NDll
+    YWFmNTFmYmRmNzQwMmZhYTgzMThjOTA4ZmU4YjhkMjc2YjkxNjVkZDVjNTA4
+    NmZiZjAxMGVhYmZkYzFiMjcwNDg1MmNkYWQ2ZDQwNGQ4NjhiMGE=

data/lib/cfndsl/aws/types.yaml

@@ -16,6 +16,7 @@ Resources:
     MetricsCollection: [ MetricsCollectionType ]
     NotificationConfiguration: String
     Tags: [ AutoScalingTags ]
+    TargetGroupARNs: [ String ]
     TerminationPolicies: [ String ]
     VPCZoneIdentifier: [ String ]
   "AWS::ApiGateway::Account" :
@@ -267,6 +268,13 @@ Resources:
      AllocationId: String
      NetworkInterfaceId: String
      PrivateIpAddress: String
+  "AWS::EC2::FlowLog" :
+    Properties:
+     DeliverLogsPermissionArn: String
+     LogGroupName: String
+     ResourceId: String
+     ResourceType: String
+     TrafficType: String
   "AWS::EC2::Instance" :
    Properties:
     BlockDeviceMappings : [ BlockDeviceMapping ]
@@ -555,6 +563,45 @@ Resources:
     DNSName: String
     SourceSecurityGroup.GroupName: String
     SourceSecurityGroup.OwnerAlias: String
+  "AWS::ElasticLoadBalancingV2::LoadBalancer" :
+    Properties:
+     LoadBalancerAttributes: [ LoadBalancerAttribute ]
+     Name: String
+     Scheme: String
+     SecurityGroups: [ String ]
+     Subnets: [ String ]
+     Tags: [ EC2Tag ]
+  "AWS::ElasticLoadBalancingV2::Listener" :
+    Properties:
+     Certificates: [ LBCertificate ]
+     DefaultActions: [ ListenerDefaultAction ]
+     LoadBalancerArn: String
+     Port: Integer
+     Protocol: String
+     SSLPolicy: String
+  "AWS::ElasticLoadBalancingV2::ListenerRule" :
+    Properties:
+     Actions: [ ListenerRuleAction ]
+     Conditions: [ ListenerRuleCondition ]
+     ListenerArn: String
+     Priority: Integer
+  "AWS::ElasticLoadBalancingV2::TargetGroup" :
+    Properties:
+     HealthCheckIntervalSeconds: Integer
+     HealthCheckPath: String
+     HealthCheckPort: String
+     HealthCheckProtocol: String
+     HealthCheckTimeoutSeconds: Integer
+     HealthyThresholdCount: Integer
+     Matcher: String
+     Name: String
+     Port: String
+     Protocol: String
+     Tags: [ EC2Tag ]
+     TargetGroupAttributes: [ TargetGroupAttribute ]
+     Targets: [ TargetDescription ]
+     UnhealthyThresholdCount: Integer
+     VpcId: String
   "AWS::Elasticsearch::Domain" :
    Properties:
     AccessPolicies: JSON
@@ -582,6 +629,7 @@ Resources:
     SecretAccessKey: String
   "AWS::IAM::Group" :
    Properties:
+    GroupName: String
     ManagedPolicyArns: [ String ]
     Path: String
     Policies: [ IAMEmbeddedPolicy ]
@@ -821,6 +869,7 @@ Resources:
       Encrypted: Boolean
       HsmClientCertificateIdentifier: String
       HsmConfigurationIdentifier: String
+      KmsKeyId: String
       MasterUsername: String
       MasterUserPassword: String
       NodeType: String
@@ -923,6 +972,37 @@ Resources:
     Attributes:
      Arn: String
      QueueName: String
+  "AWS::WAF::ByteMatchSet" :
+    Properties:
+      ByteMatchTuples: [ ByteMatchTuple ]
+      Name: String
+  "AWS::WAF::IPSet" :
+    Properties:
+      IPSetDescriptors: [ IPSetDescriptor ]
+      Name: String
+  "AWS::WAF::Rule" :
+    Properties:
+      MetricName: String
+      Name: String
+      Predicates: [ Predicate ]
+  "AWS::WAF::SizeConstraintSet" :
+    Properties:
+      Name: String
+      SizeConstraints: [ SizeConstraint ]
+  "AWS::WAF::SqlInjectionMatchSet" :
+    Properties:
+      Name: String
+      SqlInjectionMatchTuples: [ SqlInjectionMatchTuple ]
+  "AWS::WAF::WebACL" :
+    Properties:
+      DefaultAction: WebACLAction
+      MetricName: String
+      Name: String
+      Rules: [ WebACLRule ]
+  "AWS::WAF::XssMatchSet" :
+    Properties:
+      Name: String
+      XssMatchTuples: [ XssMatchTuple ]
   "AWS::ECS::Cluster" :
    Properties: {}
   "AWS::ECS::Service" :
@@ -1091,6 +1171,26 @@ Types:
   Protocol: String
   SSLCertificateId: String
   PolicyNames: [ LBOrAppCookieStickinessPolicy ]
+ LoadBalancerAttribute:
+  Key: String
+  Value: String
+ LBCertificate:
+  CertificateArn: String
+ ListenerDefaultAction:
+  TargetGroupArn: String
+  Type: String
+ ListenerRuleAction:
+  Type: String
+  TargetGroupArn: String
+ ListenerRuleCondition:
+  Field: String
+  Values: [ String ]
+ TargetGroupAttribute:
+  Key: String
+  Value: String
+ TargetDescription:
+  Id: String
+  Port: Integer
  RDSSecurityGroupRule:
   CIDRIP: String
   EC2SecurityGroupName: String
@@ -1391,3 +1491,36 @@ Types:
    ResourcePath: String
    ThrottlingBurstLimit: Integer
    ThrottlingRateLimit: Number
+ ByteMatchTuple:
+   FieldToMatch: FieldToMatch
+   PositionalConstraint: String
+   TargetString: String
+   TargetStringBase64: String
+   TextTransformation: String
+ FieldToMatch:
+   Data: String
+   Type: String
+ IPSetDescriptor:
+   Type: String
+   Value: String
+ Predicate:
+   DataId: String
+   Negated: Boolean
+   Type: String
+ SizeConstraint:
+   ComparisonOperator: String
+   FieldToMatch: FieldToMatch
+   Size: String
+   TextTransformation: String
+ SqlInjectionMatchTuple:
+   FieldToMatch: FieldToMatch
+   TextTransformation: String
+ WebACLAction:
+   Type: String
+ WebACLRule:
+   Action: WebACLAction
+   Priority: Integer
+   RuleId: String
+ XssMatchTuple:
+   FieldToMatch: FieldToMatch
+   TextTransformation: String

data/lib/cfndsl/jsonable.rb

@@ -172,23 +172,6 @@ module CfnDsl
     def declare(&block)
       instance_eval(&block) if block_given?
     end
-
-    def method_missing(meth, *args, &_block)
-      error = "Undefined symbol: #{meth}"
-      error = "#{error}(" + args.inspect[1..-2] + ')' unless args.empty?
-      error = "#{error}\n\nTry '#{titleize(meth)}' instead" if incorrect_capitalization?(meth)
-      CfnDsl::Errors.error(error, 1)
-    end
-
-    def incorrect_capitalization?(method)
-      method != titleize(method) && respond_to?(titleize(method))
-    end
-
-    def titleize(method)
-      method.to_s.clone.tap do |m|
-        m[0] = m[0, 1].upcase
-      end.to_sym
-    end
   end
 
   # Handles all of the Fn:: objects

data/lib/cfndsl/names.rb

@@ -1,18 +1,12 @@
 # Method name helper
 module CfnDsl
+  module_function
+
   # iterates through the the valid case-insensitive names
   # for "name"
-  def self.method_names(name, &block)
-    if block
-      name_str = name.to_s
-      yield name_str.to_sym
-      n = name_str.dup
-      n[0] = n[0].swapcase
-      yield n.to_sym
-    else
-      result = [name.dup, name.dup]
-      result[1][0] = result[1][0].swapcase
-      return result
-    end
+  def method_names(name)
+    name_str = name.to_s.dup
+    names = [name_str, name_str.gsub(/^\w/, &:swapcase)]
+    block_given? ? names.each { |n| yield n.to_sym } : names
   end
 end

data/lib/cfndsl/plurals.rb

@@ -1,34 +1,28 @@
 module CfnDsl
   # Plural names for lists of content objects
   module Plurals
+    module_function
+
     @plurals = {
-      'Metadata' => 'Metadata',
-      'Property' => 'Properties',
-      'Policy' => 'Policies',
-      'PolicyDocument' => 'PolicyDocument',
       'AssumeRolePolicyDocument' => 'AssumeRolePolicyDocument',
-      'SecurityGroupIngress' => 'SecurityGroupIngress',
-      'SecurityGroupEgress' => 'SecurityGroupEgress',
-      'DBSecurityGroupIngress' => 'DBSecurityGroupIngress',
-      'UpdatePolicy' => 'UpdatePolicy',
-      'CreationPolicy' => 'CreationPolicy'
+      'CreationPolicy'           => 'CreationPolicy',
+      'DBSecurityGroupIngress'   => 'DBSecurityGroupIngress',
+      'Metadata'                 => 'Metadata',
+      'Policy'                   => 'Policies',
+      'PolicyDocument'           => 'PolicyDocument',
+      'Property'                 => 'Properties',
+      'SecurityGroupEgress'      => 'SecurityGroupEgress',
+      'SecurityGroupIngress'     => 'SecurityGroupIngress',
+      'UpdatePolicy'             => 'UpdatePolicy'
     }
+    @singles = @plurals.invert
 
-    @singles = {}
-    @plurals.each_pair { |key, val| @singles[val] = key }
-
-    def self.pluralize(name)
-      name = name.to_s
-      return @plurals[name] if @plurals.key?(name)
-
-      "#{name}s"
+    def pluralize(name)
+      @plurals.fetch(name.to_s) { |key| key + 's' }
     end
 
-    def self.singularize(name)
-      name = name.to_s
-      return @singles[name] if @singles.key?(name)
-
-      name[0..-2]
+    def singularize(name)
+      @singles.fetch(name.to_s) { |key| key[0..-2] }
     end
   end
 end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/spec/names_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe CfnDsl do
+  context '.method_names' do
+    it 'returns an array of string method names when called without a block' do
+      expect(described_class.method_names('foo')).to eq(%w(foo Foo))
+    end
+
+    it 'yields symbol method names when called with a block' do
+      results = []
+      described_class.method_names('foo') { |name| results << name }
+      expect(results).to eq([:foo, :Foo])
+    end
+  end
+end

data/spec/plurals_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe CfnDsl::Plurals do
+  context '.pluralize' do
+    it 'pluralizes methods from the list' do
+      expect(described_class.pluralize(:SecurityGroupIngress)).to eq('SecurityGroupIngress')
+    end
+
+    it 'pluralizes other methods' do
+      expect(described_class.pluralize(:StageKey)).to eq('StageKeys')
+    end
+  end
+
+  context '.singularize' do
+    it 'singularizes methods from the list' do
+      expect(described_class.singularize(:SecurityGroupIngress)).to eq('SecurityGroupIngress')
+    end
+
+    it 'singularizes other methods' do
+      expect(described_class.singularize(:StageKeys)).to eq('StageKey')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,8 @@ files:
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb
 - spec/jsonable_spec.rb
+- spec/names_spec.rb
+- spec/plurals_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/stevenjack/cfndsl
@@ -126,5 +128,7 @@ test_files:
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb
 - spec/jsonable_spec.rb
+- spec/names_spec.rb
+- spec/plurals_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb