v3(service instance) Add links to bindings (cloudfoundry#1898)

Derik Evangelista · web-flow · commit 48088ccafd8b · 2020-10-12T16:52:37.000+01:00
[#174085807](https://www.pivotaltracker.com/story/show/174085807) [#174085821](https://www.pivotaltracker.com/story/show/174085821)
diff --git a/app/presenters/v3/service_instance_presenter.rb b/app/presenters/v3/service_instance_presenter.rb
@@ -47,6 +47,18 @@ def hash_common
               },
               space: {
                 href: url_builder.build_url(path: "/v3/spaces/#{service_instance.space.guid}")
+              },
+              service_credential_bindings: {
+                href: url_builder.build_url(
+                  path: '/v3/service_credential_bindings',
+                  query: "service_instance_guids=#{service_instance.guid}"
+                )
+              },
+              service_route_bindings: {
+                href: url_builder.build_url(
+                  path: '/v3/service_route_bindings',
+                  query: "service_instance_guids=#{service_instance.guid}"
+                )
               }
             }
           }
diff --git a/docs/v3/source/includes/api_resources/_service_instances.erb b/docs/v3/source/includes/api_resources/_service_instances.erb
@@ -78,6 +78,12 @@
         },
         "parameters": {
           "href": "https://api.example.org/v3/service_instances/c89b3280-fe8d-4aa0-a42e-44465bb1c61c/parameters"
+        },
+        "service_credential_bindings": {
+          "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"
+        },
+        "service_route_bindings": {
+          "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"
         }
       }
     },
@@ -107,6 +113,15 @@
         },
         "space": {
           "href": "https://api.example.org/v3/spaces/5a84d315-9513-4d74-95e5-f6a5501eeef7"
+        },
+        "credentials": {
+          "href": "https://api.example.org/v3/service_instances/88ce23e5-27c3-4381-a2df-32a28ec43133/credentials"
+        },
+        "service_credential_bindings": {
+          "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"
+        },
+        "service_route_bindings": {
+          "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"
         }
       }
     }
@@ -162,6 +177,12 @@
     },
     "parameters": {
       "href": "https://api.example.org/v3/service_instances/c89b3280-fe8d-4aa0-a42e-44465bb1c61c/parameters"
+    },
+    "service_credential_bindings": {
+      "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"
+    },
+    "service_route_bindings": {
+      "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"
     }
   }
 }
@@ -194,6 +215,15 @@
     },
     "space": {
       "href": "https://api.example.org/v3/spaces/5a84d315-9513-4d74-95e5-f6a5501eeef7"
+    },
+    "credentials": {
+      "href": "https://api.example.org/v3/service_instances/88ce23e5-27c3-4381-a2df-32a28ec43133/credentials"
+    },
+    "service_credential_bindings": {
+      "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"
+    },
+    "service_route_bindings": {
+      "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"
     }
   }
 }
diff --git a/spec/request/service_instances_spec.rb b/spec/request/service_instances_spec.rb
@@ -3815,6 +3815,12 @@ def create_managed_json(instance, labels: {}, annotations: {}, last_operation: {
         parameters: {
           href: "#{link_prefix}/v3/service_instances/#{instance.guid}/parameters"
         },
+        service_credential_bindings: {
+          href: "#{link_prefix}/v3/service_credential_bindings?service_instance_guids=#{instance.guid}"
+        },
+        service_route_bindings: {
+          href: "#{link_prefix}/v3/service_route_bindings?service_instance_guids=#{instance.guid}"
+        }
       },
     }
   end
@@ -3849,6 +3855,12 @@ def create_user_provided_json(instance, labels: {}, annotations: {})
         },
         credentials: {
           href: "#{link_prefix}/v3/service_instances/#{instance.guid}/credentials"
+        },
+        service_credential_bindings: {
+          href: "#{link_prefix}/v3/service_credential_bindings?service_instance_guids=#{instance.guid}"
+        },
+        service_route_bindings: {
+          href: "#{link_prefix}/v3/service_route_bindings?service_instance_guids=#{instance.guid}"
         }
       },
     }
diff --git a/spec/unit/presenters/v3/service_instance_presenter_spec.rb b/spec/unit/presenters/v3/service_instance_presenter_spec.rb
@@ -95,6 +95,12 @@ module VCAP::CloudController::Presenters::V3
             },
             parameters: {
               href: "#{link_prefix}/v3/service_instances/#{service_instance.guid}/parameters"
+            },
+            service_credential_bindings: {
+              href: "#{link_prefix}/v3/service_credential_bindings?service_instance_guids=#{service_instance.guid}"
+            },
+            service_route_bindings: {
+              href: "#{link_prefix}/v3/service_route_bindings?service_instance_guids=#{service_instance.guid}"
             }
           }
         })
@@ -204,6 +210,12 @@ module VCAP::CloudController::Presenters::V3
             },
             credentials: {
               href: "#{link_prefix}/v3/service_instances/#{service_instance.guid}/credentials"
+            },
+            service_credential_bindings: {
+              href: "#{link_prefix}/v3/service_credential_bindings?service_instance_guids=#{service_instance.guid}"
+            },
+            service_route_bindings: {
+              href: "#{link_prefix}/v3/service_route_bindings?service_instance_guids=#{service_instance.guid}"
             }
           }
         })

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,18 @@ def hash_common`
`47`	`47`	`},`
`48`	`48`	`space: {`
`49`	`49`	`href: url_builder.build_url(path: "/v3/spaces/#{service_instance.space.guid}")`
	`50`	`+ },`
	`51`	`+ service_credential_bindings: {`
	`52`	`+ href: url_builder.build_url(`
	`53`	`+ path: '/v3/service_credential_bindings',`
	`54`	`+ query: "service_instance_guids=#{service_instance.guid}"`
	`55`	`+ )`
	`56`	`+ },`
	`57`	`+ service_route_bindings: {`
	`58`	`+ href: url_builder.build_url(`
	`59`	`+ path: '/v3/service_route_bindings',`
	`60`	`+ query: "service_instance_guids=#{service_instance.guid}"`
	`61`	`+ )`
`50`	`62`	`}`
`51`	`63`	`}`
`52`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,12 @@`
`78`	`78`	`},`
`79`	`79`	`"parameters": {`
`80`	`80`	`"href": "https://api.example.org/v3/service_instances/c89b3280-fe8d-4aa0-a42e-44465bb1c61c/parameters"`
	`81`	`+ },`
	`82`	`+ "service_credential_bindings": {`
	`83`	`+ "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"`
	`84`	`+ },`
	`85`	`+ "service_route_bindings": {`
	`86`	`+ "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"`
`81`	`87`	`}`
`82`	`88`	`}`
`83`	`89`	`},`
`@@ -107,6 +113,15 @@`
`107`	`113`	`},`
`108`	`114`	`"space": {`
`109`	`115`	`"href": "https://api.example.org/v3/spaces/5a84d315-9513-4d74-95e5-f6a5501eeef7"`
	`116`	`+ },`
	`117`	`+ "credentials": {`
	`118`	`+ "href": "https://api.example.org/v3/service_instances/88ce23e5-27c3-4381-a2df-32a28ec43133/credentials"`
	`119`	`+ },`
	`120`	`+ "service_credential_bindings": {`
	`121`	`+ "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"`
	`122`	`+ },`
	`123`	`+ "service_route_bindings": {`
	`124`	`+ "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"`
`110`	`125`	`}`
`111`	`126`	`}`
`112`	`127`	`}`
`@@ -162,6 +177,12 @@`
`162`	`177`	`},`
`163`	`178`	`"parameters": {`
`164`	`179`	`"href": "https://api.example.org/v3/service_instances/c89b3280-fe8d-4aa0-a42e-44465bb1c61c/parameters"`
	`180`	`+ },`
	`181`	`+ "service_credential_bindings": {`
	`182`	`+ "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"`
	`183`	`+ },`
	`184`	`+ "service_route_bindings": {`
	`185`	`+ "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=c89b3280-fe8d-4aa0-a42e-44465bb1c61c"`
`165`	`186`	`}`
`166`	`187`	`}`
`167`	`188`	`}`
`@@ -194,6 +215,15 @@`
`194`	`215`	`},`
`195`	`216`	`"space": {`
`196`	`217`	`"href": "https://api.example.org/v3/spaces/5a84d315-9513-4d74-95e5-f6a5501eeef7"`
	`218`	`+ },`
	`219`	`+ "credentials": {`
	`220`	`+ "href": "https://api.example.org/v3/service_instances/88ce23e5-27c3-4381-a2df-32a28ec43133/credentials"`
	`221`	`+ },`
	`222`	`+ "service_credential_bindings": {`
	`223`	`+ "href": "https://api.example.org/v3/service_credential_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"`
	`224`	`+ },`
	`225`	`+ "service_route_bindings": {`
	`226`	`+ "href": "https://api.example.org/v3/service_route_bindings?service_instance_guids=88ce23e5-27c3-4381-a2df-32a28ec43133"`
`197`	`227`	`}`
`198`	`228`	`}`
`199`	`229`	`}`