Add guid for datasource IBM-Cloud#1724 of resource instance and suppr…

…ess error on creating or reading tags
hkantare · Jul 21, 2020 · 38b714b · 38b714b
1 parent 95e0ee0
commit 38b714b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/ibm/data_source_ibm_resource_instance.go b/ibm/data_source_ibm_resource_instance.go
@@ -60,6 +60,13 @@ func dataSourceIBMResourceInstance() *schema.Resource {
 				Computed:    true,
 				Description: "CRN of resource instance",
 			},
+
+			"guid": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Guid of resource instance",
+			},
+
 			ResourceName: {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -193,6 +200,7 @@ func dataSourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{})
 	d.Set(ResourceCRN, instance.Crn.String())
 	d.Set(ResourceStatus, instance.State)
 	d.Set(ResourceGroupName, instance.ResourceGroupName)
+	d.Set("guid", instance.Guid)
 	if len(instance.Extensions) == 0 {
 		d.Set("extensions", instance.Extensions)
 	} else {

diff --git a/ibm/resource_ibm_resource_instance.go b/ibm/resource_ibm_resource_instance.go
@@ -281,8 +281,8 @@ func resourceIBMResourceInstanceCreate(d *schema.ResourceData, meta interface{})
 		oldList, newList := d.GetChange("tags")
 		err = UpdateTagsUsingCRN(oldList, newList, meta, instance.Crn.String())
 		if err != nil {
-			return fmt.Errorf(
-				"Error on create of resource instance tags (%s) tags: %s", d.Id(), err)
+			log.Printf(
+				"Error on create of resource instance (%s) tags: %s", d.Id(), err)
 		}
 	}
 
@@ -304,7 +304,7 @@ func resourceIBMResourceInstanceRead(d *schema.ResourceData, meta interface{}) e
 
 	tags, err := GetTagsUsingCRN(meta, instance.Crn.String())
 	if err != nil {
-		return fmt.Errorf(
+		log.Printf(
 			"Error on get of resource instance tags (%s) tags: %s", d.Id(), err)
 	}
 	d.Set("tags", tags)
@@ -421,7 +421,7 @@ func resourceIBMResourceInstanceUpdate(d *schema.ResourceData, meta interface{})
 		err = UpdateTagsUsingCRN(oldList, newList, meta, instance.Crn.String())
 		if err != nil {
 			log.Printf(
-				"Error on update of resource vpc (%s) tags: %s", d.Id(), err)
+				"Error on update of resource instance (%s) tags: %s", d.Id(), err)
 		}
 	}
 

diff --git a/website/docs/d/resource_instance.html.markdown b/website/docs/d/resource_instance.html.markdown
@@ -46,3 +46,4 @@ The following attributes are exported:
 * `status` - The status of resource instance.
 * `plan` - The plan for the service offering used by this resource instance.
 * `extensions` - The extended metadata as a map associated with the resource instance.
+* `guid`- Guid of the resource instance.