Rename 'file-based-service-bindings' to 'service-binding-k8s'

Author: svkrieger

app/models/runtime/process_model.rb

@@ -177,7 +177,7 @@ def revisions_enabled?
       app.revisions_enabled
     end
 
-    delegate :file_based_service_bindings_enabled, to: :app
+    delegate :service_binding_k8s_enabled, to: :app
 
     def package_hash
       # this caches latest_package for performance reasons

app/presenters/system_environment/system_env_presenter.rb

@@ -3,12 +3,12 @@
 
 class SystemEnvPresenter
   def initialize(app_or_process)
-    @file_based_service_bindings_enabled = app_or_process.file_based_service_bindings_enabled
+    @service_binding_k8s_enabled = app_or_process.service_binding_k8s_enabled
     @service_bindings = app_or_process.service_bindings
   end
 
   def system_env
-    return { SERVICE_BINDING_ROOT: '/etc/cf-service-bindings' } if @file_based_service_bindings_enabled
+    return { SERVICE_BINDING_ROOT: '/etc/cf-service-bindings' } if @service_binding_k8s_enabled
 
     { VCAP_SERVICES: service_binding_env_variables }
   end

lib/cloud_controller/diego/service_binding_files_builder.rb

@@ -10,12 +10,12 @@ def self.build(app_or_process)
       end
 
       def initialize(app_or_process)
-        @file_based_service_bindings_enabled = app_or_process.file_based_service_bindings_enabled
+        @service_binding_k8s_enabled = app_or_process.service_binding_k8s_enabled
         @service_bindings = app_or_process.service_bindings
       end
 
       def build
-        return nil unless @file_based_service_bindings_enabled
+        return nil unless @service_binding_k8s_enabled
 
         service_binding_files = {}
         names = Set.new # to check for duplicate binding names

spec/request/apps_spec.rb

@@ -1602,15 +1602,15 @@
 
       it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS
 
-      context 'when file-based service bindings are enabled' do
+      context 'when k8s service bindings are enabled' do
         let(:app_model_response_object) do
           r = super()
           r[:system_env_json] = { SERVICE_BINDING_ROOT: '/etc/cf-service-bindings' }
           r
         end
 
         before do
-          app_model.update(file_based_service_bindings_enabled: true)
+          app_model.update(service_binding_k8s_enabled: true)
         end
 
         it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS

spec/unit/lib/cloud_controller/diego/app_recipe_builder_spec.rb

@@ -57,11 +57,11 @@ module Diego
         end
       end
 
-      shared_examples 'file-based service bindings' do
-        context 'when file-based service bindings are enabled' do
+      shared_examples 'k8s service bindings' do
+        context 'when k8s service bindings are enabled' do
           before do
             app = process.app
-            app.update(file_based_service_bindings_enabled: true)
+            app.update(service_binding_k8s_enabled: true)
             VCAP::CloudController::ServiceBinding.make(service_instance: ManagedServiceInstance.make(space: app.space), app: app)
           end
 
@@ -932,7 +932,7 @@ module Diego
             end
           end
 
-          include_examples 'file-based service bindings'
+          include_examples 'k8s service bindings'
         end
 
         context 'when the lifecycle_type is "cnb"' do
@@ -1025,7 +1025,7 @@ module Diego
             end
           end
 
-          include_examples 'file-based service bindings'
+          include_examples 'k8s service bindings'
         end
 
         context 'when the lifecycle_type is "docker"' do
@@ -1370,7 +1370,7 @@ module Diego
             end
           end
 
-          include_examples 'file-based service bindings'
+          include_examples 'k8s service bindings'
         end
       end
 

spec/unit/lib/cloud_controller/diego/service_binding_files_builder_spec.rb

@@ -97,7 +97,7 @@ module VCAP::CloudController::Diego
     let(:directory) { 'binding-name' }
 
     before do
-      app.update(file_based_service_bindings_enabled: true)
+      app.update(service_binding_k8s_enabled: true)
     end
 
     describe '#build' do

spec/unit/lib/cloud_controller/diego/task_recipe_builder_spec.rb

@@ -201,10 +201,10 @@ module Diego
             end
           end
 
-          context 'when file-based service bindings are enabled' do
+          context 'when k8s service bindings are enabled' do
             before do
               app = staging_details.package.app
-              app.update(file_based_service_bindings_enabled: true)
+              app.update(service_binding_k8s_enabled: true)
               VCAP::CloudController::ServiceBinding.make(service_instance: ManagedServiceInstance.make(space: app.space), app: app)
             end
 
@@ -601,10 +601,10 @@ module Diego
             end
           end
 
-          context 'when file-based service bindings are enabled' do
+          context 'when k8s service bindings are enabled' do
             before do
               app = task.app
-              app.update(file_based_service_bindings_enabled: true)
+              app.update(service_binding_k8s_enabled: true)
               VCAP::CloudController::ServiceBinding.make(service_instance: ManagedServiceInstance.make(space: app.space), app: app)
             end
 
@@ -769,10 +769,10 @@ module Diego
             end
           end
 
-          context 'when file-based service bindings are enabled' do
+          context 'when k8s service bindings are enabled' do
             before do
               app = task.app
-              app.update(file_based_service_bindings_enabled: true)
+              app.update(service_binding_k8s_enabled: true)
               VCAP::CloudController::ServiceBinding.make(service_instance: ManagedServiceInstance.make(space: app.space), app: app)
             end
 

spec/unit/presenters/system_environment/system_env_presenter_spec.rb

@@ -4,10 +4,10 @@ module VCAP::CloudController
   RSpec.describe SystemEnvPresenter do
     subject(:system_env_presenter) { SystemEnvPresenter.new(app) }
 
-    shared_examples 'file-based service bindings' do
-      context 'when file-based service bindings are enabled' do
+    shared_examples 'k8s service bindings' do
+      context 'when k8s service bindings are enabled' do
         before do
-          app.update(file_based_service_bindings_enabled: true)
+          app.update(service_binding_k8s_enabled: true)
         end
 
         it 'does not contain vcap_services' do
@@ -28,7 +28,7 @@ module VCAP::CloudController
           expect(system_env_presenter.system_env[:VCAP_SERVICES]).to eq({})
         end
 
-        include_examples 'file-based service bindings'
+        include_examples 'k8s service bindings'
       end
 
       context 'when there are services' do
@@ -173,7 +173,7 @@ module VCAP::CloudController
           end
         end
 
-        include_examples 'file-based service bindings'
+        include_examples 'k8s service bindings'
       end
     end
   end