dpl 1.8.18.travis.1472.4 → 1.8.21

data/lib/dpl/provider/ops_works.rb

@@ -3,15 +3,18 @@ require 'timeout'
 module DPL
   class Provider
     class OpsWorks < Provider
-      requires 'aws-sdk-v1'
+      requires 'aws-sdk', version: '~> 2'
       experimental 'AWS OpsWorks'
 
-      def api
-        @api ||= AWS::OpsWorks.new
+      def opsworks
+        @opsworks ||= Aws::OpsWorks::Client.new(opsworks_options)
       end
 
-      def client
-        @client ||= api.client
+      def opsworks_options
+        {
+          region:      region || 'us-east-1',
+          credentials: ::Aws::Credentials.new(access_key_id, secret_access_key)
+        }
       end
 
       def needs_key?
@@ -22,6 +25,10 @@ module DPL
 
       end
 
+      def region
+        options[:region] || context.env['AWS_DEFAULT_REGION']
+      end
+
       def access_key_id
         options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
       end
@@ -30,13 +37,8 @@ module DPL
         options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
       end
 
-      def setup_auth
-        AWS.config(access_key_id: access_key_id, secret_access_key: secret_access_key)
-      end
-
       def check_auth
-        setup_auth
-        log "Logging in with Access Key: #{option(:access_key_id)[-4..-1].rjust(20, '*')}"
+        log "Logging in with Access Key: #{access_key_id[-4..-1].rjust(20, '*')}"
       end
 
       def custom_json
@@ -61,7 +63,7 @@ module DPL
       end
 
       def fetch_ops_works_app
-        data = client.describe_apps(app_ids: [option(:app_id)])
+        data = opsworks.describe_apps(app_ids: [option(:app_id)])
         unless data[:apps] && data[:apps].count == 1
           raise Error, "App #{option(:app_id)} not found.", error.backtrace
         end
@@ -87,7 +89,11 @@ module DPL
         if !options[:instance_ids].nil?
           deployment_config[:instance_ids] = Array(option(:instance_ids))
         end
-        data = client.create_deployment(deployment_config)
+        if !options[:layer_ids].nil?
+          deployment_config[:layer_ids] = Array(option(:layer_ids))
+        end
+        log "creating deployment #{deployment_config.to_json}"
+        data = opsworks.create_deployment(deployment_config)
         log "Deployment created: #{data[:deployment_id]}"
         return unless options[:wait_until_deployed]
         print "Deploying "
@@ -103,7 +109,7 @@ module DPL
       def wait_until_deployed(deployment_id)
         deployment = nil
         loop do
-          result = client.describe_deployments(deployment_ids: [deployment_id])
+          result = opsworks.describe_deployments(deployment_ids: [deployment_id])
           deployment = result[:deployments].first
           break unless deployment[:status] == "running"
           print "."
@@ -118,10 +124,8 @@ module DPL
 
       def deploy
         super
-      rescue AWS::Errors::ClientError => error
-        raise Error, "Stopping Deploy, OpsWorks error: #{error.message}", error.backtrace
-      rescue AWS::Errors::ServerError => error
-        raise Error, "Stopping Deploy, OpsWorks server error: #{error.message}", error.backtrace
+      rescue Aws::Errors::ServiceError => error
+        raise Error, "Stopping Deploy, OpsWorks service error: #{error.message}", error.backtrace
       end
     end
   end

data/lib/dpl/provider/packagecloud.rb

@@ -1,6 +1,7 @@
 module DPL
   class Provider
     class Packagecloud < Provider
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'packagecloud-ruby', :version => "0.2.17", :load => 'packagecloud'
 
       def check_auth

data/lib/dpl/provider/puppet_forge.rb

@@ -3,6 +3,7 @@ module DPL
     class PuppetForge < Provider
       require 'pathname'
 
+      requires 'json_pure', :version => '< 2.0', :load => 'json/pure'
       requires 'puppet', :load => 'puppet/face'
       requires 'puppet-blacksmith', :load => 'puppet_blacksmith'
 

data/lib/dpl/provider/s3.rb

@@ -50,9 +50,11 @@ module DPL
             opts[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
             opts[:acl]           = options[:acl].gsub(/_/, '-') if options[:acl]
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
+            opts[:storage_class] = options[:storage_class] if options[:storage_class]
             unless File.directory?(filename)
               log "uploading #{filename.inspect} with #{opts.inspect}"
-              api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
+              result = api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
+              warn "error while uploading #{filename.inspect}" unless result
             end
           end
         end

data/lib/dpl/provider.rb

@@ -1,7 +1,6 @@
 require 'dpl/error'
 require 'dpl/version'
 require 'fileutils'
-require 'json/pure'
 
 module DPL
   class Provider
@@ -14,6 +13,7 @@ module DPL
     autoload :Bintray,          'dpl/provider/bintray'
     autoload :BitBalloon,       'dpl/provider/bitballoon'
     autoload :Boxfuse,          'dpl/provider/boxfuse'
+    autoload :Catalyze,         'dpl/provider/catalyze'
     autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
     autoload :Cloud66,          'dpl/provider/cloud66'
     autoload :CloudFiles,       'dpl/provider/cloud_files'

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.8.17'
+  VERSION = '1.8.21'
 end

data/spec/provider/azure_webapps_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+require 'dpl/provider/anynines'
+
+
+describe DPL::Provider::AzureWebApps do
+  subject :provider do
+    described_class.new(DummyContext.new,
+                        :username => 'myUsername',
+                        :password => 'myPassword',
+                        :site => 'myWebsite',
+                        :slot => 'mySlot')
+  end
+
+  subject :provider_without_slot do
+    described_class.new(DummyContext.new,
+                        :username => 'myUsername',
+                        :password => 'myPassword',
+                        :site => 'myWebsite')
+  end
+
+
+  describe "#git_target" do
+    example "With slot" do
+      expect(provider.git_target).to eq('https://myUsername:myPassword@mySlot.scm.azurewebsites.net:443/myWebsite.git')
+    end
+
+    example "Without slot" do
+      expect(provider_without_slot.git_target).to eq('https://myUsername:myPassword@myWebsite.scm.azurewebsites.net:443/myWebsite.git')
+    end
+  end
+
+  describe "#needs_key?" do
+    example do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe "#check_auth" do
+    example "Without credentials" do
+      provider.options.update(:username => nil)
+      provider.options.update(:password => nil)
+      provider.options.update(:site => nil)
+      expect{provider.check_auth}.to raise_error(DPL::Error, 'missing Azure Git Deployment username')
+    end
+
+    example "Without username" do
+      provider.options.update(:username => nil)
+      expect{provider.check_auth}.to raise_error(DPL::Error, 'missing Azure Git Deployment username')
+    end
+
+    example "Without password" do
+      provider.options.update(:password => nil)
+      expect{provider.check_auth}.to raise_error(DPL::Error, 'missing Azure Git Deployment password')
+    end
+
+    example "Without WebApp name" do
+      provider.options.update(:site => nil)
+      expect{provider.check_auth}.to raise_error(DPL::Error, 'missing Azure Web App name')
+    end
+  end
+
+  describe "push_app" do
+    example "skip cleanup" do
+      provider.options.update(:skip_cleanup => true)
+      provider.options.update(:verbose => false)
+      expect(provider.context).to receive(:shell).with('git checkout HEAD')
+      expect(provider.context).to receive(:shell).with('git add . --all --force')
+      expect(provider.context).to receive(:shell).with('git commit -m "Skip Cleanup Commit"')
+      expect(provider.context).to receive(:shell).with('git push --force --quiet https://myUsername:myPassword@mySlot.scm.azurewebsites.net:443/myWebsite.git HEAD:refs/heads/master > /dev/null 2>&1')
+      provider.push_app
+    end
+
+    example "Dont skip cleanup" do
+      provider.options.update(:skip_cleanup => false)
+      provider.options.update(:verbose => false)
+      expect(provider.context).to receive(:shell).with('git push --force --quiet https://myUsername:myPassword@mySlot.scm.azurewebsites.net:443/myWebsite.git HEAD:refs/heads/master > /dev/null 2>&1')
+      provider.push_app
+    end
+
+    example "Verbose" do
+      provider.options.update(:skip_cleanup => false)
+      provider.options.update(:verbose => true)
+      expect(provider.context).to receive(:shell).with('git push --force --quiet https://myUsername:myPassword@mySlot.scm.azurewebsites.net:443/myWebsite.git HEAD:refs/heads/master')
+      provider.push_app
+    end
+
+    example "Not verbose" do
+      provider.options.update(:skip_cleanup => false)
+      provider.options.update(:verbose => false)
+      expect(provider.context).to receive(:shell).with('git push --force --quiet https://myUsername:myPassword@mySlot.scm.azurewebsites.net:443/myWebsite.git HEAD:refs/heads/master > /dev/null 2>&1')
+      provider.push_app
+    end 
+  end
+
+end

data/spec/provider/catalyze_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'dpl/provider/catalyze'
+
+describe DPL::Provider::Catalyze do
+  subject :provider do
+    described_class.new(DummyContext.new, :target => 'test-target', :path => 'test-path')
+  end
+
+  describe "#check_auth" do
+    it 'should require a target' do
+      provider.options.update(:target => nil)
+      expect{ provider.check_auth }.to raise_error("Missing Catalyze target")
+    end
+  end
+
+  describe "#push_app" do
+    it 'should push the current branch to the target' do
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+    it 'should add and commit local build files if skip_cleanup is true' do
+      provider.options.update(:skip_cleanup => true)
+      expect(provider.context).to receive(:shell).with("git checkout HEAD")
+      expect(provider.context).to receive(:shell).with("git add test-path --all --force")
+      expect(provider.context).to receive(:shell).with("git commit -m \"Local build\" --quiet")
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+    it 'should use a path of "." if the path is not specified' do
+      provider.options.update(:path => nil)
+      provider.options.update(:skip_cleanup => true)
+      expect(provider.context).to receive(:shell).with("git checkout HEAD")
+      expect(provider.context).to receive(:shell).with("git add . --all --force")
+      expect(provider.context).to receive(:shell).with("git commit -m \"Local build\" --quiet")
+      expect(provider.context).to receive(:shell).with("git push --force test-target HEAD:master")
+      provider.push_app
+    end
+  end
+end

data/spec/provider/cloudfoundry_spec.rb

@@ -15,7 +15,7 @@ describe DPL::Provider::CloudFoundry do
     example do
       expect(provider.context).to receive(:shell).with('wget \'https://cli.run.pivotal.io/stable?release=linux64-binary&source=github\' -qO cf-linux-amd64.tgz && tar -zxvf cf-linux-amd64.tgz && rm cf-linux-amd64.tgz')
       expect(provider.context).to receive(:shell).with('./cf api api.run.awesome.io --skip-ssl-validation')
-      expect(provider.context).to receive(:shell).with('./cf login --u mallomar --p myreallyawesomepassword --o myorg --s outer')
+      expect(provider.context).to receive(:shell).with('./cf login -u mallomar -p myreallyawesomepassword -o myorg -s outer')
       provider.check_auth
     end
   end

data/spec/provider/deis_spec.rb

@@ -98,7 +98,7 @@ describe DPL::Provider::Deis do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        "git push  deis HEAD:refs/heads/master -f 2>&1 | tr -dc '[:alnum:][:space:][:punct:]' | sed -E 's/remote: (\\[1G)+//' | sed 's/\\[K$//'"
+        "bash -c 'git push  deis HEAD:refs/heads/master -f 2>&1 | tr -dc \"[:alnum:][:space:][:punct:]\" | sed -E \"s/remote: (\\[1G)+//\" | sed \"s/\\[K$//\"; exit ${PIPESTATUS[0]}'"
       ).and_return(true)
       provider.push_app
     end

data/spec/provider/exoscale_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+require 'dpl/provider/exoscale'
+
+describe DPL::Provider::ExoScale do
+  subject :provider do
+    described_class.new(DummyContext.new, :deployment => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+  end
+
+  its(:app_name) { should == 'foo_app' }
+  its(:dep_name) { should == 'default' }
+
+  its(:needs_key?) { should be true }
+
+  describe 'constructor' do
+    it 'with wrong arguments' do
+      expect {
+        described_class.new(DummyContext.new, :foo_dep => 'foo_app/default', :email => 'foo@test.com', :password => 'password')
+      }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#check_auth should call #headers_with_token' do
+    expect(provider).to receive(:headers_with_token)
+    provider.check_auth
+  end
+
+  describe '#check_app' do
+    it 'on deployment found' do
+      expect(provider).to receive(:api_call).and_return double(
+        :code => '200',
+        :body => '{"branch":"foo_repo.git"}'
+      )
+      expect(provider.instance_variable_get(:@repository)).to be_nil
+      provider.check_app
+      expect(provider.instance_variable_get(:@repository)).to eq('foo_repo.git')
+    end
+
+    it 'on deployment not found' do
+      expect(provider).to receive(:api_call).and_return double(:code => '410')
+      expect { provider.check_app }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#setup_key' do
+    before do
+      expect(File).to receive(:read).with('file').and_return('foo_key')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(
+          :code => '200',
+          :body => '{ "key": "foo_key", "key_id": "foo_key_id"}'
+        )
+
+      expect(provider.instance_variable_get(:@ssh_key_id)).to be_nil
+      provider.setup_key 'file'
+      expect(provider.instance_variable_get(:@ssh_key_id)).to eq('foo_key_id')
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('POST', '/user/foo_user/key', '{"key":"foo_key"}').and_return double(:code => '401')
+
+      expect { provider.setup_key 'file' }.to raise_error(DPL::Error)
+    end
+  end
+
+  describe '#remove_key' do
+    before do
+      provider.instance_variable_set(:@ssh_key_id, 'foo_key_id')
+      expect(provider).to receive(:user).and_return({ 'username' => 'foo_user' })
+    end
+
+    it 'on api success' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '204')
+      provider.remove_key
+    end
+
+    it 'on api failure' do
+      expect(provider).to receive(:api_call).with('DELETE', '/user/foo_user/key/foo_key_id').and_return double(:code => '410')
+      expect { provider.remove_key }.to raise_error(DPL::Error)
+    end
+  end
+
+  it '#push_app shuld deploy the app' do
+    provider.instance_variable_set(:@repository, 'foo_repo.git')
+    context = double(:shell)
+    expect(context).to receive(:shell).with("git push foo_repo.git HEAD:master -f")
+    expect(provider).to receive(:context).and_return context
+    expect(provider).to receive(:deploy_app)
+
+    provider.push_app
+  end
+
+  describe 'private method' do
+    describe '#get_token' do
+      it 'on api success' do
+        request = double()
+        expect(request).to receive(:basic_auth).with('foo@test.com', 'password')
+        expect(Net::HTTP::Post).to receive(:new).with('/api/apps/token').and_return request
+
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(
+          :code => '200',
+          :body => '{ "token": "foo_token"}'
+        )
+
+        expect(provider.instance_eval { get_token }).to eq({ 'token' => 'foo_token' })
+      end
+
+      it 'on api failure' do
+        expect(provider.instance_variable_get(:@tokenHttp)).to receive(:request).and_return double(:code => '401')
+
+        expect do
+          provider.instance_eval { get_token }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    it '#headers_with_token should return headers' do
+      expect(provider).to receive(:get_token).and_return({ 'token' => 'foo_token' })
+      expected_return = {
+        'Authorization' => 'cc_auth_token="foo_token"',
+        'Content-Type' => 'application/json'
+      }
+
+      expect(provider.instance_eval { headers_with_token }).to eq(expected_return)
+    end
+
+    describe '#get_headers' do
+      let(:expected_args) { [ 'GET', '/user/', nil, {'foo' => 'headers'} ] }
+
+      before do
+        expect(provider).to receive(:headers_with_token).and_return({ 'foo' => 'headers' })
+      end
+
+      it 'on token valid' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '200')
+        expect(provider.instance_eval { get_headers }).to eq({ 'foo' => 'headers' })
+      end
+
+      it 'on token expired' do
+        expect(provider).to receive(:api_call).with(*expected_args).and_return double(:code => '401')
+        expect(provider).to receive(:headers_with_token).with({ :new_token => true})
+
+        provider.instance_eval { get_headers }
+      end
+    end
+
+    it '#api_call should send request' do
+      expected_args = [ "foo_method", "foo_path", "\"foo\":\"data\"", {"foo"=>"headers"} ]
+      expect(provider.instance_variable_get(:@http)).to receive(:send_request).with(*expected_args)
+
+      provider.instance_eval do
+        api_call('foo_method', 'foo_path', '"foo":"data"', { 'foo' => 'headers'})
+      end
+    end
+
+    describe '#deploy_app' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '200')
+        provider.instance_eval { deploy_app }
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('PUT', '/app/foo_app/deployment/default', '{"version":-1}').and_return double(:code => '410')
+        expect do
+          provider.instance_eval { deploy_app }
+        end.to raise_error(DPL::Error)
+      end
+    end
+
+    describe '#user' do
+      it 'on api success' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(
+          :code => '200',
+          :body => '["foo_user"]'
+        )
+
+        expect(provider.instance_eval { user }).to eq('foo_user')
+      end
+
+      it 'on api failure' do
+        expect(provider).to receive(:api_call).with('GET', '/user/').and_return double(:code => '410')
+
+        expect do
+          provider.instance_eval { user }
+        end.to raise_error(DPL::Error)
+      end
+    end
+  end
+end

data/spec/provider/firebase_spec.rb

@@ -22,7 +22,7 @@ describe DPL::Provider::Firebase do
   describe "#push_app" do
     it 'should include the project specified' do
       provider.options.update(:project => 'myapp-dev')
-      expect(provider.context).to receive(:shell).with("firebase deploy --non-interactive -f myapp-dev --token 'abc123'")
+      expect(provider.context).to receive(:shell).with("firebase deploy --non-interactive --project myapp-dev --token 'abc123'")
       provider.push_app
     end