Expose space guid on the schema to target specific space

ibm-vpc · Jun 27, 2017 · 068aad5 · 068aad5
1 parent 81601fa
commit 068aad5
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 3 deletions.
diff --git a/ibm/data_source_ibm_service_instance.go b/ibm/data_source_ibm_service_instance.go
@@ -17,6 +17,12 @@ func dataSourceIBMServiceInstance() *schema.Resource {
 				Required:    true,
 			},
 
+			"space_guid": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "The guid of the space in which the instance is present",
+			},
+
 			"credentials": {
 				Description: "The service broker-provided credentials to use this service.",
 				Type:        schema.TypeMap,
@@ -61,7 +67,8 @@ func dataSourceIBMServiceInstanceRead(d *schema.ResourceData, meta interface{})
 	}
 	siAPI := cfClient.ServiceInstances()
 	name := d.Get("name").(string)
-	inst, err := siAPI.FindByName(name)
+	spaceGUID := d.Get("space_guid").(string)
+	inst, err := siAPI.FindByNameInSpace(spaceGUID, name)
 	if err != nil {
 		return err
 	}

diff --git a/ibm/data_source_ibm_service_instance_test.go b/ibm/data_source_ibm_service_instance_test.go
@@ -82,6 +82,7 @@ resource "ibm_service_key" "servicekey" {
 
 data "ibm_service_instance" "testacc_ds_service_instance" {
   name = "${ibm_service_instance.service.name}"
+	space_guid = "${data.ibm_space.spacedata.id}"
 }
 `, cfOrganization, cfSpace, serviceName, serviceKey)
 

diff --git a/ibm/data_source_ibm_service_key.go b/ibm/data_source_ibm_service_key.go
@@ -17,7 +17,6 @@ func dataSourceIBMServiceKey() *schema.Resource {
 				Type:        schema.TypeMap,
 				Computed:    true,
 			},
-
 			"name": {
 				Description: "The name of the service key",
 				Type:        schema.TypeString,
@@ -28,6 +27,11 @@ func dataSourceIBMServiceKey() *schema.Resource {
 				Type:        schema.TypeString,
 				Required:    true,
 			},
+			"space_guid": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "The guid of the space in which the service instance is present",
+			},
 		},
 	}
 }
@@ -40,8 +44,9 @@ func dataSourceIBMServiceKeyRead(d *schema.ResourceData, meta interface{}) error
 	siAPI := cfClient.ServiceInstances()
 	skAPI := cfClient.ServiceKeys()
 	serviceInstanceName := d.Get("service_instance_name").(string)
+	spaceGUID := d.Get("space_guid").(string)
 	name := d.Get("name").(string)
-	inst, err := siAPI.FindByName(serviceInstanceName)
+	inst, err := siAPI.FindByNameInSpace(spaceGUID, serviceInstanceName)
 	if err != nil {
 		return err
 	}

diff --git a/ibm/data_source_ibm_service_key_test.go b/ibm/data_source_ibm_service_key_test.go
@@ -50,6 +50,7 @@ resource "ibm_service_key" "servicekey" {
 data "ibm_service_key" "testacc_ds_service_key" {
   name                  = "${ibm_service_key.servicekey.name}"
   service_instance_name = "${ibm_service_instance.service.name}"
+	space_guid = "${data.ibm_space.spacedata.id}"
 }`, cfOrganization, cfSpace, serviceName, serviceKey)
 
 }
diff --git a/website/docs/d/service_instance.html.markdown b/website/docs/d/service_instance.html.markdown
@@ -13,8 +13,14 @@ Import the details of an existing IBM service instance from IBM Bluemix as a rea
 ## Example Usage
 
 ```hcl
+data "ibm_space" "space" {
+  org   = "example.com"
+  space = "dev"
+}
+
 data "ibm_service_instance" "serviceInstance" {
   name = "mycloudantdb"
+  space_guid   = "${data.ibm_space.space.id}"
 }
 ```
 
@@ -24,6 +30,8 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the service instance. The value can be retrieved by running the `bx service list` command in the [Bluemix CLI](https://console.ng.bluemix.net/docs/cli/reference/bluemix_cli/index.html#getting-started).
 
+* `space_guid` - (Required, string) The GUID of the space where the service instance exists. The values can be retrieved from data source `ibm_space`.
+
 ## Attributes Reference
 
 The following attributes are exported:

diff --git a/website/docs/d/service_key.html.markdown b/website/docs/d/service_key.html.markdown
@@ -13,9 +13,15 @@ Import the details of an existing IBM service key from IBM Bluemix as a read-onl
 ## Example Usage
 
 ```hcl
+data "ibm_space" "space" {
+  org   = "example.com"
+  space = "dev"
+}
+
 data "ibm_service_key" "serviceKeydata" {
   name                  = "mycloudantdbKey"
   service_instance_name = "mycloudantdb"
+  space_guid   = "${data.ibm_space.space.id}"
 }
 ```
 
@@ -25,6 +31,7 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the service key. The value can be retrieved by running the `bx service keys` command in the [Bluemix CLI](https://console.ng.bluemix.net/docs/cli/reference/bluemix_cli/index.html#getting-started).
 * `service_instance_name` - (Required) The name of the service instance that the service key is associated with. The value can be retrieved by running the `bx service list` command in the Bluemix CLI.
+* `space_guid` - (Required, string) The GUID of the space where the service instance exists. The values can be retrieved from data source `ibm_space`.
 
 ## Attributes Reference