simple_deploy 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+## v0.6.4:
+
+* Check for artifact encryption via attribute name_encrypted (where name is name of archive)
+* Appendes .gpg to URL for encrypted archives
+
 ## v0.6.3:
 
 * Instances return different message when no instances vs non existent stack

data/lib/simple_deploy/artifact.rb

@@ -3,13 +3,14 @@ module SimpleDeploy
 
     def initialize(args)
       @bucket_prefix = args[:bucket_prefix]
-      @id = args[:id]
-      @name = args[:name]
-      @region = args[:region]
-      @domain = args[:domain]
+      @id            = args[:id]
+      @name          = args[:name]
+      @region        = args[:region]
+      @domain        = args[:domain]
+      @encrypted     = args[:encrypted]
 
       @bucket = "#{@bucket_prefix}-#{@region}"
-      @key = "#{@id}.tar.gz"
+      @key = @encrypted ? "#{@id}.tar.gz.gpg" : "#{@id}.tar.gz"
     end
 
     def endpoints

data/lib/simple_deploy/stack/deployment.rb

@@ -75,12 +75,14 @@ module SimpleDeploy
           variable      = @config.artifact_deploy_variable artifact
           bucket_prefix = attributes["#{artifact}_bucket_prefix"]
           domain        = attributes["#{artifact}_domain"]
+          encrypted     = attributes["#{artifact}_encrypted"] == 'true'
 
           artifact = Artifact.new :name          => artifact,
                                   :id            => attributes[artifact],
                                   :region        => @region,
                                   :domain        => domain,
-                                  :bucket_prefix => bucket_prefix
+                                  :bucket_prefix => bucket_prefix,
+                                  :encrypted     => encrypted
 
           h[variable] = artifact.endpoints['s3']
         end

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -2,24 +2,26 @@ module SimpleDeploy
   class StackAttributeFormater
 
     def initialize(args)
-      @config = args[:config]
-      @environment = args[:environment]
+      @config          = args[:config]
+      @environment     = args[:environment]
       @main_attributes = args[:main_attributes]
-      @region = @config.region @environment
-      @logger = @config.logger
+      @region          = @config.region @environment
+      @logger          = @config.logger
     end
 
     def updated_attributes(attributes)
+      @provided_attributes = attributes
+
       updates = []
-      attributes.each do |attrhash|
+      @provided_attributes.each do |attrhash|
         key = attrhash.keys.first
         if artifact_names.include? key
-          url_hash = cloud_formation_url attrhash, attributes
+          url_hash = cloud_formation_url attrhash, @provided_attributes
           updates << url_hash
           @logger.info "Adding artifact attribute: #{url_hash}"
         end
       end
-      attributes + updates
+      @provided_attributes + updates
     end
 
     private
@@ -33,15 +35,28 @@ module SimpleDeploy
       id = selected_attribute[name]
 
       bucket_prefix, domain = find_bucket_prefix_and_domain selected_attribute, updated_attributes
+
       artifact = Artifact.new :name          => name,
                               :id            => id,
                               :region        => @region,
                               :config        => @config,
                               :domain        => domain,
+                              :encrypted     => artifact_encrypted?(name),
                               :bucket_prefix => bucket_prefix
 
       url_parameter = @config.artifact_cloud_formation_url name
-      { url_parameter => artifact.endpoints['s3'] }
+      url_value = artifact.endpoints['s3']
+
+      { url_parameter => url_value }
+    end
+
+    def artifact_encrypted?(name)
+      provided_attributes_encrypted = @provided_attributes.select do |attribute|
+        attribute["#{name}_encrypted"] == 'true'
+      end.any?
+      main_attributes_encrypted = @main_attributes["#{name}_encrypted"] == 'true'
+
+      provided_attributes_encrypted || main_attributes_encrypted
     end
 
     def find_bucket_prefix_and_domain(selected_attribute, updated_attributes)

data/lib/simple_deploy/stack.rb

@@ -124,8 +124,8 @@ module SimpleDeploy
     end
     
     def stack_attribute_formater
-      @saf ||= StackAttributeFormater.new :config      => @config,
-                                          :environment => @environment,
+      @saf ||= StackAttributeFormater.new :config          => @config,
+                                          :environment     => @environment,
                                           :main_attributes => attributes
     end
 

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/artifact_spec.rb

@@ -4,20 +4,40 @@ describe SimpleDeploy do
 
   describe "an artifact" do
 
-    before do
-      @artifact = SimpleDeploy::Artifact.new :bucket_prefix => 'test_prefix',
-                                             :domain        => 'us-west-1',
-                                             :id            => 'abc123',
-                                             :name          => 'myapp',
-                                             :region        => 'us-west-1'
-    end
+    context "when unencrypted" do
+      before do
+        @artifact = SimpleDeploy::Artifact.new :bucket_prefix => 'test_prefix',
+                                               :domain        => 'us-west-1',
+                                               :id            => 'abc123',
+                                               :name          => 'myapp',
+                                               :region        => 'us-west-1',
+                                               :encrypted     => false
+      end
 
-    it "should return the endpoints for the artifact" do
-      endpoints = { "s3"    => "s3://test_prefix-us-west-1/us-west-1/abc123.tar.gz", 
-                    "http"  => "http://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz",
-                    "https" => "https://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz" }
-      @artifact.endpoints.should == endpoints
+      it "should return the endpoints for the artifact" do
+        endpoints = { "s3"    => "s3://test_prefix-us-west-1/us-west-1/abc123.tar.gz", 
+                      "http"  => "http://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz",
+                      "https" => "https://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz" }
+        @artifact.endpoints.should == endpoints
+      end
     end
 
+    context "when encrypted" do
+      before do
+        @artifact = SimpleDeploy::Artifact.new :bucket_prefix => 'test_prefix',
+                                               :domain        => 'us-west-1',
+                                               :id            => 'abc123',
+                                               :name          => 'myapp',
+                                               :region        => 'us-west-1',
+                                               :encrypted     => true
+      end
+
+      it "should return the endpoints for the artifact" do
+        endpoints = { "s3"    => "s3://test_prefix-us-west-1/us-west-1/abc123.tar.gz.gpg", 
+                      "http"  => "http://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz.gpg",
+                      "https" => "https://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz.gpg" }
+        @artifact.endpoints.should == endpoints
+      end
+    end
   end
 end

data/spec/stack/deployment_spec.rb

@@ -86,51 +86,75 @@ describe SimpleDeploy do
     end
 
     describe "when succesful" do
-      before do
-        @execute_mock = mock "execute"
-        execute_options = { :name        => 'stack-name',
-                            :environment => 'test-us-west-1',
-                            :instances   => ['1.2.3.4', '4.3.2.1'],
-                            :ssh_user    => 'user',
-                            :ssh_key     => 'key',
-                            :config      => @config_mock,
-                            :stack       => @stack_mock }
-        SimpleDeploy::Stack::Execute.should_receive(:new).
-                                     with(execute_options).
-                                     and_return @execute_mock
-        @config_mock.should_receive(:artifact_deploy_variable).
-                     with("cookbooks").
-                     and_return('CHEF_REPO_URL')
-        @config_mock.should_receive(:artifact_deploy_variable).
-                     with("app").
-                     and_return('APP_URL')
-        @config_mock.should_receive(:artifact_deploy_variable).
-                     with("chef_repo").
-                     and_return('CHEF_REPO_URL')
-        @execute_mock.should_receive(:execute).
-                      with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz PRIMARY_HOST=10.1.2.3 /tmp/script"} )
+        before do
+          @execute_mock = mock "execute"
+          execute_options = { :name        => 'stack-name',
+                              :environment => 'test-us-west-1',
+                              :instances   => ['1.2.3.4', '4.3.2.1'],
+                              :ssh_user    => 'user',
+                              :ssh_key     => 'key',
+                              :config      => @config_mock,
+                              :stack       => @stack_mock }
+          SimpleDeploy::Stack::Execute.should_receive(:new).
+                                       with(execute_options).
+                                       and_return @execute_mock
+          @config_mock.should_receive(:artifact_deploy_variable).
+                       with("cookbooks").
+                       and_return('CHEF_REPO_URL')
+          @config_mock.should_receive(:artifact_deploy_variable).
+                       with("app").
+                       and_return('APP_URL')
+          @config_mock.should_receive(:artifact_deploy_variable).
+                       with("chef_repo").
+                       and_return('CHEF_REPO_URL')
+        end
+
+      context "when app encrypted" do
+        before do
+          @attributes['app_encrypted'] = 'true'
+          @execute_mock.should_receive(:execute).
+                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz.gpg PRIMARY_HOST=10.1.2.3 /tmp/script"} )
+        end
+
+        it "should deploy if the stack is clear to deploy" do
+          @status_mock.stub :clear_for_deployment? => true
+          @status_mock.should_receive(:set_deployment_in_progress)
+          @status_mock.should_receive(:unset_deployment_in_progress)
+          @deployment.execute(false).should be_true
+        end
+
+        it "should deploy if the stack is not clear to deploy but forced and clear in time" do
+          @status_mock.stub :clear_for_deployment? => false,
+                            :clear_deployment_lock => true,
+                            :clear_for_deployment? => true
+          @status_mock.should_receive(:set_deployment_in_progress)
+          @status_mock.should_receive(:unset_deployment_in_progress)
+          @deployment.execute(true).should be_true
+        end
       end
 
-      it "should deploy if the stack is clear to deploy" do
-        @status_mock.stub :clear_for_deployment? => true
-        @status_mock.should_receive(:set_deployment_in_progress)
-        @status_mock.should_receive(:unset_deployment_in_progress)
-        @deployment.execute(false).should be_true
-      end
-
-      it "should deploy if the stack is not clear to deploy but forced and clear in time" do
-        @status_mock.should_receive(:clear_for_deployment?).
-                     and_return(false)
-        @status_mock.should_receive(:clear_deployment_lock).
-                     with(true)
-        @status_mock.should_receive(:clear_for_deployment?).
-                     exactly(2).times.
-                     and_return(true)
-        @status_mock.should_receive(:set_deployment_in_progress)
-        @status_mock.should_receive(:unset_deployment_in_progress)
-        @deployment.execute(true).should be_true
+      context "when unencrypted" do
+        before do
+          @execute_mock.should_receive(:execute).
+                        with( {:sudo=>true, :command=>"env CHEF_REPO_URL=s3://cookbooks_bp-test-us-west-1/cookbooks_d/cookbooks.tar.gz APP_URL=s3://app_bp-test-us-west-1/app_d/app.tar.gz PRIMARY_HOST=10.1.2.3 /tmp/script"} )
+        end
+
+        it "should deploy if the stack is clear to deploy" do
+          @status_mock.stub :clear_for_deployment? => true
+          @status_mock.should_receive(:set_deployment_in_progress)
+          @status_mock.should_receive(:unset_deployment_in_progress)
+          @deployment.execute(false).should be_true
+        end
+
+        it "should deploy if the stack is not clear to deploy but forced and clear in time" do
+          @status_mock.stub :clear_for_deployment? => false,
+                            :clear_deployment_lock => true,
+                            :clear_for_deployment? => true
+          @status_mock.should_receive(:set_deployment_in_progress)
+          @status_mock.should_receive(:unset_deployment_in_progress)
+          @deployment.execute(true).should be_true
+        end
       end
-
     end
 
     describe "when unsuccesful" do

data/spec/stack/stack_attribute_formater_spec.rb

@@ -4,20 +4,64 @@ describe SimpleDeploy do
   before do
     @logger_mock = mock 'logger mock', :info => 'true'
     @config_mock = mock 'config mock', :logger => @logger_mock, :region => 'us-west-1'
-    @config_mock.stub(:artifact_cloud_formation_url).and_return('CookBooksURL')
+    @config_mock.stub(:artifact_cloud_formation_url).and_return('ChefRepoURL')
     @config_mock.stub(:artifacts).and_return(['chef_repo', 'cookbooks', 'app'])
+  end
+
+  context "when chef_repo unencrypted" do
+    before do
+      options = { :config      => @config_mock,
+                  :environment => 'preprod',
+                  :main_attributes => {
+                    'chef_repo_bucket_prefix' => 'test-prefix',
+                    'chef_repo_domain'        => 'test-domain' }
+                }
+      @formater = SimpleDeploy::StackAttributeFormater.new options
+    end
+
+    it 'should return updated attributes including the un encrypted cloud formation url' do
+      updates = @formater.updated_attributes([ { 'chef_repo' => 'test123' } ])
+      updates.should == [{ 'chef_repo' => 'test123' }, 
+                         { 'ChefRepoURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz' }]
+    end
+  end
+
+  context "when main_attributes set chef_repo encrypted" do
+    before do
+      options = { :config      => @config_mock,
+                  :environment => 'preprod',
+                  :main_attributes => {
+                    'chef_repo_bucket_prefix' => 'test-prefix',
+                    'chef_repo_encrypted'     => 'true',
+                    'chef_repo_domain'        => 'test-domain' }
+                }
+      @formater = SimpleDeploy::StackAttributeFormater.new options
+    end
 
-    options = { :config      => @config_mock,
-                :environment => 'preprod',
-                :main_attributes => {
-                  'chef_repo_bucket_prefix' => 'test-prefix',
-                  'chef_repo_domain' => 'test-domain' }
-              }
-    @formater = SimpleDeploy::StackAttributeFormater.new options
+    it 'should return updated attributes including the encrypted cloud formation url ' do
+      updates = @formater.updated_attributes([ { 'chef_repo' => 'test123' } ])
+      updates.should == [{ 'chef_repo' => 'test123' }, 
+                         { 'ChefRepoURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz.gpg' }]
+    end
   end
 
-  it 'should return updated attributes including the cloud formation url' do
-    updates = @formater.updated_attributes([ { 'chef_repo' => 'test123' } ])
-    updates.should == [{ 'chef_repo' => 'test123' }, { 'CookBooksURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz' }]
+  context "when provided attributes set chef_repo encrypted" do
+    before do
+      options = { :config      => @config_mock,
+                  :environment => 'preprod',
+                  :main_attributes => {
+                    'chef_repo_bucket_prefix' => 'test-prefix',
+                    'chef_repo_domain'        => 'test-domain' }
+                }
+      @formater = SimpleDeploy::StackAttributeFormater.new options
+    end
+
+    it 'should return updated attributes including the encrypted cloud formation url ' do
+      updates = @formater.updated_attributes([ { 'chef_repo' => 'test123' }, 
+                                               { 'chef_repo_encrypted' => 'true' } ])
+      updates.should == [{ 'chef_repo' => 'test123' },
+                         { 'chef_repo_encrypted' => 'true' },
+                         { 'ChefRepoURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz.gpg' }]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70276931560440 !ruby/object:Gem::Requirement
+  requirement: &70290261403920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276931560440
+  version_requirements: *70290261403920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276931559900 !ruby/object:Gem::Requirement
+  requirement: &70290261403200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70276931559900
+  version_requirements: *70290261403200
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70276931559100 !ruby/object:Gem::Requirement
+  requirement: &70290261402600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: *70276931559100
+  version_requirements: *70290261402600
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70276931558560 !ruby/object:Gem::Requirement
+  requirement: &70290261402060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70276931558560
+  version_requirements: *70290261402060
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70276931558020 !ruby/object:Gem::Requirement
+  requirement: &70290261506180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70276931558020
+  version_requirements: *70290261506180
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70276931557360 !ruby/object:Gem::Requirement
+  requirement: &70290261505540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,7 +76,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70276931557360
+  version_requirements: *70290261505540
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1556323809252766114
+      hash: 826964826445741436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1556323809252766114
+      hash: 826964826445741436
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16