opzworks 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717f106caa4c53964b54329433f943fb01a2f489
-  data.tar.gz: 8ff92afd826f24410fb197b69325fb6b038c4d3d
+  metadata.gz: f740b238f93e2c1ddfec5ef71c0686656569b4d6
+  data.tar.gz: dc99860d8e4cd003523845d78a7c3552c6c6fd84
 SHA512:
-  metadata.gz: 7957769cf6b467357c0f0e6a9f64491ae88110eb84fa57f20e3693c8e412ca0214a483ea1b42bc3c55f051e59362eb41362a2fe1858f91c2f3e35ad23548e6d6
-  data.tar.gz: 3d5757e3ccbfc99b45b024673c7c809c29d36c4bdec5ae27cbc66c375b40041d27ac9738cc67b58c5feaaa68ebbfbc9866f1f5c9de761713ae6cfefb95469697
+  metadata.gz: 1a2f20a5c0938a6c0289cdd919fba88e040f4bcc9a9c81faa79911ca8e5b2f0029ce0a86bec0255f6c7f8813b2a83b1c77d4c14eb2ba4f6d3ddb93bc7cdbe0dc
+  data.tar.gz: 8f6bd7aef86c74bb4d03367dee0ccf61db4b1cbc230ee310cf9d9faffd1843e2932488e271487be54dff8fe4443589f4d7f2962ff99b4d8cc797cd7511c41071

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 changelog
 =========
 
+0.12.0
+------
+* update aws-sdk dependency to 2.2.37
+* create backups of cookbook tarball before uploading new
+
 0.11.1
 ------
 * bump aws-sdk dependency

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    opzworks (0.11.0)
-      aws-sdk (~> 2.2.26)
+    opzworks (0.11.1)
+      aws-sdk (~> 2.2.37)
       diffy (~> 3.1.0)
       faraday (~> 0.9.2)
       inifile (~> 3.0.0)
@@ -16,12 +16,12 @@ GEM
   specs:
     ast (2.2.0)
     awesome_print (1.6.1)
-    aws-sdk (2.2.26)
-      aws-sdk-resources (= 2.2.26)
-    aws-sdk-core (2.2.26)
+    aws-sdk (2.2.37)
+      aws-sdk-resources (= 2.2.37)
+    aws-sdk-core (2.2.37)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.26)
-      aws-sdk-core (= 2.2.26)
+    aws-sdk-resources (2.2.37)
+      aws-sdk-core (= 2.2.37)
     diffy (3.1.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)

data/lib/opzworks/commands/berks.rb

@@ -37,6 +37,7 @@ module OpzWorks
 
         aws_credentials_provider = Aws::SharedCredentials.new(profile_name: config.aws_profile)
         s3 = Aws::S3::Resource.new(region: config.aws_region, credentials: aws_credentials_provider)
+        s3_client = Aws::S3::Client.new(region: config.aws_region, credentials: aws_credentials_provider)
 
         opsworks = Aws::OpsWorks::Client.new(region: config.aws_region, profile: config.aws_profile)
         response = opsworks.describe_stacks
@@ -64,6 +65,7 @@ module OpzWorks
           next if var == false
           next if options[:clone] == true
 
+          time             = Time.new.utc.strftime("%FT%TZ")
           berks_cook_path  = config.berks_base_path || '/tmp'
           cook_path        = "#{berks_cook_path}/#{@project}-#{@branch}"
           cookbook_tarball = config.berks_tarball_name || 'cookbooks.tgz'
@@ -110,14 +112,37 @@ module OpzWorks
           puts "\nCommitting changes and pushing".foreground(:blue)
           system "cd #{@target_path} && git commit -am 'berks update'; git push origin #{@branch}"
 
-          # upload
+          # backup previous if it exists
           #
-          puts "\nUploading to S3".foreground(:blue)
+          begin
+            s3_client.head_object(
+              bucket: s3_bucket,
+              key: "#{@s3_path}/#{cookbook_tarball}"
+            )
+          rescue Aws::S3::Errors::ServiceError => e
+            puts "No existing #{cookbook_tarball} in #{s3_bucket} to backup, continuing...".foreground(:yellow)
+          else
+            puts "Backing up #{cookbook_tarball} to #{@s3_path}/#{cookbook_tarball}-#{time}".foreground(:green)
+            begin
+              s3_client.copy_object(
+                key: "#{@s3_path}/#{cookbook_tarball}-#{time}",
+                bucket: s3_bucket,
+                copy_source: "#{s3_bucket}/#{@s3_path}/#{cookbook_tarball}"
+              )
+            rescue Aws::S3::Errors::ServiceError => e
+              puts "Caught exception trying to backup existing #{cookbook_tarball} in #{s3_bucket}:".foreground(:red)
+              puts "\t#{e}"
+              abort
+            end
+          end
 
+          # upload
           begin
+            puts "\nUploading to S3".foreground(:blue)
+
             obj = s3.bucket(s3_bucket).object("#{@s3_path}/#{cookbook_tarball}")
             obj.upload_file(cookbook_upload)
-          rescue StandardError => e
+          rescue Aws::S3::Errors::ServiceError => e
             puts "Caught exception while uploading to S3 bucket #{s3_bucket}:".foreground(:red)
             puts "\t#{e}"
             puts "\nCleaning up before exiting".foreground(:blue)

data/lib/opzworks/meta.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module OpzWorks
-  VERSION     = '0.11.1'.freeze
+  VERSION     = '0.12.0'.freeze
   AUTHORS     = ['Grant Heffernan', 'Mapzen'].freeze
   EMAIL       = ['grant@mapzen.com'].freeze
   DESCRIPTION = 'OpzWorks Utilities'.freeze

data/opzworks.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 2.2.26'
+  spec.add_dependency 'aws-sdk', '~> 2.2.37'
   spec.add_dependency 'trollop', '~> 2.0'
   spec.add_dependency 'inifile', '~> 3.0.0'
   spec.add_dependency 'diffy',   '~> 3.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opzworks
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Grant Heffernan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.26
+        version: 2.2.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.26
+        version: 2.2.37
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement