cfdef 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f7569ecd16aca5421994ce854733c6593d79cae
-  data.tar.gz: 7f70f529230958a3113e232f140a95ef29c2ea53
+  metadata.gz: 0d55a0bdee6a2bbaf9db699f83615a3d328bd8b8
+  data.tar.gz: 559139e452bf7b33c00ed77eb7064104eaf64aec
 SHA512:
-  metadata.gz: f4110663867762259c075df419a806b491e1b821bd3692ba06a0f4e5a59d4d91e236ff90ddbb5486de098a723aeb0f12b3cec168e5cc50890acf81683416a1d5
-  data.tar.gz: bc7917e4e368cbc06804eb2b75967830272807e54f666b96ea657fd00e616bd23e8890108ec3323c077ba4eb62c05b3f56961267a52ca0f3600e9e16b172be38
+  metadata.gz: 1b036a409ca0ea2b99aa613b72c12437217d8718c6559353d583a54dc67e90db3950c6e1b4d39ee0ecb0f4dc735ebfcc0709cf99e61b701ecafc18d0090f18a9
+  data.tar.gz: 0e90921ba73ce3d379f7a11bd84bf16ace05c9dc3ce1b58fc7dba16348cad07c68941d22a485c308bb8d694d76f6a19d8d36a9ff840feddb80b9a589d340b228

data/README.md

@@ -181,6 +181,89 @@ $ cat CFfile
 $ cfdef -a
 ```
 
+## Use braces
+
+Export with `--use-braces` option.
+
+```ruby
+distribution("EXAMPLEID") {
+  aliases {
+    quantity 0
+  }
+  origins {
+    quantity 1
+    items {|*|
+      id "Custom-example.com"
+      domain_name "example.com"
+      origin_path ""
+      custom_headers {
+        quantity 0
+      }
+      custom_origin_config {
+        http_port 80
+        https_port 443
+        origin_protocol_policy "http-only"
+        origin_ssl_protocols {
+          quantity 3
+          items ["TLSv1", "TLSv1.1", "TLSv1.2"]
+        }
+      }
+    }
+  }
+  default_cache_behavior {
+    target_origin_id "Custom-example.com"
+    forwarded_values {
+      query_string false
+      cookies {
+        forward "none"
+      }
+      headers {
+        quantity 0
+      }
+    }
+    trusted_signers {
+      enabled false
+      quantity 0
+    }
+    viewer_protocol_policy "allow-all"
+    min_ttl 0
+    allowed_methods {
+      quantity 2
+      items ["GET", "HEAD"]
+      cached_methods {
+        quantity 2
+        items ["GET", "HEAD"]
+      }
+    }
+    smooth_streaming false
+    default_ttl 86400
+    max_ttl 31536000
+    compress false
+  }
+  cache_behaviors {
+    quantity 0
+  }
+  custom_error_responses {
+    quantity 0
+  }
+  comment ""
+  price_class "PriceClass_All"
+  enabled true
+  viewer_certificate {
+    cloud_front_default_certificate true
+    minimum_protocol_version "SSLv3"
+    certificate_source "cloudfront"
+  }
+  restrictions {
+    geo_restriction {
+      restriction_type "none"
+      quantity 0
+    }
+  }
+  web_acl_id ""
+}
+```
+
 ## ToDo
 
 * Support Streaming Distribution

data/cfdef.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'diffy'
   spec.add_dependency 'dslh', '>= 0.3.6'
   spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'parallel'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/cfdef.rb

@@ -3,6 +3,7 @@ require 'diffy'
 require 'dslh'
 require 'json'
 require 'logger'
+require 'parallel'
 require 'pp'
 require 'securerandom'
 require 'singleton'

data/lib/cfdef/exporter.rb

@@ -1,6 +1,8 @@
 class Cfdef::Exporter
   include Cfdef::Utils::Helper
 
+  CONCURRENCY = 8
+
   def initialize(client, options = {})
     @client = client
     @options = options
@@ -19,10 +21,12 @@ class Cfdef::Exporter
   def export_distributions
     result = {}
 
-    distributions = @client.list_distributions.flat_map(&:distribution_list).flat_map(&:items).map(&:to_h)
+    distribution_ids = @client.list_distributions.flat_map(&:distribution_list).flat_map(&:items).map(&:id)
 
-    distributions.each do |distribution|
-      distribution_id = distribution.fetch(:id)
+    Parallel.each(distribution_ids, in_threads: CONCURRENCY) do |distribution_id|
+      resp = @client.get_distribution_config(id: distribution_id)
+      distribution = resp.distribution_config.to_h
+      distribution.delete(:caller_reference)
       origin_ids = distribution.fetch(:origins).fetch(:items).map {|i| i[:id] }.sort
       next unless origin_ids.any?{|i| matched?(i) }
       result[distribution_id] = remove_status!(distribution)

data/lib/cfdef/version.rb

@@ -1,3 +1,3 @@
 module Cfdef
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfdef
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement