heroku_pg_backups_archive 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30abe9a988560377d39f5c0094ba36add75b6837
-  data.tar.gz: 32424a2e516ea1118dc2e528b4bf5edaf0fc2f1d
+  metadata.gz: 48fbdd30064455891883b654824c26ae0237d56b
+  data.tar.gz: 91d4801f52820bbfa478985707c443fad89eb187
 SHA512:
-  metadata.gz: 2fae938567ccb30da88c7958cdd8f273a58f23008f8ca45c8fa8d8ab197763bf3823053a1fb245beee1739c74fcb4bcc24ea5970df854767d29ec1a35fa0d0cc
-  data.tar.gz: 55079476bf2bacebee703abc8927ed0dc9a1745d79c45582951bb6f955b36de106c0d74a27ff68054d60f87f97e2f6981ab11ef65a78ea4db82a1a7d9ca90869
+  metadata.gz: cf99909463923949105217050d3613e00f663b2ed574132008cdfc4730918a405d5626f6dbea6b23df1f08a9b62f5f9a058e207406c47d54626bd5597ea3bbef
+  data.tar.gz: 1a06b3223635ca0b898130078cbdd2bc16f5ef43079e3aeb1a8abde7d125f73a9f5e02471d581b552948f0f3a43c40d3845d8101800813d8fdfdee61b37a47be

data/README.md

@@ -33,6 +33,7 @@ HerokuPgBackupsArchive.configure do |config|
   config.heroku_toolbelt_path = "path/to/heroku/executable" # defaults to `vendor/heroku-toolbelt/bin/heroku` when not explicitly set
   config.aws_access_key_id = "aws-secret-key-id" # defaults to `ENV["AWS_ACCESS_KEY_ID"]` when not explicitly set
   config.aws_secret_access_key = "aws-secret-access-key" # defaults to `ENV["AWS_SECRET_ACCESS_KEY"]` when not explicitly set
+  config.aws_region = "some-region" # defaults to `us-east-1` when not explicitly set
   config.after_complete = lambda { puts "I'm all done!" } # defaults to no action
 end
 ```
@@ -45,6 +46,10 @@ rake heroku_pg_backups_archive
 
 To make the heroku toolbelt available on your dyno, you can use [heroku-buildpack-toolbelt](https://github.com/gregburek/heroku-buildpack-toolbelt).
 
+### `aws-sdk` Dependency
+
+If you have a dependency on version 1 of the `aws-sdk` gem you will need to update your gemfile to depend on `aws-sdk-v1`. This will allow your app to continue to function as normal, but allow this gem to use newer features in version 2 of the SDK.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/heroku_pg_backups_archive.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk-v1", "~> 1"
+  spec.add_dependency "aws-sdk", "~> 2"
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry", "~> 0"

data/lib/heroku_pg_backups_archive/backup_archive.rb

@@ -1,5 +1,5 @@
 require "open-uri"
-require "aws-sdk-v1"
+require "aws-sdk"
 require "base64"
 
 module HerokuPgBackupsArchive
@@ -14,21 +14,18 @@ module HerokuPgBackupsArchive
     end
 
     def perform
-      bucket.objects[archive_path].write(backup_data, write_options)
+      s3.put_object(write_parameters)
     end
 
     private
 
     attr_reader :backup
 
-    def bucket
-      @bucket ||= s3.buckets[HerokuPgBackupsArchive.config.bucket_name]
-    end
-
     def s3
-      @s3 ||= AWS::S3.new(
+      @s3 ||= Aws::S3::Client.new(
         access_key_id: HerokuPgBackupsArchive.config.aws_access_key_id,
-        secret_access_key: HerokuPgBackupsArchive.config.aws_secret_access_key
+        secret_access_key: HerokuPgBackupsArchive.config.aws_secret_access_key,
+        region: HerokuPgBackupsArchive.config.aws_region
       )
     end
 
@@ -40,12 +37,19 @@ module HerokuPgBackupsArchive
       open(backup.url)
     end
 
-    def write_options
+    def write_parameters
+      {
+        body: backup_data,
+        bucket: HerokuPgBackupsArchive.config.bucket_name,
+        key: archive_path
+      }.merge(sse_customer_options)
+    end
+
+    def sse_customer_options
       unless HerokuPgBackupsArchive.config.sse_customer_key.nil?
         {
           sse_customer_algorithm: :AES256,
-          sse_customer_key: Base64.encode64(HerokuPgBackupsArchive.config.sse_customer_key),
-          sse_customer_key_md5: Base64.encode64(OpenSSL::Digest::MD5.digest(HerokuPgBackupsArchive.config.sse_customer_key))
+          sse_customer_key: HerokuPgBackupsArchive.config.sse_customer_key
         }
       else
         {}

data/lib/heroku_pg_backups_archive/config.rb

@@ -1,11 +1,19 @@
 module HerokuPgBackupsArchive
   class Config
-    attr_accessor :heroku_toolbelt_path, :app_name, :sse_customer_key, :bucket_name, :aws_access_key_id, :aws_secret_access_key, :after_complete
+    attr_accessor :heroku_toolbelt_path,
+      :app_name,
+      :sse_customer_key,
+      :bucket_name,
+      :aws_access_key_id,
+      :aws_secret_access_key,
+      :aws_region,
+      :after_complete
 
     def initialize
       @heroku_toolbelt_path = "vendor/heroku-toolbelt/bin/heroku"
       @aws_access_key_id = ENV["AWS_ACCESS_KEY_ID"]
       @aws_secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
+      @aws_region = "us-east-1"
     end
   end
 end

data/lib/heroku_pg_backups_archive/version.rb

@@ -1,3 +1,3 @@
 module HerokuPgBackupsArchive
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: heroku_pg_backups_archive
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Hightower
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement