bukelatta 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40b0ab6b5d26689801b483afa0d4c081c3b5f10
-  data.tar.gz: 5142c2e26e330691b9fb993df048cb3aac57b03d
+  metadata.gz: 86be96883447847f16acf96e0166721567a75681
+  data.tar.gz: 5c3a19f8a13b9fc0687d22bd1b18a24d7dd2640a
 SHA512:
-  metadata.gz: dc1214d98450bd85b67c84a787f4c39ae5741a5e264a3b30ae7e0085f551804fff9c6e2c8e373577e6b944a6a93a8deb9e163e464d9e18dcb3c5a18c0cd74bfe
-  data.tar.gz: 5c9fd3cbce80be309c4ab8656d17a061f5d445caae57e0dbf83f925546fe13607614460315857cb87c657046ae09e43dd2ce946e5f8c5c77f5dea7a76a4be65b
+  metadata.gz: c5eaba78d7726b8a57cffd8dc98af1b10f350ba1b57f2bdae025ae3a5be04d79ba6efeddd2a696a60394ee1cb1c63634c968ec733c8a75ce46d56adee565d8d4
+  data.tar.gz: a64338561ad9f7b39c1d4667d20e0da0dadaaeaa4f398b7f840247dc6cbcce63f0ae47d134c4833abc9de06077fd2e5346e3663fe24dcf1ffb5a00356cae0e2d

data/exe/bukelatta

@@ -20,7 +20,7 @@ def parse_options(argv)
     dry_run: false,
     color: true,
     request_concurrency: 8,
-    aws: {},
+    aws: { ssl_verify_peer: false },
   }
 
   opt = OptionParser.new
@@ -64,6 +64,7 @@ def parse_options(argv)
     options[:aws][:credentials] = credentials
   end
 
+  Aws.config.update(options[:aws])
   String.colorize = options[:color]
 
   if options[:debug]

data/lib/bukelatta/driver.rb

@@ -12,8 +12,11 @@ class Bukelatta::Driver
     log(:info, "Create Bucket `#{bucket_name}` Policy", color: :cyan)
 
     unless @options[:dry_run]
-      bucket = @resource.region_bucket(bucket_name)
-      bucket.policy.put(policy: JSON.dump(policy))
+      bucket = @resource.bucket(bucket_name)
+
+      bucket.auto_redirect do |b|
+        b.policy.put(policy: JSON.dump(policy))
+      end
     end
   end
 
@@ -21,8 +24,11 @@ class Bukelatta::Driver
     log(:info, "Delete Bucket `#{bucket_name}` Policy", color: :red)
 
     unless @options[:dry_run]
-      bucket = @resource.region_bucket(bucket_name)
-      bucket.policy.delete
+      bucket = @resource.bucket(bucket_name)
+
+      bucket.auto_redirect do |b|
+        b.policy.delete
+      end
     end
   end
 
@@ -31,8 +37,11 @@ class Bukelatta::Driver
     log(:info, diff(old_policy, policy, color: @options[:color]), color: false)
 
     unless @options[:dry_run]
-      bucket = @resource.region_bucket(bucket_name)
-      bucket.policy.put(policy: JSON.dump(policy))
+      bucket = @resource.bucket(bucket_name)
+
+      bucket.auto_redirect do |b|
+        b.policy.put(policy: JSON.dump(policy))
+      end
     end
   end
 end

data/lib/bukelatta/exporter.rb

@@ -1,4 +1,6 @@
 class Bukelatta::Exporter
+  include Bukelatta::Utils::Helper
+
   def self.export(client, options = {})
     self.new(client, options).export
   end
@@ -15,11 +17,12 @@ class Bukelatta::Exporter
 
   def export_buckets
     result = {}
+    buckets = @resource.buckets
     concurrency = @options[:request_concurrency]
 
-    buckets = @resource.buckets(concurrency: concurrency)
-
     Parallel.each(buckets, in_threads: concurrency) do |bucket|
+      next unless matched?(bucket.name)
+
       policy = export_bucket_policy(bucket)
       result[bucket.name] = policy
     end
@@ -28,7 +31,9 @@ class Bukelatta::Exporter
   end
 
   def export_bucket_policy(bucket)
-    policy = JSON.parse(bucket.policy.policy.string)
+    bucket.auto_redirect do |b|
+      JSON.parse(b.policy.policy.string)
+    end
   rescue Aws::S3::Errors::NoSuchBucketPolicy
     nil
   end

data/lib/bukelatta/ext/aws_s3_bucket_ext.rb

@@ -0,0 +1,25 @@
+module Bukelatta::Ext
+  module AwsS3BucketExt
+    DEFULT_CONCURRENCY = 8
+
+    def auto_redirect
+      ret = nil
+      bckt = self
+
+      begin
+        ret = yield(bckt)
+      rescue Aws::S3::Errors::PermanentRedirect => e
+        res_body = MultiXml.parse(e.context.http_response.body.read)
+        edpnt = res_body['Error']['Endpoint']
+        clnt = Aws::S3::Client.new(endpoint: "https://#{edpnt}")
+        rsrc = Aws::S3::Resource.new(client: clnt)
+        bckt = rsrc.bucket(bckt.name)
+        retry
+      end
+
+      ret
+    end
+  end
+end
+
+Aws::S3::Bucket.include(Bukelatta::Ext::AwsS3BucketExt)

data/lib/bukelatta/version.rb

@@ -1,3 +1,3 @@
 module Bukelatta
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/bukelatta.rb

@@ -10,7 +10,7 @@ require 'singleton'
 require 'term/ansicolor'
 
 require 'bukelatta/version'
-require 'bukelatta/ext/aws_s3_resource_ext'
+require 'bukelatta/ext/aws_s3_bucket_ext'
 require 'bukelatta/ext/hash_ext'
 require 'bukelatta/ext/string_ext'
 require 'bukelatta/logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bukelatta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -163,7 +163,7 @@ files:
 - lib/bukelatta/dsl/converter.rb
 - lib/bukelatta/dsl/template_helper.rb
 - lib/bukelatta/exporter.rb
-- lib/bukelatta/ext/aws_s3_resource_ext.rb
+- lib/bukelatta/ext/aws_s3_bucket_ext.rb
 - lib/bukelatta/ext/hash_ext.rb
 - lib/bukelatta/ext/string_ext.rb
 - lib/bukelatta/logger.rb

data/lib/bukelatta/ext/aws_s3_resource_ext.rb

@@ -1,36 +0,0 @@
-module Bukelatta::Ext
-  module AwsS3ResourceExt
-    DEFULT_CONCURRENCY = 8
-
-    def buckets(options = {})
-      concurrency = options[:concurrency] || DEFULT_CONCURRENCY
-
-      Parallel.map(super(), in_threads: concurrency) do |b|
-        region_bucket0(b)
-      end
-    end
-
-    def region_bucket(name)
-      b = self.bucket(name)
-      region_bucket0(b)
-    end
-
-    private
-
-    def region_bucket0(b)
-      begin
-        b.objects.limit(1).first
-        b
-      rescue Aws::S3::Errors::PermanentRedirect => e
-        responce_body = e.context.http_response.body.read
-        responce_body = MultiXml.parse(responce_body)
-        endpoint = responce_body['Error']['Endpoint']
-        client = Aws::S3::Client.new(endpoint: "https://#{endpoint}")
-        resource = Aws::S3::Resource.new(client: client)
-        resource.bucket(b.name)
-      end
-    end
-  end
-end
-
-Aws::S3::Resource.prepend(Bukelatta::Ext::AwsS3ResourceExt)