nucleus 0.2.0 → 0.3.1

data/spec/unit/common/helpers/auth_helper_spec.rb

@@ -25,7 +25,7 @@ describe Nucleus::Adapters::AuthenticationRetryWrapper do
         counted = 0
         expect  = 1
         allow(calculator).to receive(:calc) do
-          fail(Nucleus::Errors::EndpointAuthenticationError.new('error', auth_client)) if (counted += 1) <= expect
+          raise(Nucleus::Errors::EndpointAuthenticationError.new('error', auth_client)) if (counted += 1) <= expect
           1
         end
       end

data/tasks/evaluation.rake

@@ -17,7 +17,7 @@ namespace :evaluation do
 
         adapter_dao.all.each do |adapter_index_entry|
           vendor_name = vendor_dao.get(provider_dao.get(endpoint_dao.get(adapter_index_entry.id).provider).vendor).name
-          # from camel to sneak case
+          # from camel to snake case
           adapter_file_name = vendor_name.gsub(/\s/, '_').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
                                          .gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
           next if @vendor_results.key?(vendor_name)

data/wiki/adapter_tests.md

@@ -59,11 +59,6 @@ bluemix-eu-gb:
   password: 'my_bluemix_usernames_password'
   username: 'my_bluemix_username_with_encoded_umlauts'
 
-cloudcontrol:
-  user:     'my_cc_email'
-  password: 'my_cc_usernames_password'
-  username: 'my_cc_username'
-
 openshift-online:
   user:     'my_os_email'
   password: 'my_os_usernames_password'
@@ -86,8 +81,6 @@ bundle exec rake record:heroku
 * You must be allowed to create at least 3 additional applications with your account, otherwise the quota restrictions will invalidate the test results.
 * A complete recording of a single vendor usually takes 5 up to 15 minutes. Openshift currently takes more than 30 minutes.
 If you only require a certain functionality to be tested (during development), make sure to comment out irrelevant sections in the `spec/adapter/support/shared_example_adapters_valid.rb` file.
-* cloudControl requires you to change the application names if the previous recording was made within the last 2 days, otherwise if fails because the name is still locked.
-Change the name in the `spec/adapter/v1/cloud_control_spec.rb`.
 
 ### Missing or invalid VCR recording
 

data/wiki/implement_new_adapter.md

@@ -88,7 +88,7 @@ describe Nucleus::Adapters::{API_VERSION}::{VENDOR_CLASS} do
   end
   before do |example|
     if skip_example?(described_class, example.metadata[:full_description], @unsupported)
-      skip('This feature is currently not supported by CloudControl - 501')
+      skip('This feature is currently not supported by Heroku - 501')
     end
     # reload adapter for each test
     @adapter = load_adapter(@endpoint, @api_version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nucleus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stefan Kolb
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron
@@ -483,14 +483,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.2
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -557,7 +557,6 @@ files:
 - bin/nucleus
 - bin/nucleus.bat
 - config.ru
-- config/adapters/cloud_control.yml
 - config/adapters/cloud_foundry_v2.yml
 - config/adapters/heroku.yml
 - config/adapters/openshift_v2.yml
@@ -566,21 +565,6 @@ files:
 - lib/nucleus/adapter_resolver.rb
 - lib/nucleus/adapters/base_adapter.rb
 - lib/nucleus/adapters/buildpack_translator.rb
-- lib/nucleus/adapters/v1/cloud_control/application.rb
-- lib/nucleus/adapters/v1/cloud_control/authentication.rb
-- lib/nucleus/adapters/v1/cloud_control/buildpacks.rb
-- lib/nucleus/adapters/v1/cloud_control/cloud_control.rb
-- lib/nucleus/adapters/v1/cloud_control/data.rb
-- lib/nucleus/adapters/v1/cloud_control/domains.rb
-- lib/nucleus/adapters/v1/cloud_control/lifecycle.rb
-- lib/nucleus/adapters/v1/cloud_control/log_poller.rb
-- lib/nucleus/adapters/v1/cloud_control/logs.rb
-- lib/nucleus/adapters/v1/cloud_control/regions.rb
-- lib/nucleus/adapters/v1/cloud_control/scaling.rb
-- lib/nucleus/adapters/v1/cloud_control/semantic_errors.rb
-- lib/nucleus/adapters/v1/cloud_control/services.rb
-- lib/nucleus/adapters/v1/cloud_control/token.rb
-- lib/nucleus/adapters/v1/cloud_control/vars.rb
 - lib/nucleus/adapters/v1/cloud_foundry_v2/app_states.rb
 - lib/nucleus/adapters/v1/cloud_foundry_v2/application.rb
 - lib/nucleus/adapters/v1/cloud_foundry_v2/authentication.rb

data/config/adapters/cloud_control.yml

@@ -1,32 +0,0 @@
---- 
-name: "cloudControl"
-id: "cloudcontrol"
-providers:
-  - 
-    name: "cloudControl"
-    id: "cloudcontrol"
-    endpoints:
-      - 
-        name: "cloudControl"
-        id: "cloudcontrol"
-        url: "api.cloudcontrol.com"
-      -
-        name: "dotCloud"
-        id: "dotcloud"
-        url: "api.dotcloudapp.com"
-  -
-    name: "exoscale Apps"
-    id: "exoscale"
-    endpoints:
-      -
-        name: "exoscale Apps"
-        id: "exoscale"
-        url: "api.app.exo.io"
-  -
-    name: "Cloud&Heat App Elevator"
-    id: "cloudandheat"
-    endpoints:
-      -
-        name: "Cloud&Heat App Elevator"
-        id: "cloudandheat"
-        url: "api.cnh-apps.com"

data/lib/nucleus/adapters/v1/cloud_control/application.rb

@@ -1,108 +0,0 @@
-module Nucleus
-  module Adapters
-    module V1
-      class CloudControl < Stub
-        # cloud control, CRUD operations for the application object
-        module Application
-          # @see Stub#applications
-          def applications
-            response = get('/app')
-            apps = []
-            response.body.each do |application|
-              apps << to_nucleus_app(application, default_deployment(application[:name]))
-            end
-            apps
-          end
-
-          # @see Stub#application
-          def application(application_id)
-            response = get("/app/#{application_id}").body
-            to_nucleus_app(response, default_deployment(response[:name]))
-          end
-
-          # @see Stub#create_application
-          def create_application(application)
-            if application.key? :region
-              unless application[:region].casecmp('default') == 0
-                fail Errors::SemanticAdapterRequestError,
-                     "Region '#{application[:region]}' does not exist at the endpoint. "\
-                     'Please check which regions are actually available on this endpoint.'
-              end
-              # there is no region in cloudControl --> remove from request
-              application.delete :region
-            end
-
-            apply_buildpack(application)
-
-            # force the use of repository type 'git', unless overridden by the params
-            default_params = { repository_type: 'git' }
-            cc_application = default_params.merge(application)
-
-            create_app_response = post('/app', body: cc_application).body
-
-            # create the default deployment, name will automatically become 'default'
-            created_deployment = post("/app/#{create_app_response[:name]}/deployment", body: { name: 'nucleus' }).body
-
-            # activate the variables addon. However, the activation explicitly requires an initial key value pair...
-            post("/app/#{create_app_response[:name]}/deployment/#{NUCLEUS_DEPLOYMENT}/addon",
-                 body: { addon: 'config.free', options: '{"nucleus-initialized": "true"}' }).body
-            # ...now delete the initial key value pair to have the desired clean setup
-            delete_env_var(create_app_response[:name], 'nucleus-initialized')
-
-            to_nucleus_app(create_app_response, created_deployment)
-          end
-
-          # @see Stub#delete_application
-          def delete_application(application_id)
-            # delete all deployments first
-            deployments = get("/app/#{application_id}/deployment").body
-            deployments.each do |deployment|
-              deployment_name = %r{(\w+)\/(\w+)}.match(deployment[:name])[2]
-              delete("/app/#{application_id}/deployment/#{deployment_name}")
-            end
-            delete("/app/#{application_id}")
-          end
-
-          private
-
-          def apply_buildpack(application)
-            runtimes = application.delete(:runtimes)
-            return unless runtimes
-            fail_with(:only_one_runtime) if runtimes.length > 1
-            buildpack = find_runtime(runtimes[0])
-            if native_runtime?(buildpack)
-              application[:type] = buildpack
-            elsif buildpack
-              application[:type] = 'custom'
-              application[:buildpack_url] = buildpack
-            else
-              # 3rd party buildpack must be a valid URL
-              unless Regexp::PERFECT_URL_PATTERN =~ runtimes[0]
-                fail Errors::SemanticAdapterRequestError,
-                     "Invalid buildpack: '#{runtimes[0]}'. Please provide a valid buildpack URL for all "\
-                      'custom buildpacks that are not provided by cloud control.'
-              end
-              application[:type] = 'custom'
-              application[:buildpack_url] = runtimes[0]
-            end
-          end
-
-          def to_nucleus_app(app, deployment)
-            app[:id] = app[:name]
-            app[:created_at] = app.delete :date_created
-            app[:updated_at] = app.delete :date_modified
-            app[:state] = application_state(deployment)
-            app[:web_url] = "http://#{deployment[:default_subdomain]}"
-            app[:autoscaled] = false
-            app[:region] = 'default'
-            app[:instances] = deployment[:min_boxes]
-            app[:active_runtime] = app[:type][:name] == 'custom' ? app[:buildpack_url] : app[:type][:name]
-            app[:runtimes] = [app[:active_runtime]]
-            app[:release_version] = deployment[:version] != '-1' ? deployment[:version] : nil
-            app
-          end
-        end
-      end
-    end
-  end
-end

data/lib/nucleus/adapters/v1/cloud_control/authentication.rb

@@ -1,27 +0,0 @@
-module Nucleus
-  module Adapters
-    module V1
-      class CloudControl < Stub
-        # Authentication functionality to support the cloudControl API
-        module Authentication
-          # @see Stub#auth_client
-          def auth_client
-            Token.new @check_certificates do |_verify_ssl, username, password|
-              auth_headers = { 'Authorization' => 'Basic ' + ["#{username}:#{password}"].pack('m*').delete("\n") }
-              begin
-                # ssl verification is implemented by the HttpClient itself
-                response = post('/token', headers: auth_headers)
-                # parse to retrieve the token and expiration date
-                expires = Time.parse(response.body[:expires])
-                [response.body[:token], expires]
-              rescue Errors::AdapterError
-                # ignore the error, return nil for failed authentication
-                nil
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/nucleus/adapters/v1/cloud_control/buildpacks.rb

@@ -1,23 +0,0 @@
-module Nucleus
-  module Adapters
-    module V1
-      class CloudControl < Stub
-        # cloud control specific buildpacks
-        module Buildpacks
-          include Nucleus::Adapters::BuildpackTranslator
-
-          # @see BuildpackTranslator#vendor_specific_runtimes
-          def vendor_specific_runtimes
-            {
-              'java' => 'java',
-              'nodejs' => 'nodejs',
-              'ruby' => 'ruby',
-              'php' => 'php',
-              'python' => 'python'
-            }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/nucleus/adapters/v1/cloud_control/cloud_control.rb

@@ -1,153 +0,0 @@
-require 'net/ssh'
-
-module Nucleus
-  module Adapters
-    module V1
-      class CloudControl < Stub
-        include Nucleus::Logging
-        include Nucleus::Adapters::V1::CloudControl::Authentication
-        include Nucleus::Adapters::V1::CloudControl::Application
-        include Nucleus::Adapters::V1::CloudControl::Buildpacks
-        include Nucleus::Adapters::V1::CloudControl::Domains
-        include Nucleus::Adapters::V1::CloudControl::Data
-        include Nucleus::Adapters::V1::CloudControl::Lifecycle
-        include Nucleus::Adapters::V1::CloudControl::Logs
-        include Nucleus::Adapters::V1::CloudControl::Regions
-        include Nucleus::Adapters::V1::CloudControl::Scaling
-        include Nucleus::Adapters::V1::CloudControl::SemanticErrors
-        include Nucleus::Adapters::V1::CloudControl::Services
-        include Nucleus::Adapters::V1::CloudControl::Vars
-
-        # The default deployment name of cloud control applications that is used by Nucleus
-        NUCLEUS_DEPLOYMENT = 'nucleus'.freeze
-        # Error messages of semantic errors that are platform specific
-        CC_EXCLUSIVE_SEMANTIC_ERROR_MSGS = ['cannot use this name', 'may only contain', 'this field has no more than'].freeze
-        # Error messages of common semantic errors
-        CC_SEMANTIC_ERROR_MSGS = ['must be unique', 'already exists',
-                                  'not a valid addon name', 'not a valid addon option'].freeze
-        CC_CONFLICT_ERROR_MSGS = ['Addon already exists'].freeze
-
-        def initialize(endpoint_url, endpoint_app_domain = nil, check_certificates = true)
-          super(endpoint_url, endpoint_app_domain, check_certificates)
-        end
-
-        def handle_error(error_response)
-          message = error_response.body.match(/{(.*?)}/)
-          message = message[1] if message
-
-          # cloud control responds almost every time with 400...
-          if error_response.status == 400
-            handle_400(message)
-          elsif error_response.status == 409 && CC_CONFLICT_ERROR_MSGS.any? { |msg| message.include? msg }
-            fail Errors::SemanticAdapterRequestError, message
-          elsif error_response.status == 410
-            fail Errors::AdapterResourceNotFoundError, 'Resource not found'
-          elsif error_response.status == 503
-            fail Errors::PlatformUnavailableError, 'The cloudControl API is currently not available'
-          end
-          # error still unhandled, will result in a 500, server error
-          log.warn "cloudControl error still unhandled: #{error_response}"
-        end
-
-        private
-
-        def handle_400(message)
-          fail Errors::AdapterResourceNotFoundError, 'Resource not found' if message.nil?
-
-          if message.include?('Billing account required')
-            fail_with(:billing_required, [message])
-          elsif CC_EXCLUSIVE_SEMANTIC_ERROR_MSGS.any? { |msg| message.include? msg }
-            # all these errors are limited to cloud control, e.g. the allowed name characters and max name length
-            fail_with(:bad_name, [message])
-          elsif CC_SEMANTIC_ERROR_MSGS.any? { |msg| message.include? msg }
-            fail Errors::SemanticAdapterRequestError, message
-          end
-          fail Errors::AdapterRequestError, message
-        end
-
-        def username
-          get('/user').body.first[:username]
-        end
-
-        def data_uploaded?(deployment)
-          application_id = deployment[:name].split(%r{/})[0]
-          repo_host = URI.parse(deployment[:branch]).host
-          repo_path = URI.parse(deployment[:branch]).path.gsub(%r{^/}, '').chomp('.git')
-          attempts = 0
-          with_ssh_key do
-            loop do
-              begin
-                return GitRepoAnalyzer.any_branch?(repo_host, repo_path, application_id)
-              rescue Net::SSH::AuthenticationFailed => e
-                attempts += 1
-                # wait up to 30 seconds
-                raise e if attempts >= 15
-                log.debug('SSH authentication failed, sleep and repeat')
-                # authentication is not yet ready, wait a short time
-                sleep(2.0)
-              end
-            end
-          end
-        end
-
-        def application_state(deployment)
-          # With cloud control not supporting the Nucleus application lifecycle, only 3 actual states remain:<br>
-          # * created, when no data deployment (not to confuse with cloud control deployment object) has been made yet
-          # * deployed, when only the data has been pushed into the repository (no build)
-          # * running, if a data deployment was pushed
-          if deployment[:version] == '-1'
-            return Enums::ApplicationStates::DEPLOYED if data_uploaded?(deployment)
-            return Enums::ApplicationStates::CREATED
-          end
-          return Enums::ApplicationStates::IDLE if deployment[:state] == 'idle'
-          Enums::ApplicationStates::RUNNING
-          # return Enums::ApplicationStates::STOPPED
-
-          # arriving here the above states do not catch all states of the cloudControl app, which should not happen ;-)
-          # fail Errors::UnknownAdapterCallError, 'Could not determine application state. '\
-          #   'Please verify the cloudControl adapter'
-        end
-
-        def default_deployment(application_id)
-          # get and return nucleus deployment, but catch arising 404 errors
-          return get("/app/#{application_id}/deployment/#{NUCLEUS_DEPLOYMENT}").body
-        rescue Errors::AdapterResourceNotFoundError
-          # if 404, list all deployments
-          all_deployments = get("/app/#{application_id}/deployment").body
-
-          # fail 422 (platform specific) if no deployment is available at all
-          fail_with(:no_deployment) if all_deployments.length == 0
-
-          # return deployment[0] if collection size is 1
-          return all_deployments[0] if all_deployments.length == 1
-
-          # return 'default' if more than 1 deployment and 'default' is included
-          def_deployment = all_deployments.find { |d| d[:name].split(%r{/})[1].casecmp('default') }
-          return def_deployment if def_deployment
-
-          # return 'nucleus' if more than 1 deployment, but no 'default' is included
-          nucleus_deployment = all_deployments.find { |d| d[:name].split(%r{/})[1].casecmp('nucleus') }
-          return nucleus_deployment if nucleus_deployment
-
-          # fail 422 if no 'default', no 'nucleus', and more than 1 deployment is available (could not identify default)
-          fail_with(:ambiguous_deployments)
-        end
-
-        def headers
-          super.merge('Content-Type' => 'application/json')
-        end
-
-        def with_ssh_key
-          user = username
-          # load ssh key into cloud control
-          matches = nucleus_config.ssh.handler.public_key.match(/(.*)\s{1}(.*)\s{1}(.*)/)
-          key_id = register_key(user, matches[1], matches[2])
-          return yield
-        ensure
-          # unload ssh key, allow 404 if the key couldn't be registered at first
-          delete("/user/#{user}/key/#{key_id}") if key_id
-        end
-      end
-    end
-  end
-end