Merge branch '784-riverbed-download'

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

docs/framework-riverbed_appinternals_agent.md

@@ -52,3 +52,7 @@ The framework can be configured by modifying the [`config/riverbed_appinternals_
 **NOTE**
 
 If the Riverbed Service Broker's version is greater than or equal to 10.20, the buildpack will instead download Riverbed AppInternals agent from Riverbed Service Broker and will fall back to using `repository_root` in [`config/riverbed_appinternals_agent.yml`][] only if Service Broker failed to serve the Agent artifact.
+
+**NOTE**
+
+If the Rivered verstion is 10.21.9 or later, the buildpack will load the profiler normally, instead of from the Service Broker. This allows for creating multiple offline buildpacks containing different versions.

lib/java_buildpack/framework/riverbed_appinternals_agent.rb

@@ -18,30 +18,17 @@
 require 'fileutils'
 require 'java_buildpack/component/versioned_dependency_component'
 require 'java_buildpack/framework'
+
 module JavaBuildpack
   module Framework
 
     # Encapsulates the functionality for running the Riverbed Appinternals Agent support.
     class RiverbedAppinternalsAgent < JavaBuildpack::Component::VersionedDependencyComponent
 
-      # Creates an instance
-      #
-      # @param [Hash] context a collection of utilities used the component
-      def initialize(context)
-        super(context)
-        @uri = download_url(credentials, @uri)
-      end
-
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
-        JavaBuildpack::Util::Cache::InternetAvailability.instance.available(
-          true, 'Downloading from Riverbed AppInternals Service Broker'
-        ) do
-          download_zip(false, @droplet.sandbox, @component_name)
-        end
+        download_zip(false, @droplet.sandbox, @component_name)
         @droplet.copy_resources
-      rescue StandardError => e
-        raise "Riverbed AppInternals download failed: #{e}"
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
@@ -69,8 +56,6 @@ def supports?
 
       private
 
-      PROFILERURL = 'profilerUrlLinux'
-
       FILTER = /appinternals/.freeze
 
       private_constant :FILTER
@@ -107,10 +92,6 @@ def rvbd_moniker(credentials)
         credentials['rvbd_moniker'] || @configuration['rvbd_moniker']
       end
 
-      def download_url(credentials, default_url)
-        (credentials[PROFILERURL] unless credentials.nil?) || default_url
-      end
-
     end
   end
 end

spec/java_buildpack/framework/riverbed_appinternals_agent_spec.rb

@@ -31,9 +31,6 @@
     before do
       allow(services).to receive(:one_service?).with(/appinternals/).and_return(true)
 
-      allow(services).to receive(:find_service).and_return('credentials' => { 'profilerUrlLinux' =>
-                                                                                'http://testfoobar/profiler.zip' })
-
       allow(application_cache).to receive(:get).with('http://testfoobar/profiler.zip')
                                                .and_yield(Pathname.new('spec/fixtures/'\
                                                'stub-riverbed-appinternals-agent.zip').open, false)