maitre_d 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb99cbebe7410953efb631a11a6622f14f0fc7aff295916021c6737f8f263b8
-  data.tar.gz: 208609d75dbaf42bf79313cba27b3e1755f0823e60629ee7a1f68334c631907e
+  metadata.gz: 764dc0a04e766ea678f0bde9321fd3328dd98a138094a129f36845c409dfad27
+  data.tar.gz: ae4e4c87d345644f054f6b8ff2c56ede552d77ebe98012612f665a72dc31e520
 SHA512:
-  metadata.gz: 1fd86a0cfc61d67b37d20d7be85eed36e58d0067df94aad8fcc7be8f13eada94077049f96044810122dd35a1a62089b1826c73a2fb15ce2a0e5181ae8f5de6ac
-  data.tar.gz: '09008f6dc9be814685295da03c416e39bcef6b4527947211deb58809bdfa2bceaef3aee1a78f8eca47be61960e55b695c52ca5f1a17eb43d766cf439abdf2c0a'
+  metadata.gz: c3a147e73fae54e2c366fd269aa1be216295e80dd909285b31e997501d592b2040591a8fc4e9204f4c034b7da36dc47cdcca89df2a07f0b089a0cb5e9102195a
+  data.tar.gz: 42b838f44359b580ef759979c7bf3fd67acfb477ffb6bc972b7ffe9585767ad09b1077619a01507bd358592020af2a01b5c17a784be9e3e3b29f37cb1e5c54e9

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.6.6
+  - 2.7.2
 script: bundle exec rspec spec

data/README.textile

@@ -1,8 +1,8 @@
 h1. Maître d'
 
-"!https://secure.travis-ci.org/flying-sphinx/maitre_d.png!":http://travis-ci.org/flying-sphinx/maitre_d
+"!https://secure.travis-ci.org/flying-sphinx/maitre_d.svg!":http://travis-ci.org/flying-sphinx/maitre_d
 
-Rack APIs powered by Sliver for managing Heroku and CloudControl add-ons.
+Rack APIs powered by Sliver for managing Heroku add-ons.
 
 Maître d' manages all the authorisation checking for API requests and provides simple hooks for you to write just the code you need to handle provisioning, plan changes, deprovisioning and single-sign-on (SSO) requests.
 
@@ -10,20 +10,17 @@ h2. Installing
 
 Add the following to your Gemfile:
 
-<pre><code>gem 'maitre_d', '~> 0.6.0'</code></pre>
+<pre><code>gem 'maitre_d', '~> 0.7.0'</code></pre>
 
 h3. With Rails
 
-Add the appropriate Rack apps to your routes file:
+Add the Rack app to your routes file:
 
-<pre><code># if you're supporting Heroku
-mount MaitreD::API.new(MaitreD::Heroku)       => '/heroku'
-# if you're supporting CloudControl
-mount MaitreD::API.new(MaitreD::CloudControl) => '/cloudcontrol'</code></pre>
+<pre><code>mount MaitreD::API.new(MaitreD::Heroku) => '/heroku'</code></pre>
 
 h3. Without Rails
 
-As shown above, you can use Maître d' Rack API for both Heroku and Cloud Control. Mount them to wherever you see fit. Once upon a time Heroku expected its endpoints to be at /heroku, but now things are a little more flexible.
+As shown above, you can use Maître d' Rack API, mounting them to wherever you see fit. Once upon a time Heroku expected its endpoints to be at /heroku, but now things are a little more flexible.
 
 h2. Configuration
 
@@ -36,24 +33,15 @@ MaitreD::Heroku.configure do |config|
   config.password = 'random'
   config.sso_salt = 'gibberish'
   config.listener = HerokuListener
-end
-
-require 'maitre_d/cloud_control'
-
-MaitreD::CloudControl.configure do |config|
-  config.id       = 'addon-id'
-  config.password = 'random'
-  config.sso_salt = 'gibberish'
-  config.listener = CloudControlListener
 end</code></pre>
 
-The listeners that are mentioned in the code above are classes, which will handle valid API requests. Read on for more details on how to set them up.
+The listener that is mentioned in the code above is a class, which will handle valid API requests. Read on for more details on how to set them up.
 
 h2. Listeners
 
-Your listener classes should handle the following four methods:
+Your listener class should handle the following four methods:
 
-h3. @provision(heroku_id, plan, region, callback_url, logplex_token, options)@
+h3. @provision(params)@
 
 This gets called when the provider is requesting an app be provisioned within your service, and expects a hash to be returned with the following keys:
 
@@ -66,7 +54,7 @@ This gets called when the provider is requesting an app be provisioned within yo
   <dd>An optional message that will be displayed when your add-on is added via the command-line.</dd>
 </dl>
 
-h3. @plan_change(resource_id, heroku_id, plan)@
+h3. @plan_change(resource_id, plan)@
 
 This gets called when an app is upgrading or downgrading from their current plan. You need to return a hash with the following keys:
 
@@ -95,13 +83,13 @@ Maître d' will check the token and timestamp provided, and sets up the nav-data
 Here's a very basic example:
 
 <pre><code>class HerokuListener
-  def provision(heroku_id, plan, region, callback_url, logplex_token, options)
-    plan   = Plan.find_by_name plan
+  def provision(params)
+    plan   = Plan.find_by_name params["plan"]
     widget = Widget.create(
-      :heroku_id    => heroku_id,
-      :callback_url => callback_url,
+      :heroku_id    => params["uuid"],
+      :callback_url => params["callback_url"],
       :plan         => plan,
-      :region       => region
+      :region       => params["region"]
     )
 
     {
@@ -111,9 +99,9 @@ Here's a very basic example:
     }
   end
 
-  def plan_change(resource_id, heroku_id, plan)
+  def plan_change(resource_id, plan)
     plan   = Plan.find_by_name plan
-    widget = Widget.find resource_id
+    widget = Widget.find_by! heroku_id: resource_id
     widget.plan = plan
     widget.save
 
@@ -121,12 +109,12 @@ Here's a very basic example:
   end
 
   def deprovision(resource_id)
-    widget = Widget.find resource_id
+    widget = Widget.find_by! heroku_id: resource_id
     widget.destroy
   end
 
   def single_sign_on(resource_id)
-    widget = Widget.find resource_id
+    widget = Widget.find_by! heroku_id: resource_id
 
     {
       :uri     => '/my/dashboard',
@@ -147,4 +135,4 @@ Contributions are very much welcome - but keep in mind the following:
 
 h2. Credits
 
-Copyright (c) 2011-2015, Maître d' is developed and maintained by Pat Allan, and is released under the open MIT Licence.
+Copyright (c) 2011-2020, Maître d' is developed and maintained by Pat Allan, and is released under the open MIT Licence.

data/lib/maitre_d/api/change_plan.rb

@@ -1,7 +1,7 @@
 class MaitreD::API::ChangePlan < MaitreD::API::Authenticated
   def call
     response.body = listener.plan_change(
-      resource_id, provider_id, params['plan']
+      resource_id, params['plan']
     )
 
     super
@@ -10,6 +10,6 @@ class MaitreD::API::ChangePlan < MaitreD::API::Authenticated
   private
 
   def resource_id
-    request.path[%r{resources/(\d+)}, 1]
+    request.path[%r{resources/([\w-]+)}, 1]
   end
 end

data/lib/maitre_d/api/create.rb

@@ -1,9 +1,6 @@
 class MaitreD::API::Create < MaitreD::API::Authenticated
   def call
-    response.body = listener.provision(
-      provider_id,             params['plan'],          params['region'],
-      params['callback_url'],  params['logplex_token'], params['options']
-    )
+    response.body = listener.provision(params)
 
     super
   end

data/lib/maitre_d/api/delete.rb

@@ -8,6 +8,6 @@ class MaitreD::API::Delete < MaitreD::API::Authenticated
   private
 
   def resource_id
-    request.path[%r{resources/(\d+)}, 1]
+    request.path[%r{resources/([\w-]+)}, 1]
   end
 end

data/lib/maitre_d/api/sso.rb

@@ -6,7 +6,7 @@ class MaitreD::API::SSO
   end
 
   def call
-    hash = listener.single_sign_on params['id']
+    hash = listener.single_sign_on params['resource_id']
 
     hash[:session] ||= {}
     hash[:session].each { |key, value| session[key] = value }

data/lib/maitre_d/api/sso_guard.rb

@@ -13,7 +13,7 @@ class MaitreD::API::SSOGuard < Sliver::Hook
 
   def expected_token
     @expected_token ||= Digest::SHA1.hexdigest(
-      "#{params['id']}:#{action.configuration.sso_salt}:#{params['timestamp']}"
+      "#{params['resource_id']}:#{action.configuration.sso_salt}:#{params['timestamp']}"
     ).to_s
   end
 
@@ -26,6 +26,6 @@ class MaitreD::API::SSOGuard < Sliver::Hook
   end
 
   def valid_token?
-    expected_token == params['token']
+    expected_token == params['resource_token']
   end
 end

data/maitre_d.gemspec

@@ -3,15 +3,13 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'maitre_d'
-  s.version     = '0.6.1'
+  s.version     = '0.7.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'http://github.com/flying-sphinx/maitre_d'
   s.summary     = 'Rack APIs for Heroku add-ons'
   s.description = 'A Rack API (through Grape) for Heroku add-on providers.'
 
-  s.rubyforge_project = "maitre_d"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -20,8 +18,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'sliver',     '~> 0.2.2'
   s.add_runtime_dependency 'multi_json', '>= 1.3.0'
 
-  s.add_development_dependency 'combustion',  '~> 0.5'
+  s.add_development_dependency 'combustion',  '~> 1.3'
   s.add_development_dependency 'kensa',       '2.1.0'
-  s.add_development_dependency 'rails',       '~> 4.2'
-  s.add_development_dependency 'rspec-rails', '~> 3.6'
+  s.add_development_dependency 'rails',       '~> 6.0'
+  s.add_development_dependency 'rspec-rails', '~> 4.0'
 end

data/spec/api/heroku/provisioning_spec.rb

@@ -17,36 +17,41 @@ describe 'Heroku Provisioning API', :type => :request do
     }
 
     it "returns a 401 if the HTTP authorisation does not match" do
-      post '/heroku/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
+      post '/heroku/resources',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
       expect(response.status).to eq(401)
     end
 
     it "returns the resource id" do
-      post '/heroku/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['id']).to eq('123')
     end
 
     it "returns the resource configuration" do
-      post '/heroku/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['config']).to eq({'FOO_PROVISIONED' => "true"})
     end
 
     it "returns a custom message" do
-      post '/heroku/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['message']).to eq('Add-on provisioned!')
     end
 
     it "returns the region if it exists" do
-      post '/heroku/resources', JSON.dump(params.merge(:region => 'us-west')),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources',
+        :params => JSON.dump(params.merge(:region => 'us-west')),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['region']).to eq('us-west')
     end
@@ -58,22 +63,25 @@ describe 'Heroku Provisioning API', :type => :request do
     }
 
     it "returns a 401 if the HTTP authorisation does not match" do
-      put '/heroku/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
+      put '/heroku/resources/7',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
       expect(response.status).to eq(401)
     end
 
     it "returns the new resource configuration" do
-      put '/heroku/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      put '/heroku/resources/7',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['config']).to eq({'FOO_PROVISIONED' => "false"})
     end
 
     it "returns a custom message" do
-      put '/heroku/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
+      put '/heroku/resources/7',
+        :params => JSON.dump(params),
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['message']).to eq('Add-on upgraded or downgraded.')
     end
@@ -81,20 +89,22 @@ describe 'Heroku Provisioning API', :type => :request do
 
   describe 'Deprovisioning' do
     it "returns a 401 if the HTTP authorisation does not match" do
-      delete '/heroku/resources/28', {},
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
+      delete '/heroku/resources/28',
+        :headers => {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
       expect(response.status).to eq(401)
     end
 
     it "returns with a status of 200" do
-      delete '/heroku/resources/28', {}, {'HTTP_AUTHORIZATION' => authorisation}
+      delete '/heroku/resources/28',
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(response.status).to eq(200)
     end
 
     it "returns a custom message" do
-      delete '/heroku/resources/28', {}, {'HTTP_AUTHORIZATION' => authorisation}
+      delete '/heroku/resources/28',
+        :headers => {'HTTP_AUTHORIZATION' => authorisation}
 
       expect(json_response['message']).to eq('Add-on removed.')
     end

data/spec/api/heroku/single_sign_on_spec.rb

@@ -9,8 +9,10 @@ describe 'Heroku SSO API', :type => :request do
   }
 
   it "renders a 403 if the token is incorrect" do
-    post '/heroku/resources/sso', :id => '789', :token => 'foo',
-      :timestamp => timestamp, 'nav-data' => nav_data
+    post '/heroku/resources/sso', :params => {
+      :resource_id => '789', :resource_token => 'foo', :timestamp => timestamp,
+      'nav-data' => nav_data
+    }
 
     expect(response.status).to eq(403)
   end
@@ -20,29 +22,37 @@ describe 'Heroku SSO API', :type => :request do
     pre_token = "789:#{MaitreD::Heroku.sso_salt}:#{timestamp.to_s}"
     token     = Digest::SHA1.hexdigest(pre_token).to_s
 
-    post '/heroku/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
+    post '/heroku/resources/sso', :params => {
+      :resource_id => '789', :resource_token => token, :timestamp => timestamp,
+      'nav-data' => nav_data
+    }
 
     expect(response.status).to eq(403)
   end
 
   it "sets the heroku nav data cookie" do
-    post '/heroku/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
+    post '/heroku/resources/sso', :params => {
+      :resource_id => '789', :resource_token => token, :timestamp => timestamp,
+      'nav-data' => nav_data
+    }
 
     expect(cookies['heroku-nav-data']).to eq(nav_data)
   end
 
   it "redirects to the appropriate URL" do
-    post '/heroku/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
+    post '/heroku/resources/sso', :params => {
+      :resource_id => '789', :resource_token => token, :timestamp => timestamp,
+      'nav-data' => nav_data
+    }
 
     expect(response).to redirect_to('/my/dashboard')
   end
 
   it "should set the provided session variables" do
-    post '/heroku/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
+    post '/heroku/resources/sso', :params => {
+      :resource_id => '789', :resource_token => token, :timestamp => timestamp,
+      'nav-data' => nav_data
+    }
 
     expect(session[:app_id]).to eq('789')
   end

data/spec/internal/app/listeners/heroku_listener.rb

@@ -1,14 +1,14 @@
 class HerokuListener
-  def provision(heroku_id, plan, region, callback_url, logplex_token, options)
+  def provision(params)
     {
       :id      => '123',
       :config  => {'FOO_PROVISIONED' => 'true'},
       :message => 'Add-on provisioned!',
-      :region  => region
+      :region  => params["region"]
     }
   end
 
-  def plan_change(resource_id, heroku_id, plan)
+  def plan_change(resource_id, plan)
     {
       :config  => {'FOO_PROVISIONED' => 'false'},
       :message => 'Add-on upgraded or downgraded.'

data/spec/internal/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
-  mount MaitreD::API.new(MaitreD::Heroku)       => '/heroku'
-  mount MaitreD::API.new(MaitreD::CloudControl) => '/cloudcontrol'
+  mount MaitreD::API.new(MaitreD::Heroku) => '/heroku'
 
   class Dashboard
     def self.call(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maitre_d
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sliver
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: kensa
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
 description: A Rack API (through Grape) for Heroku add-on providers.
 email:
 - pat@freelancing-gods.com
@@ -119,16 +119,11 @@ files:
 - lib/maitre_d/api/delete.rb
 - lib/maitre_d/api/sso.rb
 - lib/maitre_d/api/sso_guard.rb
-- lib/maitre_d/cloud_control.rb
 - lib/maitre_d/heroku.rb
 - maitre_d.gemspec
-- spec/api/cloud_control/provisioning_spec.rb
-- spec/api/cloud_control/single_sign_on_spec.rb
 - spec/api/heroku/provisioning_spec.rb
 - spec/api/heroku/single_sign_on_spec.rb
-- spec/internal/app/listeners/cloud_control_listener.rb
 - spec/internal/app/listeners/heroku_listener.rb
-- spec/internal/config/initializers/cloud_control.rb
 - spec/internal/config/initializers/heroku.rb
 - spec/internal/config/routes.rb
 - spec/internal/log/.gitignore
@@ -152,19 +147,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: maitre_d
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rack APIs for Heroku add-ons
 test_files:
-- spec/api/cloud_control/provisioning_spec.rb
-- spec/api/cloud_control/single_sign_on_spec.rb
 - spec/api/heroku/provisioning_spec.rb
 - spec/api/heroku/single_sign_on_spec.rb
-- spec/internal/app/listeners/cloud_control_listener.rb
 - spec/internal/app/listeners/heroku_listener.rb
-- spec/internal/config/initializers/cloud_control.rb
 - spec/internal/config/initializers/heroku.rb
 - spec/internal/config/routes.rb
 - spec/internal/log/.gitignore

data/lib/maitre_d/cloud_control.rb

@@ -1,41 +0,0 @@
-module MaitreD::CloudControl
-  def self.configure
-    yield self
-  end
-
-  def self.listener
-    @listener
-  end
-
-  def self.listener=(listener)
-    @listener = listener
-  end
-
-  def self.id
-    @id
-  end
-
-  def self.id=(id)
-    @id = id
-  end
-
-  def self.password
-    @password
-  end
-
-  def self.password=(password)
-    @password = password
-  end
-
-  def self.sso_salt
-    @sso_salt
-  end
-
-  def self.sso_salt=(salt)
-    @sso_salt = salt
-  end
-
-  def self.provider_id_from(params)
-    params['cloudcontrol_id']
-  end
-end

data/spec/api/cloud_control/provisioning_spec.rb

@@ -1,94 +0,0 @@
-require 'spec_helper'
-
-describe 'CloudControl Provisioning API', :type => :request do
-  let(:authorisation) { "Basic #{Base64.encode64('baz:qux')}" }
-  let(:json_response) { JSON.parse response.body }
-
-  describe 'Provisioning' do
-    let(:params) {
-      {
-        :plan            => 'basic',
-        :callback_url    => 'https://domain/vendor/apps/app123%40heroku.com',
-        :cloudcontrol_id => 'app123@heroku.com'
-      }
-    }
-
-    it "returns a 401 if the HTTP authorisation does not match" do
-      post '/cloudcontrol/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
-
-      expect(response.status).to eq(401)
-    end
-
-    it "returns the resource id" do
-      post '/cloudcontrol/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['id']).to eq('123')
-    end
-
-    it "returns the resource configuration" do
-      post '/cloudcontrol/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['config']).to eq('FOO_PROVISIONED' => "true")
-    end
-
-    it "returns a custom message" do
-      post '/cloudcontrol/resources', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['message']).to eq('Add-on provisioned!')
-    end
-  end
-
-  describe 'Changing Plans' do
-    let(:params) {
-      {:cloudcontrol_id => 'app123@heroku.com', :plan => 'premium'}
-    }
-
-    it "returns a 401 if the HTTP authorisation does not match" do
-      put '/cloudcontrol/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
-
-      expect(response.status).to eq(401)
-    end
-
-    it "returns the new resource configuration" do
-      put '/cloudcontrol/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['config']).to eq('FOO_PROVISIONED' => "false")
-    end
-
-    it "returns a custom message" do
-      put '/cloudcontrol/resources/7', JSON.dump(params),
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['message']).to eq('Add-on upgraded or downgraded.')
-    end
-  end
-
-  describe 'Deprovisioning' do
-    it "returns a 401 if the HTTP authorisation does not match" do
-      delete '/cloudcontrol/resources/28', {},
-        {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
-
-      expect(response.status).to eq(401)
-    end
-
-    it "returns with a status of 200" do
-      delete '/cloudcontrol/resources/28', {},
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(response.status).to eq(200)
-    end
-
-    it "returns a custom message" do
-      delete '/cloudcontrol/resources/28', {},
-        {'HTTP_AUTHORIZATION' => authorisation}
-
-      expect(json_response['message']).to eq('Add-on removed.')
-    end
-  end
-end

data/spec/api/cloud_control/single_sign_on_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe 'CloudControl SSO API', :type => :request do
-  let(:timestamp) { Time.now.to_i }
-  let(:nav_data)  { 'heroku-nav-data-goes-here' }
-  let(:token)     {
-    pre_token = "789:#{MaitreD::CloudControl.sso_salt}:#{timestamp.to_s}"
-    Digest::SHA1.hexdigest(pre_token).to_s
-  }
-
-  it "renders a 403 if the token is incorrect" do
-    post '/cloudcontrol/resources/sso', :id => '789', :token => 'foo',
-      :timestamp => timestamp, 'nav-data' => nav_data
-
-    expect(response.status).to eq(403)
-  end
-
-  it "renders a 403 if the timestamp is older than 5 minutes" do
-    timestamp = 5.minutes.ago.to_i - 1
-    pre_token = "789:#{MaitreD::CloudControl.sso_salt}:#{timestamp.to_s}"
-    token     = Digest::SHA1.hexdigest(pre_token).to_s
-
-    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
-
-    expect(response.status).to eq(403)
-  end
-
-  it "sets the heroku nav data cookie" do
-    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
-
-    expect(cookies['heroku-nav-data']).to eq(nav_data)
-  end
-
-  it "redirects to the appropriate URL" do
-    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
-
-    expect(response).to redirect_to('/my/dashboard')
-  end
-
-  it "should set the provided session variables" do
-    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
-      :timestamp => timestamp, 'nav-data' => nav_data
-
-    expect(session[:app_id]).to eq('789')
-  end
-end

data/spec/internal/app/listeners/cloud_control_listener.rb

@@ -1,29 +0,0 @@
-class CloudControlListener
-  def provision(cloud_control_id, plan, region, callback_url, logplex_token, options)
-    {
-      :id      => '123',
-      :config  => {'FOO_PROVISIONED' => 'true'},
-      :message => 'Add-on provisioned!'
-    }
-  end
-
-  def plan_change(resource_id, cloud_control_id, plan)
-    {
-      :config  => {'FOO_PROVISIONED' => 'false'},
-      :message => 'Add-on upgraded or downgraded.'
-    }
-  end
-
-  def deprovision(resource_id)
-    {
-      :message => 'Add-on removed.'
-    }
-  end
-
-  def single_sign_on(resource_id)
-    {
-      :uri     => '/my/dashboard',
-      :session => {:app_id => resource_id}
-    }
-  end
-end

data/spec/internal/config/initializers/cloud_control.rb

@@ -1,8 +0,0 @@
-require 'maitre_d/cloud_control'
-
-MaitreD::CloudControl.configure do |config|
-  config.id       = 'baz'
-  config.password = 'qux'
-  config.sso_salt = 'rock salt'
-  config.listener = CloudControlListener
-end