Remove transformation of VCAP_SERVICES attributes in k8s bindings (#4542)

This is not needed as per #4525 (comment)

Signed-off-by: Tom Kennedy <[email protected]>

Author: tomkennedy513

lib/cloud_controller/diego/service_binding_files_builder.rb

@@ -51,8 +51,7 @@ def build_service_binding_k8s
           sb_hash.delete(:credentials)&.each { |k, v| total_bytesize += add_file(service_binding_files, name, k.to_s, v) }
 
           # add the rest of the hash; already existing credential keys are overwritten
-          # VCAP_SERVICES attribute names are transformed (e.g. binding_guid -> binding-guid)
-          sb_hash.each { |k, v| total_bytesize += add_file(service_binding_files, name, transform_vcap_services_attribute(k.to_s), v) }
+          sb_hash.each { |k, v| total_bytesize += add_file(service_binding_files, name, k.to_s, v) }
 
           # add the type and provider
           label = sb_hash[:label]
@@ -114,14 +113,6 @@ def valid_binding_name?(name)
       def valid_file_name?(name)
         name.match?(file_naming_convention)
       end
-
-      def transform_vcap_services_attribute(name)
-        if %w[binding_guid binding_name instance_guid instance_name syslog_drain_url volume_mounts].include?(name)
-          name.tr('_', '-')
-        else
-          name
-        end
-      end
     end
   end
 end

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

@@ -12,9 +12,9 @@ module VCAP::CloudController::Diego
 
   RSpec.shared_examples 'mapping of binding metadata' do |name|
     it 'maps service binding metadata attributes to files' do
-      expect(service_binding_files.find { |f| f.path == "#{directory}/binding-guid" }).to have_attributes(content: binding.guid)
+      expect(service_binding_files.find { |f| f.path == "#{directory}/binding_guid" }).to have_attributes(content: binding.guid)
       expect(service_binding_files.find { |f| f.path == "#{directory}/name" }).to have_attributes(content: name || 'binding-name')
-      expect(service_binding_files.find { |f| f.path == "#{directory}/binding-name" }).to have_attributes(content: 'binding-name') if name.nil?
+      expect(service_binding_files.find { |f| f.path == "#{directory}/binding_name" }).to have_attributes(content: 'binding-name') if name.nil?
     end
 
     context 'when there are multiple bindings with the same name for the same app and service instance' do
@@ -48,8 +48,8 @@ module VCAP::CloudController::Diego
 
   RSpec.shared_examples 'mapping of instance metadata' do |instance_name|
     it 'maps service instance metadata attributes to files' do
-      expect(service_binding_files.find { |f| f.path == "#{directory}/instance-guid" }).to have_attributes(content: instance.guid)
-      expect(service_binding_files.find { |f| f.path == "#{directory}/instance-name" }).to have_attributes(content: instance_name || 'instance-name')
+      expect(service_binding_files.find { |f| f.path == "#{directory}/instance_guid" }).to have_attributes(content: instance.guid)
+      expect(service_binding_files.find { |f| f.path == "#{directory}/instance_name" }).to have_attributes(content: instance_name || 'instance-name')
     end
   end
 
@@ -166,7 +166,7 @@ module VCAP::CloudController::Diego
             expect(service_binding_files).not_to include(have_attributes(path: 'binding-name/volume_mounts'))
           end
 
-          include_examples 'expected files', %w[type provider label binding-guid name binding-name instance-guid instance-name plan tags string number boolean array hash]
+          include_examples 'expected files', %w[type provider label binding_guid name binding_name instance_guid instance_name plan tags string number boolean array hash]
 
           context 'when binding_name is nil' do
             let(:binding_name) { nil }
@@ -179,14 +179,14 @@ module VCAP::CloudController::Diego
             include_examples 'mapping of tags'
             include_examples 'mapping of credentials'
 
-            include_examples 'expected files', %w[type provider label binding-guid name instance-guid instance-name plan tags string number boolean array hash]
+            include_examples 'expected files', %w[type provider label binding_guid name instance_guid instance_name plan tags string number boolean array hash]
           end
 
           context 'when syslog_drain_url is set' do
             let(:syslog_drain_url) { 'https://syslog.drain' }
 
             it 'maps the attribute to a file' do
-              expect(service_binding_files.find { |f| f.path == 'binding-name/syslog-drain-url' }).to have_attributes(content: 'https://syslog.drain')
+              expect(service_binding_files.find { |f| f.path == 'binding-name/syslog_drain_url' }).to have_attributes(content: 'https://syslog.drain')
             end
 
             include_examples 'mapping of type and provider'
@@ -197,7 +197,7 @@ module VCAP::CloudController::Diego
             include_examples 'mapping of credentials'
 
             include_examples 'expected files',
-                             %w[type provider label binding-guid name binding-name instance-guid instance-name plan tags string number boolean array hash syslog-drain-url]
+                             %w[type provider label binding_guid name binding_name instance_guid instance_name plan tags string number boolean array hash syslog_drain_url]
           end
 
           context 'when volume_mounts is set' do
@@ -217,7 +217,7 @@ module VCAP::CloudController::Diego
 
             it 'maps the attribute to a file' do
               expect(service_binding_files.find do |f|
-                f.path == 'binding-name/volume-mounts'
+                f.path == 'binding-name/volume_mounts'
               end).to have_attributes(content: '[{"container_dir":"dir1","device_type":"type1","mode":"mode1"},{"container_dir":"dir2","device_type":"type2","mode":"mode2"}]')
             end
 
@@ -229,7 +229,7 @@ module VCAP::CloudController::Diego
             include_examples 'mapping of credentials'
 
             include_examples 'expected files',
-                             %w[type provider label binding-guid name binding-name instance-guid instance-name plan tags string number boolean array hash volume-mounts]
+                             %w[type provider label binding_guid name binding_name instance_guid instance_name plan tags string number boolean array hash volume_mounts]
           end
 
           context 'when the instance is user-provided' do
@@ -241,7 +241,7 @@ module VCAP::CloudController::Diego
             include_examples 'mapping of tags', '["an-upsi-tag","another-upsi-tag"]'
             include_examples 'mapping of credentials'
 
-            include_examples 'expected files', %w[type provider label binding-guid name binding-name instance-guid instance-name tags string number boolean array hash]
+            include_examples 'expected files', %w[type provider label binding_guid name binding_name instance_guid instance_name tags string number boolean array hash]
           end
 
           context 'when there are duplicate keys at different levels' do
@@ -254,7 +254,7 @@ module VCAP::CloudController::Diego
             include_examples 'mapping of tags'
             include_examples 'mapping of credentials', { credentials: '{"password":"secret"}' }
 
-            include_examples 'expected files', %w[type provider label binding-guid name binding-name instance-guid instance-name plan tags credentials]
+            include_examples 'expected files', %w[type provider label binding_guid name binding_name instance_guid instance_name plan tags credentials]
           end
 
           context 'when there are duplicate binding names' do