Remove service broker name from relationships

pivotal-marcela-campo · pivotal-marcela-campo · commit 3224590e1121 · 2020-04-30T08:51:15.000+01:00
[#172414020](https://www.pivotaltracker.com/story/show/172414020)
diff --git a/app/decorators/field_service_instance_offering_decorator.rb b/app/decorators/field_service_instance_offering_decorator.rb
@@ -28,7 +28,6 @@ def decorate(hash, service_instances)
           offering_view[:relationships] = {
             service_broker: {
               data: {
-                name: offering.service_broker.name,
                 guid: offering.service_broker.guid
               }
             }
diff --git a/app/presenters/v3/service_offering_presenter.rb b/app/presenters/v3/service_offering_presenter.rb
@@ -87,7 +87,6 @@ def build_relationships
           {
             service_broker: {
               data: {
-                name: service_offering.service_broker.name,
                 guid: service_offering.service_broker.guid
               }
             }
diff --git a/docs/v3/source/includes/api_resources/_service_instances.erb b/docs/v3/source/includes/api_resources/_service_instances.erb
@@ -53,8 +53,7 @@
       "relationships": {
         "service_plan": {
           "data": {
-            "guid": "5358d122-638e-11ea-afca-bf6e756684ac",
-            "name": "my-service-plan"
+            "guid": "5358d122-638e-11ea-afca-bf6e756684ac"
           }
         },
         "space": {
@@ -135,8 +134,7 @@
   "relationships": {
     "service_plan": {
       "data": {
-        "guid": "5358d122-638e-11ea-afca-bf6e756684ac",
-        "name": "my-service-plan"
+        "guid": "5358d122-638e-11ea-afca-bf6e756684ac"
       }
     },
     "space": {
diff --git a/docs/v3/source/includes/api_resources/_service_offerings.erb b/docs/v3/source/includes/api_resources/_service_offerings.erb
@@ -26,7 +26,6 @@
   "relationships": {
     "service_broker": {
       "data": {
-        "name": "my_service_broker",
         "guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"
       }
     }
@@ -94,7 +93,6 @@
       "relationships": {
         "service_broker": {
           "data": {
-            "name": "my_service_broker",
             "guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"
           }
         }
@@ -142,7 +140,6 @@
       "relationships": {
         "service_broker": {
           "data": {
-            "name": "my_service_broker",
             "guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"
           }
         }
diff --git a/spec/request/service_instances_spec.rb b/spec/request/service_instances_spec.rb
@@ -402,7 +402,6 @@ def check_filtered_instances(*instances)
               relationships: {
                 service_broker: {
                   data: {
-                    name: msi_1.service_plan.service.service_broker.name,
                     guid: msi_1.service_plan.service.service_broker.guid
                   }
                 }
@@ -414,7 +413,6 @@ def check_filtered_instances(*instances)
               relationships: {
                 service_broker: {
                   data: {
-                    name: msi_2.service_plan.service.service_broker.name,
                     guid: msi_2.service_plan.service.service_broker.guid
                   }
                 }
@@ -426,7 +424,6 @@ def check_filtered_instances(*instances)
               relationships: {
                 service_broker: {
                   data: {
-                    name: ssi.service_plan.service.service_broker.name,
                     guid: ssi.service_plan.service.service_broker.guid
                   }
                 }
diff --git a/spec/request/service_offerings_spec.rb b/spec/request/service_offerings_spec.rb
@@ -1060,7 +1060,6 @@ def create_offering_json(service_offering, labels: {}, annotations: {})
       'relationships' => {
         'service_broker' => {
           'data' => {
-            'name' => service_offering.service_broker.name,
             'guid' => service_offering.service_broker.guid
           }
         }
diff --git a/spec/unit/decorators/field_service_instance_offering_decorator_spec.rb b/spec/unit/decorators/field_service_instance_offering_decorator_spec.rb
@@ -72,7 +72,6 @@ module VCAP::CloudController
                 relationships: {
                   service_broker: {
                     data: {
-                      name: offering1.service_broker.name,
                       guid: offering1.service_broker.guid
                     }
                   }
@@ -82,7 +81,6 @@ module VCAP::CloudController
                 relationships: {
                   service_broker: {
                     data: {
-                      name: offering2.service_broker.name,
                       guid: offering2.service_broker.guid
                     }
                   }
diff --git a/spec/unit/presenters/v3/service_offering_presenter_spec.rb b/spec/unit/presenters/v3/service_offering_presenter_spec.rb
@@ -110,7 +110,6 @@
         'relationships': {
           'service_broker': {
             'data': {
-              'name': service_broker.name,
               'guid': service_broker.guid
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ def decorate(hash, service_instances)`
`28`	`28`	`offering_view[:relationships] = {`
`29`	`29`	`service_broker: {`
`30`	`30`	`data: {`
`31`		`- name: offering.service_broker.name,`
`32`	`31`	`guid: offering.service_broker.guid`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ def build_relationships`
`87`	`87`	`{`
`88`	`88`	`service_broker: {`
`89`	`89`	`data: {`
`90`		`- name: service_offering.service_broker.name,`
`91`	`90`	`guid: service_offering.service_broker.guid`
`92`	`91`	`}`
`93`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`"relationships": {`
`27`	`27`	`"service_broker": {`
`28`	`28`	`"data": {`
`29`		`- "name": "my_service_broker",`
`30`	`29`	`"guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"`
`31`	`30`	`}`
`32`	`31`	`}`
`@@ -94,7 +93,6 @@`
`94`	`93`	`"relationships": {`
`95`	`94`	`"service_broker": {`
`96`	`95`	`"data": {`
`97`		`- "name": "my_service_broker",`
`98`	`96`	`"guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"`
`99`	`97`	`}`
`100`	`98`	`}`
`@@ -142,7 +140,6 @@`
`142`	`140`	`"relationships": {`
`143`	`141`	`"service_broker": {`
`144`	`142`	`"data": {`
`145`		`- "name": "my_service_broker",`
`146`	`143`	`"guid": "13c60e38-11e7-11ea-9106-33ee3c5bd4d7"`
`147`	`144`	`}`
`148`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,6 @@ def check_filtered_instances(*instances)`
`402`	`402`	`relationships: {`
`403`	`403`	`service_broker: {`
`404`	`404`	`data: {`
`405`		`- name: msi_1.service_plan.service.service_broker.name,`
`406`	`405`	`guid: msi_1.service_plan.service.service_broker.guid`
`407`	`406`	`}`
`408`	`407`	`}`
`@@ -414,7 +413,6 @@ def check_filtered_instances(*instances)`
`414`	`413`	`relationships: {`
`415`	`414`	`service_broker: {`
`416`	`415`	`data: {`
`417`		`- name: msi_2.service_plan.service.service_broker.name,`
`418`	`416`	`guid: msi_2.service_plan.service.service_broker.guid`
`419`	`417`	`}`
`420`	`418`	`}`
`@@ -426,7 +424,6 @@ def check_filtered_instances(*instances)`
`426`	`424`	`relationships: {`
`427`	`425`	`service_broker: {`
`428`	`426`	`data: {`
`429`		`- name: ssi.service_plan.service.service_broker.name,`
`430`	`427`	`guid: ssi.service_plan.service.service_broker.guid`
`431`	`428`	`}`
`432`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,6 @@ def create_offering_json(service_offering, labels: {}, annotations: {})`
`1060`	`1060`	`'relationships' => {`
`1061`	`1061`	`'service_broker' => {`
`1062`	`1062`	`'data' => {`
`1063`		`- 'name' => service_offering.service_broker.name,`
`1064`	`1063`	`'guid' => service_offering.service_broker.guid`
`1065`	`1064`	`}`
`1066`	`1065`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ module VCAP::CloudController`
`72`	`72`	`relationships: {`
`73`	`73`	`service_broker: {`
`74`	`74`	`data: {`
`75`		`- name: offering1.service_broker.name,`
`76`	`75`	`guid: offering1.service_broker.guid`
`77`	`76`	`}`
`78`	`77`	`}`
`@@ -82,7 +81,6 @@ module VCAP::CloudController`
`82`	`81`	`relationships: {`
`83`	`82`	`service_broker: {`
`84`	`83`	`data: {`
`85`		`- name: offering2.service_broker.name,`
`86`	`84`	`guid: offering2.service_broker.guid`
`87`	`85`	`}`
`88`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@`
`110`	`110`	`'relationships': {`
`111`	`111`	`'service_broker': {`
`112`	`112`	`'data': {`
`113`		`- 'name': service_broker.name,`
`114`	`113`	`'guid': service_broker.guid`
`115`	`114`	`}`
`116`	`115`	`}`