Bring back PR cloudfoundry#1585

This reverts commit 39952cf, reversing
changes made to c3b2d6d.

Author: Aakash Shah

lib/cloud_controller/opi/stager_client.rb

@@ -23,10 +23,11 @@ def stop_staging(staging_guid); end
     private
 
     class BuildpackLifecycle
-      def initialize(action_builder, staging_guid, cc_uploader_url)
+      def initialize(action_builder, staging_guid, cc_uploader_url, config)
         @action_builder = action_builder
         @staging_guid = staging_guid
         @cc_uploader_url = cc_uploader_url
+        @config = config
       end
 
       def to_hash
@@ -36,10 +37,26 @@ def to_hash
           buildpack_lifecycle: {
               droplet_upload_uri: droplet_upload_uri,
               app_bits_download_uri: lifecycle_data[:app_bits_download_uri],
-              buildpacks: lifecycle_data[:buildpacks]
+              buildpacks: lifecycle_data[:buildpacks],
+              buildpack_cache_download_uri: lifecycle_data[:build_artifacts_cache_download_uri],
+              buildpack_cache_checksum: lifecycle_data[:buildpack_cache_checksum],
+              buildpack_cache_checksum_algorithm: 'sha256',
+              buildpack_cache_upload_uri: upload_buildpack_artifacts_cache_uri(@staging_guid, lifecycle_data)
           }
         }
       end
+
+      private
+
+      def upload_buildpack_artifacts_cache_uri(staging_guid, lifecycle_data)
+        upload_buildpack_artifacts_cache_uri       = URI(@config.get(:diego, :cc_uploader_url))
+        upload_buildpack_artifacts_cache_uri.path  = "/v1/build_artifacts/#{staging_guid}"
+        upload_buildpack_artifacts_cache_uri.query = {
+          'cc-build-artifacts-upload-uri' => lifecycle_data[:build_artifacts_cache_upload_uri],
+          'timeout'                       => @config.get(:staging, :timeout_in_seconds),
+        }.to_param
+        upload_buildpack_artifacts_cache_uri.to_s
+      end
     end
 
     class DockerLifecycle
@@ -95,7 +112,7 @@ def get_lifecycle(staging_details, staging_guid, action_builder)
         DockerLifecycle.new(staging_details)
       else
         cc_uploader_url = config.get(:opi, :cc_uploader_url)
-        BuildpackLifecycle.new(action_builder, staging_guid, cc_uploader_url)
+        BuildpackLifecycle.new(action_builder, staging_guid, cc_uploader_url, config)
       end
     end
 

spec/unit/lib/cloud_controller/opi/stager_client_spec.rb

@@ -75,7 +75,11 @@
             buildpack_lifecycle: {
               droplet_upload_uri: "http://cc-uploader.service.cf.internal:9091/v1/droplet/#{staging_guid}?cc-droplet-upload-uri=http://upload.me",
                               app_bits_download_uri: 'http://download.me',
-                              buildpacks: [{ name: 'ruby', key: 'idk', url: 'www.com', skip_detect: false }]
+                              buildpacks: [{ name: 'ruby', key: 'idk', url: 'www.com', skip_detect: false }],
+                              buildpack_cache_download_uri: 'buildpacks-artifacts-cache-url-download',
+                              buildpack_cache_checksum: 'sumcheck',
+                              buildpack_cache_checksum_algorithm: 'sha256',
+                              buildpack_cache_upload_uri: 'https://cc-uploader.service.cf.internal:9091/v1/build_artifacts/some_staging_guid?cc-build-artifacts-upload-uri=buildpacks-artifacts-cache-url-upload&timeout=42'
             }
           },
           cpu_weight: VCAP::CloudController::Diego::STAGING_TASK_CPU_WEIGHT,
@@ -109,7 +113,11 @@
               buildpack_lifecycle: {
                 droplet_upload_uri: "http://cc-uploader.service.cf.internal:9091/v1/droplet/#{staging_guid}?cc-droplet-upload-uri=http://upload.me",
                                 app_bits_download_uri: 'http://download.me',
-                                buildpacks: [{ name: 'ruby', key: 'idk', url: 'www.com', skip_detect: false }]
+                                buildpacks: [{ name: 'ruby', key: 'idk', url: 'www.com', skip_detect: false }],
+                                buildpack_cache_download_uri: 'buildpacks-artifacts-cache-url-download',
+                                buildpack_cache_checksum: 'sumcheck',
+                                buildpack_cache_checksum_algorithm: 'sha256',
+                                buildpack_cache_upload_uri: 'https://cc-uploader.service.cf.internal:9091/v1/build_artifacts/some_staging_guid?cc-build-artifacts-upload-uri=buildpacks-artifacts-cache-url-upload&timeout=42'
               }
             },
             cpu_weight: VCAP::CloudController::Diego::STAGING_TASK_CPU_WEIGHT,
@@ -229,10 +237,10 @@ def stub_lifecycle_data
        }
     ]
     data.droplet_upload_uri                         = 'http://upload.me'
-    data.build_artifacts_cache_download_uri         = 'dont care'
+    data.build_artifacts_cache_download_uri         = 'buildpacks-artifacts-cache-url-download'
     data.stack                                      = 'dont care'
-    data.build_artifacts_cache_upload_uri           = 'dont care'
-    data.buildpack_cache_checksum                   = 'dont care'
+    data.build_artifacts_cache_upload_uri           = 'buildpacks-artifacts-cache-url-upload'
+    data.buildpack_cache_checksum                   = 'sumcheck'
     data.app_bits_checksum                          = { type: 'sha256', value: 'also dont care' }
     data.message
   end