serverkit-aws 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57e09c031fe6375425d75add1e4a91ebcc47bb3
-  data.tar.gz: 362b1425fbadec3124b9db2e2768e621fedf9a20
+  metadata.gz: 1e7fa8e75351d9ff3c9d5ffcffbe1546e651552b
+  data.tar.gz: 39393fc23076116a7de457249535f40cd746af87
 SHA512:
-  metadata.gz: 9e13f5c6b752db825331d46ca0fd3e4a1ecd66e05e5dda558fe31dbdb8c8c14a157d56ddf12a92d7eb5b0bfd592389b3559e75fe4da633ae6c0abeb8821cac62
-  data.tar.gz: bfe51e47fbd04a82e30ffe625904189deb47734040d535e27fbb1e606d5e1f07635cbdcb90beafa64f1157cd70801245a414191d23cb1686fbe48deb935dd80d
+  metadata.gz: fab356fef434f99366f9c4e4bb65145f98f75622df78469a78be773fdbc912224fa7e47788a80cc6d1aafc38bf2d8d6197144b11a36e527d1fca088c5a3c8e87
+  data.tar.gz: 25beffaeac0fb78c283b9d09066745ec781d519d616adb649f51743759f530b37810f185053905adb1189b8b1f8c7e30b1e6dd484d7b554a437b459d8f895f55

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.4
+- Add cloud_front_web_distribution resource
+
 ## 0.0.3
 - Fix gemspec name
 

data/README.md

@@ -8,22 +8,42 @@ gem "serverkit-aws"
 ```
 
 ## Resource
-### s3_bucket
-Create a S3 bucket.
+### cloud_front_web_distribution
+Create a CloudFront web distribution.
 
 #### Attributes
-- name - S3 bucket name (required) (e.g. `"my-bucket"`)
 - aws_access_key_id - AWS access key ID
 - aws_region - AWS region
 - aws_secret_access_key - AWS secret access key
+- distribution_config - distribution_config parameter
 
-Note: serverkit-s3 searches the following locations for credentials and a region:
+Note: some default parameters are reverse-merged into given distribution_config.
 
-- `ENV["AWS_ACCESS_KEY_ID"]`
-- `ENV["AWS_REGION"]`
-- `ENV["AWS_SECRET_ACCESS_KEY"]`
-- The shared credentials ini file at `~/.aws/credentials`
-- From an instance profile when running on EC2
+#### Example
+```yml
+resources:
+  - type: cloud_front_web_distribution
+    aws_region: ap-northeast-1
+    distribution_config:
+      caller_reference: test
+      default_cache_behavior:
+        target_origin_id: S3-test
+      origins:
+        items:
+          - id: S3-test
+            domain_name: test.s3.amazonaws.com
+            s3_origin_config:
+              origin_access_identity: ""
+        quantity: 1
+```
+### s3_bucket
+Create a S3 bucket.
+
+#### Attributes
+- aws_access_key_id - AWS access key ID
+- aws_region - AWS region
+- aws_secret_access_key - AWS secret access key
+- name - S3 bucket name (required) (e.g. `"my-bucket"`)
 
 #### Example
 ```yml
@@ -32,3 +52,12 @@ resources:
     name: my-bucket
     aws_region: ap-northeast-1
 ```
+
+## Credentials and Region
+serverkit-aws searches the following locations for credentials and a region:
+
+- `ENV["AWS_ACCESS_KEY_ID"]`
+- `ENV["AWS_REGION"]`
+- `ENV["AWS_SECRET_ACCESS_KEY"]`
+- The shared credentials ini file at `~/.aws/credentials`
+- From an instance profile when running on EC2

data/lib/serverkit/aws.rb

@@ -1,2 +1,3 @@
 require "serverkit/aws/version"
+require "serverkit/resources/cloud_front_web_distribution"
 require "serverkit/resources/s3_bucket"

data/lib/serverkit/aws/client_options_generatable.rb

@@ -0,0 +1,16 @@
+module Serverkit
+  module Aws
+    module ClientOptionsGeneratable
+      private
+
+      # @return [Hash{Symbol => Object}]
+      def client_options
+        options = { region: aws_region }
+        if aws_access_key_id || aws_secret_access_key
+          options[:credentials] = ::Aws::Credentials.new(aws_access_key_id, aws_secret_access_key)
+        end
+        options
+      end
+    end
+  end
+end

data/lib/serverkit/aws/version.rb

@@ -1,5 +1,5 @@
 module Serverkit
   module Aws
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/serverkit/resources/cloud_front_web_distribution.rb

@@ -0,0 +1,63 @@
+require "active_support/core_ext/hash/keys"
+require "aws-sdk"
+require "serverkit/aws/client_options_generatable"
+require "serverkit/resources/base"
+
+module Serverkit
+  module Resources
+    class CloudFrontWebDistribution < Base
+      include ::Serverkit::Aws::ClientOptionsGeneratable
+
+      DEFAULT_DISTRIBUTION_CONFIG = {
+        comment: "Created by serverkit-aws",
+        default_cache_behavior: {
+          forwarded_values: {
+            cookies: {
+              forward: "none",
+            },
+            query_string: false,
+          },
+          min_ttl: 0,
+          trusted_signers: {
+            enabled: false,
+            quantity: 0,
+          },
+          viewer_protocol_policy: "allow-all",
+        },
+        enabled: true,
+      }
+
+      attribute :aws_access_key_id, type: ::String
+      attribute :aws_region, type: ::String
+      attribute :aws_secret_access_key, type: ::String
+      attribute :distribution_config, type: ::Hash
+
+      # @note Override
+      def apply
+        client.create_distribution(
+          distribution_config: DEFAULT_DISTRIBUTION_CONFIG.deep_merge(
+            distribution_config.deep_symbolize_keys,
+          )
+        )
+      rescue ::Aws::CloudFront::Errors::DistributionAlreadyExists
+      end
+
+      # @note Override
+      def check
+        false
+      end
+
+      # @note Override
+      def recheck
+        true
+      end
+
+      private
+
+      # @return [Aws::Cloudfront::Client]
+      def client
+        @client ||= ::Aws::CloudFront::Client.new(client_options)
+      end
+    end
+  end
+end

data/lib/serverkit/resources/s3_bucket.rb

@@ -1,9 +1,12 @@
 require "aws-sdk"
+require "serverkit/aws/client_options_generatable"
 require "serverkit/resources/base"
 
 module Serverkit
   module Resources
     class S3Bucket < Base
+      include ::Serverkit::Aws::ClientOptionsGeneratable
+
       attribute :aws_access_key_id, type: String
       attribute :aws_region, type: String
       attribute :aws_secret_access_key, type: String
@@ -28,15 +31,6 @@ module Serverkit
       def client
         @client ||= ::Aws::S3::Client.new(client_options)
       end
-
-      # @return [Hash]
-      def client_options
-        options = { region: aws_region }
-        if aws_access_key_id || aws_secret_access_key
-          options[:credentials] = ::Aws::Credentials.new(aws_access_key_id, aws_secret_access_key)
-        end
-        options
-      end
     end
   end
 end

data/serverkit-aws.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "activesupport", ">= 4.0.2"
   spec.add_runtime_dependency "aws-sdk", "~> 2"
   spec.add_runtime_dependency "serverkit", ">= 0.6.7"
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serverkit-aws
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,9 @@ files:
 - README.md
 - Rakefile
 - lib/serverkit/aws.rb
+- lib/serverkit/aws/client_options_generatable.rb
 - lib/serverkit/aws/version.rb
+- lib/serverkit/resources/cloud_front_web_distribution.rb
 - lib/serverkit/resources/s3_bucket.rb
 - serverkit-aws.gemspec
 homepage: https://github.com/serverkit/serverkit-s3