dpl 1.8.18.travis.1561.3 → 1.8.18.travis.1563.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWEyNjJiZDRlODA5NjJiMGQwNTliMjdiOWJlNmUzMWU5MjIxNGY5Zg==
+    YTk5ZDRiZTFmNjUwYWMwNWY0MThjYTg2MzQwOWQ0Nzc4ZmU5ODVhZA==
   data.tar.gz: !binary |-
-    YzkzMzZhZDgzM2Y1MWQ5ZTY2ZGYzMjkyODhhZTE2Y2VjMDFhMTZkOQ==
+    YjczYmFmNmU0ZTI3MmJkNDJkNjA3Y2MzNzg2YTcyMmVjYzRkYTQ2OA==
 SHA512:
   metadata.gz: !binary |-
-    YjhhNmY4NmU2NThjYjYwYTRmMThmMDBiYzQwM2I4ZWE4ZTVkZDg1MzQ3NmQ5
-    M2E5ZmEyNTRjODMxNGI4NDU4Y2RlZmYzYjQ0N2YzYWQzMmMyZGQzMzEyM2Ix
-    ZTllNTI3MzIyNzFmM2U5ZDU3ODRiMWVmN2U4OWZiZDQzYTNiY2Q=
+    ZjUxY2UzMDM2Mjg4NWY2MDIzNTFiNWZkZjNkYTZkM2I4NTQzMWU5MDY4NDdk
+    ZjcwZDZjOTYzN2NhODlhY2E3YTQ1OTc5ODRhZjUwOTc5YTQ4NTg0OGNlMGUx
+    Mjg2MjQyMjA3NzE2ZDlhZmI0NWFiOGVjOTNiZDg2MTE3ZWQyOTU=
   data.tar.gz: !binary |-
-    YWY2Yzc1YzhmMzU5ZjlhNzQ5MzAwOTVjZmE0MGY5Y2MwMmE5MGE2YzI0NDgw
-    YjhjMmFhZWRjODM0MzY0OTI5ZmEyZGRjNzY1MmEwMTRhYmUzMTQ3Yzk1YWFl
-    YTc1ZWQ5MmZiOWQ1NTQyYWZlM2RkNGE2ODgzNmRlMzU3ZDA1NWE=
+    NDljYzc4N2QyMDdmNGNmOGI2Y2U3OGVkNTMzODg4MjI3MTljYmNlMTYzMTcy
+    M2EwZmNlYmIyNDM0MmU4OGYxY2MyMTFlM2I4MjVlZGU2YTM4NGFjOTMzZGM1
+    ZWZmNTMwMjc5NTE3N2Q5OWNiYWJjNGU2N2I2MGFiZjQ4Y2YzNzQ=

data/README.md

@@ -24,6 +24,7 @@ Dpl supports the following providers:
 * [Deis](#deis)
 * [Divshot.io](#divshotio)
 * [Engine Yard](#engine-yard)
+* [ExoScale](#exoscale)
 * [Firebase](#firebase)
 * [Github Releases](#github-releases)
 * [Google App Engine (experimental)](#google-app-engine)
@@ -631,7 +632,7 @@ For accounts using two factor authentication, you have to use an oauth token as
 #### Options:
 
  * **target**: Required. The git remote repository to deploy to.
- * **path**: Optional. If using the skip_cleanup option to deploy from current file state, you can optionally specify the pathspec for the files to deploy. If not specified then all files are deployed. 
+ * **path**: Optional. If using the skip_cleanup option to deploy from current file state, you can optionally specify the pathspec for the files to deploy. If not specified then all files are deployed.
 
 #### Examples:
 
@@ -642,17 +643,17 @@ For accounts using two factor authentication, you have to use an oauth token as
 
 #### Setup:
 
-1. Get the deployment target for Catalyze:  
-a. Make sure your catalyze environment is [associated](https://resources.catalyze.io/paas/paas-cli-reference/#associate).  
-b. Get the git remote by running ```git remote -v``` from within the associated repo.  
-2. Setup a deployment key to Catalyze for Travis CI:  
-a. Install the travis-ci cli.  
-b. Get the public SSH key for your travis project and save it to a file by running ```travis pubkey > travis.pub```  
-c. Add the key as a deploy key using the catalyze cli within the associated repo. For example:  ```catalyze deploy-keys add travisci ./travis.pub code-1```  
-3. Setup Catalyze as a known host for Travis CI:  
-a. List your known hosts by running ```cat ~/.ssh/known_hosts```  
-b. Find and copy the line from known_hosts that includes the git remote found in step #1. It'll look something like "[git.catalyzeapps.com]:2222 ecdsa-sha2-nistp256 BBBB12abZmKlLXNo..."  
-c. Update your `before_deploy` step in `.travis.yml` to update the `known_hosts` file:    
+1. Get the deployment target for Catalyze:
+a. Make sure your catalyze environment is [associated](https://resources.catalyze.io/paas/paas-cli-reference/#associate).
+b. Get the git remote by running ```git remote -v``` from within the associated repo.
+2. Setup a deployment key to Catalyze for Travis CI:
+a. Install the travis-ci cli.
+b. Get the public SSH key for your travis project and save it to a file by running ```travis pubkey > travis.pub```
+c. Add the key as a deploy key using the catalyze cli within the associated repo. For example:  ```catalyze deploy-keys add travisci ./travis.pub code-1```
+3. Setup Catalyze as a known host for Travis CI:
+a. List your known hosts by running ```cat ~/.ssh/known_hosts```
+b. Find and copy the line from known_hosts that includes the git remote found in step #1. It'll look something like "[git.catalyzeapps.com]:2222 ecdsa-sha2-nistp256 BBBB12abZmKlLXNo..."
+c. Update your `before_deploy` step in `.travis.yml` to update the `known_hosts` file:
 ```
     before_deploy:  echo "[git.catalyzeapps.com]:2222 ecdsa-sha2-nistp256 BBBB12abZmKlLXNo..." >> ~/.ssh/known_hosts
 ```
@@ -776,6 +777,18 @@ and your testers can start testing your app.
 
     dpl --provider=codedeploy --access-key-id=<aws access key> --secret_access_key=<aws secret access key> --application=<application name> --deployment_group=<deployment group> --revision_type=<s3/github> --commit_id=<commit ID> --repository=<repo name> --region=<AWS availability zone> --wait-until-deployed=<true>
 
+### ExoScale:
+
+#### Options:
+
+* **email**: ExoScale email or Organization ID.
+* **password**: ExoScale password.
+* **deployment**: ExoScale Deployment. Follows the format "APP_NAME/DEP_NAME".
+
+#### Examples:
+
+    dpl --provider=exoscale --email=<email> --password<password> --deployment=`APP_NAME/DEP_NAME`
+
 ### Scalingo:
 
 #### Options:

data/lib/dpl/provider/exoscale.rb

@@ -0,0 +1,100 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+
+module DPL
+  class Provider
+    class ExoScale < Provider
+      attr_accessor :app_name
+      attr_accessor :dep_name
+
+      def initialize(context, options)
+        super
+        option(:email) && option(:password) && option(:deployment)
+        @app_name, @dep_name = options[:deployment].split('/')
+
+        @http = Net::HTTP.new('api.app.exo.io', 443)
+        @http.use_ssl = true
+
+        @tokenHttp = Net::HTTP.new('portal.exoscale.ch', 443)
+        @tokenHttp.use_ssl = true
+      end
+
+      def check_auth
+        headers_with_token
+      end
+
+      def check_app
+        response = api_call('GET', "/app/#{ app_name }/deployment/#{ dep_name }")
+        error('application check failed') if response.code != '200'
+        @repository = JSON.parse(response.body)["branch"]
+      end
+
+      def setup_key(file)
+        data = { 'key' => File.read(file).chomp }
+        response = api_call('POST', "/user/#{ user['username'] }/key", JSON.dump(data))
+        error('adding key failed') if response.code != '200'
+        key = JSON.parse response.body
+        @ssh_key_id = key['key_id']
+      end
+
+      def remove_key
+        response = api_call('DELETE', "/user/#{ user['username']}/key/#{ @ssh_key_id }")
+        error('key removal failed') if response.code != '204'
+      end
+
+      def push_app
+        branch = (dep_name == 'default') ? 'master' : dep_name
+        context.shell "git push #{ @repository } HEAD:#{ branch } -f"
+        deploy_app
+      end
+
+      private
+
+      def get_token
+        request = Net::HTTP::Post.new '/api/apps/token'
+        request.basic_auth options[:email], options[:password]
+        response = @tokenHttp.request(request)
+        error('authorization failed') if response.code != '200'
+        return JSON.parse response.body
+      end
+
+      def headers_with_token(options = {})
+        @token = get_token if options[:new_token] || @token.nil?
+        return {
+          'Authorization' => %Q|cc_auth_token="#{ @token['token'] }"|,
+          'Content-Type' => 'application/json'
+        }
+      end
+
+      def get_headers
+        headers = headers_with_token
+        response = api_call('GET', '/user/', nil, headers)
+        return headers if response.code == '200'
+
+        return headers_with_token :new_token => true
+      end
+
+      def api_call(method, path, data = nil, headers = nil)
+        return @http.send_request(method, path, data, headers || get_headers)
+      end
+
+      def deploy_app
+        data = {'version' => -1}
+        response = api_call('PUT', "/app/#{ app_name }/deployment/#{ dep_name }", JSON.dump(data))
+        error('deployment failed - the deployment is already deploying') if response.code != '200'
+      end
+
+      def user
+        if @user.nil?
+          response = api_call('GET', '/user/')
+          error('can not find the user') if response.code != '200'
+          users = JSON.parse response.body
+          @user = users[0]
+        end
+        return @user
+      end
+
+    end
+  end
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.18.travis.1561.3
+  version: 1.8.18.travis.1563.3
 platform: ruby
 authors:
 - Konstantin Haase
@@ -138,6 +138,7 @@ files:
 - lib/dpl/provider/divshot.rb
 - lib/dpl/provider/elastic_beanstalk.rb
 - lib/dpl/provider/engine_yard.rb
+- lib/dpl/provider/exoscale.rb
 - lib/dpl/provider/firebase.rb
 - lib/dpl/provider/gae.rb
 - lib/dpl/provider/gcs.rb
@@ -186,6 +187,7 @@ files:
 - spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/elastic_beanstalk_spec.rb
+- spec/provider/exoscale_spec.rb
 - spec/provider/firebase_spec.rb
 - spec/provider/gae_spec.rb
 - spec/provider/gcs_spec.rb