convection 0.2.30 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b60c6f4c1de9889159bba6dbdb8093a6c6cedb
-  data.tar.gz: 79a81554e45696d23fd7aa5eb5aa8d96924a63f0
+  metadata.gz: 1e2ef5c368c42fdb7e95331677057dd31fefcea1
+  data.tar.gz: d399f40f64e6d3e07f9236c611f5bb1ae054e798
 SHA512:
-  metadata.gz: a4653842caa0c00679a0a0fc2e94447dbadcfab0d7067107bca58e1b91eb132e5b6be5021a20e68da4ecf24492f29d420127314ca6a420e109f4028633772315
-  data.tar.gz: cae2630869a056f8cb6b53364bd0638f08318a7ec701f00443c12e372b278f771d4ea3fdae28a0ef63a008ef7aa0fa55c08641589dad0b57e890c67fbf709190
+  metadata.gz: 33f17b3684c303868591be29990b798f0c364b27446cca02c544d5def928a444ab7df5c757449f7e9b66ddf0cd462f6adf71e32e20d0267fcc6daa2acd39ad76
+  data.tar.gz: 9c7814c5800810aa07fce9da22ed02878d2034b183d4b5a3bf01dc18500205372f0471f6fee6692f85dfb2a696b9c1ba3a423daa445440e6021828264fa1d7b7

data/lib/convection/model/template/resource/aws_s3_bucket.rb

@@ -13,12 +13,23 @@ module Convection
           type 'AWS::S3::Bucket'
           property :bucket_name, 'BucketName'
           property :access_control, 'AccessControl'
-          property :cors_configurationm, 'CorsConfiguration'
+          property :cors_configuration, 'CorsConfiguration'
           property :lifecycle_configuration, 'LifecycleConfiguration'
           property :logging_configuration, 'LoggingConfiguration'
           property :notification_configuration, 'NotificationConfiguration'
           property :versioning_configuration, 'VersioningConfiguration'
 
+          def cors_configuration(&block)
+            config = ResourceProperty::S3CorsConfiguration.new(self)
+            config.instance_exec(&block) if block
+            properties['CorsConfiguration'].set(config)
+          end
+
+          def cors_configurationm(*args)
+            warn 'DEPRECATED: "cors_configurationm" is deprecated. Please use "cors_configuration" instead. https://github.com/rapid7/convection/pull/135'
+            cors_configuration(*args)
+          end
+
           def render(*args)
             super.tap do |resource|
               render_tags(resource)

data/lib/convection/model/template/resource_property/aws_s3_cors_configuration.rb

@@ -0,0 +1,21 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors.html
+        # Amazon S3 Cors Configuration}
+        class S3CorsConfiguration < ResourceProperty
+          property :cors_rules, 'CorsRules', :type => :list
+
+          def cors_rule(&block)
+            cors_rule = ResourceProperty::S3CorsConfigurationRule.new(self)
+            cors_rule.instance_exec(&block) if block
+            cors_rules << cors_rule
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource_property/aws_s3_cors_configuration_rule.rb

@@ -0,0 +1,20 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html
+        # Amazon S3 Cors Configuration Rule}
+        class S3CorsConfigurationRule < ResourceProperty
+          property :allowed_headers, 'AllowedHeaders', :type => :list
+          property :allowed_methods, 'AllowedMethods', :type => :list
+          property :allowed_origins, 'AllowedOrigins', :type => :list
+          property :exposed_headers, 'ExposedHeaders', :type => :list
+          property :id, 'Id'
+          property :max_age, 'MaxAge'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - John Manero
@@ -217,6 +217,8 @@ files:
 - lib/convection/model/template/resource_property/aws_events_rule_target.rb
 - lib/convection/model/template/resource_property/aws_lambda_function_code.rb
 - lib/convection/model/template/resource_property/aws_lambda_vpc_config.rb
+- lib/convection/model/template/resource_property/aws_s3_cors_configuration.rb
+- lib/convection/model/template/resource_property/aws_s3_cors_configuration_rule.rb
 - lib/convection/version.rb
 - test/convection/model/test_conditions.rb
 - test/convection/model/test_directory_service.rb