acmesmith-google-cloud-storage 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75b4b821a87ef27b6f518fd08dd893dfaeb37c6
-  data.tar.gz: 0df9612218e5379c3818a643355d89e3e4eb2fb4
+  metadata.gz: 1d8b3ee45e88b95d60bdd915a101a5117b283f2d
+  data.tar.gz: 1895c236bc86563184792b343329ef4b0351720e
 SHA512:
-  metadata.gz: 71a2f9904d29d58f0a61ae921b042139600700aeeae721a3b15b022f70ac48c31e6402d5820742c452576b30adb459dc4c7a4c283e34d4d73b83d60070bbd0e8
-  data.tar.gz: 7968535f05faeafef1df9160dac5a7769ceb835823bc2d428e56421b6830a53655d743068875ced81b03915be400de2dbe7b32ecce5bbe08e2714862c47bcfa0
+  metadata.gz: 5a58f61d4b008abbac7308d685d4a9540e4a4e35601b30d3c9a97894872c0f32af0ceb2bd078d58b39c160fdea3db54f3abdd50c63719fa8e0a67d38c9f06b68
+  data.tar.gz: 61be0ee2f6b92cf7377c812be2a9ef048eff118e13d577cd9e436496989a7f93e04e256534a01e516dab0c65c8b69c320e0ebcdc3faf361cbae0ce3072744504

data/lib/acmesmith-google-cloud-storage/version.rb

@@ -1,3 +1,3 @@
 module AcmesmithGoogleCloudStorage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/acmesmith/storages/google_cloud_storage.rb

@@ -11,7 +11,7 @@ module Acmesmith
     class GoogleCloudStorage < Base
       attr_reader :bucket, :prefix, :compute_engine_service_account, :private_key_json_file
 
-      def initialize(bucket:, prefix:, compute_engine_service_account:nil, private_key_json_file:nil)
+      def initialize(bucket:, prefix:nil, compute_engine_service_account:nil, private_key_json_file:nil)
         @bucket = bucket
         @prefix = prefix
         if @prefix && !@prefix.end_with?('/')
@@ -39,9 +39,8 @@ module Acmesmith
       end
 
       def get_account_key
-        obj = @api.get_object(bucket, account_key_key)
-        media = get_media(obj.media_link)
-        AccountKey.new media
+        @api.get_object(bucket, account_key_key)
+        AccountKey.new @api.get_object(bucket, account_key_key, download_dest: StringIO.new).string
       rescue Google::Apis::ClientError => e
         if e.status_code == 404
           raise NotExist.new("Account key doesn't exist")
@@ -97,9 +96,13 @@ module Acmesmith
       def get_certificate(common_name, version: 'current')
         version = certificate_current(common_name) if version == 'current'
 
-        certificate = get_media(@api.get_object(bucket, certificate_key(common_name, version)).media_link)
-        chain       = get_media(@api.get_object(bucket, chain_key(common_name, version)).media_link)
-        private_key = get_media(@api.get_object(bucket, private_key_key(common_name, version)).media_link)
+        get = ->(key) do
+          @api.get_object(bucket, key, download_dest: StringIO.new).string
+        end
+
+        certificate = get.call(certificate_key(common_name, version))
+        chain       = get.call(chain_key(common_name, version))
+        private_key = get.call(private_key_key(common_name, version))
         Certificate.new(certificate, chain, private_key)
       rescue Google::Apis::ClientError => e
         if e.status_code == 404
@@ -111,24 +114,34 @@ module Acmesmith
 
       def list_certificates
         certs_prefix = "#{prefix}certs/"
-        objects = @api.fetch_all do |token, s|
-          s.list_objects(bucket, prefix: certs_prefix, page_token: token)
+        certs_prefix_regexp = /\A#{Regexp.escape(certs_prefix)}/
+        list = []
+        page_token = nil
+        loop do
+          objects = @api.list_objects(bucket, prefix: certs_prefix, delimiter: '/', page_token: page_token)
+          if objects.prefixes
+            list.concat objects.prefixes.map{|_| _.sub(certs_prefix_regexp, '').sub(/\/.+\z/,'').sub(/\/\z/, '')}
+          end
+          break if objects.next_page_token.nil? || objects.next_page_token == page_token
+          page_token = objects.next_page_token
         end
-        objects.map{ |obj|
-          regexp = /\A#{Regexp.escape(certs_prefix)}/
-          obj.name.sub(regexp, '').sub(/\/.+\z/, '').sub(/\/\z/, '')
-        }.uniq
+        list.uniq
       end
 
       def list_certificate_versions(common_name)
         cert_ver_prefix = "#{prefix}certs/#{common_name}/"
-        objects = @api.fetch_all do |token, s|
-          s.list_objects(bucket, prefix: cert_ver_prefix, page_token: token)
+        cert_ver_prefix_regexp = /\A#{Regexp.escape(cert_ver_prefix)}/
+        list = []
+        page_token = nil
+        loop do
+          objects = @api.list_objects(bucket, prefix: cert_ver_prefix, delimiter: '/', page_token: page_token)
+          if objects.prefixes
+            list.concat objects.prefixes.map{|_| _.sub(cert_ver_prefix_regexp, '').sub(/\/.+\z/, '').sub(/\/\z/, '') }
+          end
+          break if objects.next_page_token.nil? || objects.next_page_token == page_token
+          page_token = objects.next_page_token
         end
-        objects.map { |obj|
-          regexp = /\A#{Regexp.escape(cert_ver_prefix)}/
-          obj.name.sub(regexp, '').sub(/\/.+\z/, '').sub(/\/\z/, '')
-        }.uniq.reject { |_| _ == 'current' }
+        list.uniq.reject{ |_| _ == 'current' }
       end
 
       def get_current_certificate_version(common_name)
@@ -150,8 +163,8 @@ module Acmesmith
       end
 
       def certificate_current(cn)
-        obj = @api.get_object(bucket, certificate_current_key(cn))
-        get_media(obj.media_link).chomp
+        @api.get_object(bucket, certificate_current_key(cn))
+        @api.get_object(bucket, certificate_current_key(cn), download_dest: StringIO.new).string.chomp
       rescue Google::Apis::ClientError => e
         if e.status_code == 404
           raise NotExist.new("Certificate for #{cn.inspect} of current version doesn't exist")
@@ -176,10 +189,6 @@ module Acmesmith
         "#{certificate_base_key(cn, ver)}/fullchain.pem"
       end
 
-      def get_media(media_link)
-        open(media_link, {'Authorization' => "Bearer #{@api.authorization.access_token}"}).read
-      end
-
       def load_json_key(filepath)
         obj = JSON.parse(File.read(filepath))
         {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acmesmith-google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - YAMADA Tsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acmesmith