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

Author: svkrieger

app/actions/app_feature_update.rb

@@ -6,8 +6,8 @@ def self.update(feature_name, app, message)
         app.update(enable_ssh: message.enabled)
       when 'revisions'
         app.update(revisions_enabled: message.enabled)
-      when 'file-based-service-bindings'
-        app.update(file_based_service_bindings_enabled: message.enabled)
+      when 'service-binding-k8s'
+        app.update(service_binding_k8s_enabled: message.enabled)
       end
     end
   end

app/controllers/v3/app_features_controller.rb

@@ -2,7 +2,7 @@
 require 'controllers/v3/mixins/app_sub_resource'
 require 'presenters/v3/app_ssh_feature_presenter'
 require 'presenters/v3/app_revisions_feature_presenter'
-require 'presenters/v3/app_file_based_service_bindings_feature_presenter'
+require 'presenters/v3/app_service_binding_k8s_feature_presenter'
 require 'presenters/v3/app_ssh_status_presenter'
 require 'actions/app_feature_update'
 
@@ -11,9 +11,9 @@ class AppFeaturesController < ApplicationController
 
   SSH_FEATURE = 'ssh'.freeze
   REVISIONS_FEATURE = 'revisions'.freeze
-  FILE_BASED_SERVICE_BINDINGS_FEATURE = 'file-based-service-bindings'.freeze
+  SERVICE_BINDING_K8S_FEATURE = 'service-binding-k8s'.freeze
 
-  TRUSTED_APP_FEATURES = [SSH_FEATURE, FILE_BASED_SERVICE_BINDINGS_FEATURE].freeze
+  TRUSTED_APP_FEATURES = [SSH_FEATURE, SERVICE_BINDING_K8S_FEATURE].freeze
   UNTRUSTED_APP_FEATURES = [REVISIONS_FEATURE].freeze
   APP_FEATURES = (TRUSTED_APP_FEATURES + UNTRUSTED_APP_FEATURES).freeze
 
@@ -83,7 +83,7 @@ def feature_presenter_for(feature_name, app)
     presenters = {
       SSH_FEATURE => Presenters::V3::AppSshFeaturePresenter,
       REVISIONS_FEATURE => Presenters::V3::AppRevisionsFeaturePresenter,
-      FILE_BASED_SERVICE_BINDINGS_FEATURE => Presenters::V3::AppFileBasedServiceBindingsFeaturePresenter
+      SERVICE_BINDING_K8S_FEATURE => Presenters::V3::AppServiceBindingK8sFeaturePresenter
     }
     presenters[feature_name].new(app)
   end
@@ -92,7 +92,7 @@ def presented_app_features(app)
     [
       Presenters::V3::AppSshFeaturePresenter.new(app),
       Presenters::V3::AppRevisionsFeaturePresenter.new(app),
-      Presenters::V3::AppFileBasedServiceBindingsFeaturePresenter.new(app)
+      Presenters::V3::AppServiceBindingK8sFeaturePresenter.new(app)
     ]
   end
 end

app/presenters/v3/app_file_based_service_bindings_feature_presenter.rb

@@ -0,0 +1,19 @@
+require 'presenters/v3/base_presenter'
+
+module VCAP::CloudController::Presenters::V3
+  class AppServiceBindingK8sFeaturePresenter < BasePresenter
+    def to_hash
+      {
+        name: 'service-binding-k8s',
+        description: 'Enable k8s service bindings for the app',
+        enabled: app.service_binding_k8s_enabled
+      }
+    end
+
+    private
+
+    def app
+      @resource
+    end
+  end
+end

app/presenters/v3/app_service_binding_k8s_feature_presenter.rb

@@ -20,8 +20,8 @@
       "enabled": false
     },
     {
-      "name": "file-based-service-bindings",
-      "description": "Enable file-based service bindings for the app",
+      "name": "service-binding-k8s",
+      "description": "Enable k8s service bindings for the app",
       "enabled": false
     }
   ],

docs/v3/source/includes/api_resources/_app_features.erb

@@ -6,4 +6,4 @@ Name | Description
 ---- | -----------
 **ssh** | Enable SSHing into the app
 **revisions** | Enable [versioning](#revisions) of an application
-**file-based-service-bindings** | Enable file-based service bindings for the app (experimental)
+**service-binding-k8s** | Enable k8s service bindings for the app (experimental)

docs/v3/source/includes/resources/app_features/_supported_features.md.erb

@@ -7,7 +7,7 @@
   let(:admin_header) { admin_headers_for(user) }
   let(:org) { VCAP::CloudController::Organization.make(created_at: 3.days.ago) }
   let(:space) { VCAP::CloudController::Space.make(organization: org) }
-  let(:app_model) { VCAP::CloudController::AppModel.make(space: space, enable_ssh: true, file_based_service_bindings_enabled: true) }
+  let(:app_model) { VCAP::CloudController::AppModel.make(space: space, enable_ssh: true, service_binding_k8s_enabled: true) }
 
   describe 'GET /v3/apps/:guid/features' do
     context 'getting a list of available features for the app' do
@@ -26,8 +26,8 @@
               'enabled' => true
             },
             {
-              'name' => 'file-based-service-bindings',
-              'description' => 'Enable file-based service bindings for the app',
+              'name' => 'service-binding-k8s',
+              'description' => 'Enable k8s service bindings for the app',
               'enabled' => true
             }
           ],
@@ -100,12 +100,12 @@
       it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS
     end
 
-    context 'file-based-service-bindings app feature' do
-      let(:api_call) { ->(user_headers) { get "/v3/apps/#{app_model.guid}/features/file-based-service-bindings", nil, user_headers } }
+    context 'service-binding-k8s app feature' do
+      let(:api_call) { ->(user_headers) { get "/v3/apps/#{app_model.guid}/features/service-binding-k8s", nil, user_headers } }
       let(:feature_response_object) do
         {
-          'name' => 'file-based-service-bindings',
-          'description' => 'Enable file-based service bindings for the app',
+          'name' => 'service-binding-k8s',
+          'description' => 'Enable k8s service bindings for the app',
           'enabled' => true
         }
       end
@@ -191,12 +191,12 @@
       end
     end
 
-    context 'file-based-service-bindings app feature' do
-      let(:api_call) { ->(user_headers) { patch "/v3/apps/#{app_model.guid}/features/file-based-service-bindings", request_body.to_json, user_headers } }
+    context 'service-binding-k8s app feature' do
+      let(:api_call) { ->(user_headers) { patch "/v3/apps/#{app_model.guid}/features/service-binding-k8s", request_body.to_json, user_headers } }
       let(:feature_response_object) do
         {
-          'name' => 'file-based-service-bindings',
-          'description' => 'Enable file-based service bindings for the app',
+          'name' => 'service-binding-k8s',
+          'description' => 'Enable k8s service bindings for the app',
           'enabled' => false
         }
       end

spec/request/app_features_spec.rb

@@ -25,11 +25,11 @@ module VCAP::CloudController
         end
       end
 
-      context 'when the feature name is file-based-service-bindings' do
-        it 'updates the file_based_service_bindings_enabled column on the app' do
+      context 'when the feature name is service-binding-k8s' do
+        it 'updates the service_binding_k8s_enabled column on the app' do
           expect do
-            AppFeatureUpdate.update('file-based-service-bindings', app, message)
-          end.to change { app.reload.file_based_service_bindings_enabled }.to(true)
+            AppFeatureUpdate.update('service-binding-k8s', app, message)
+          end.to change { app.reload.service_binding_k8s_enabled }.to(true)
         end
       end
     end

spec/unit/actions/app_feature_update_spec.rb

@@ -4,14 +4,14 @@
 ## NOTICE: Prefer request specs over controller specs as per ADR #0003 ##
 
 RSpec.describe AppFeaturesController, type: :controller do
-  let(:app_model) { VCAP::CloudController::AppModel.make(enable_ssh: true, file_based_service_bindings_enabled: true) }
+  let(:app_model) { VCAP::CloudController::AppModel.make(enable_ssh: true, service_binding_k8s_enabled: true) }
   let(:space) { app_model.space }
   let(:org) { space.organization }
   let(:user) { VCAP::CloudController::User.make }
   let(:app_feature_ssh_response) { { 'name' => 'ssh', 'description' => 'Enable SSHing into the app.', 'enabled' => true } }
   let(:app_feature_revisions_response) { { 'name' => 'revisions', 'description' => 'Enable versioning of an application', 'enabled' => true } }
-  let(:app_feature_file_based_service_bindings_response) do
-    { 'name' => 'file-based-service-bindings', 'description' => 'Enable file-based service bindings for the app', 'enabled' => true }
+  let(:app_feature_service_binding_k8s_response) do
+    { 'name' => 'service-binding-k8s', 'description' => 'Enable k8s service bindings for the app', 'enabled' => true }
   end
 
   before do
@@ -42,7 +42,7 @@
     it 'returns app features' do
       get :index, params: { app_guid: app_model.guid }
       expect(parsed_body).to eq(
-        'resources' => [app_feature_ssh_response, app_feature_revisions_response, app_feature_file_based_service_bindings_response],
+        'resources' => [app_feature_ssh_response, app_feature_revisions_response, app_feature_service_binding_k8s_response],
         'pagination' => pagination_hash
       )
     end
@@ -70,9 +70,9 @@
       expect(parsed_body).to eq(app_feature_revisions_response)
     end
 
-    it 'returns the file-based-service-bindings app feature' do
-      get :show, params: { app_guid: app_model.guid, name: 'file-based-service-bindings' }
-      expect(parsed_body).to eq(app_feature_file_based_service_bindings_response)
+    it 'returns the service-binding-k8s app feature' do
+      get :show, params: { app_guid: app_model.guid, name: 'service-binding-k8s' }
+      expect(parsed_body).to eq(app_feature_service_binding_k8s_response)
     end
 
     it 'throws 404 for a non-existent feature' do

spec/unit/controllers/v3/app_features_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'presenters/v3/app_ssh_feature_presenter'
-require 'presenters/v3/app_file_based_service_bindings_feature_presenter'
+require 'presenters/v3/app_service_binding_k8s_feature_presenter'
 
 module VCAP::CloudController::Presenters::V3
   RSpec.describe AppSshFeaturePresenter do
@@ -16,15 +16,15 @@ module VCAP::CloudController::Presenters::V3
     end
   end
 
-  RSpec.describe AppFileBasedServiceBindingsFeaturePresenter do
+  RSpec.describe AppServiceBindingK8sFeaturePresenter do
     let(:app) { VCAP::CloudController::AppModel.make }
 
     describe '#to_hash' do
       it 'presents the app feature as json' do
-        result = AppFileBasedServiceBindingsFeaturePresenter.new(app).to_hash
-        expect(result[:name]).to eq('file-based-service-bindings')
-        expect(result[:description]).to eq('Enable file-based service bindings for the app')
-        expect(result[:enabled]).to eq(app.file_based_service_bindings_enabled)
+        result = AppServiceBindingK8sFeaturePresenter.new(app).to_hash
+        expect(result[:name]).to eq('service-binding-k8s')
+        expect(result[:description]).to eq('Enable k8s service bindings for the app')
+        expect(result[:enabled]).to eq(app.service_binding_k8s_enabled)
       end
     end
   end