From ba6fbc6b0aaecd0594d73e60402f70dc12715ffe Mon Sep 17 00:00:00 2001
From: Anthony Stanton <anthony.stanton@gmail.com>
Date: Wed, 31 Aug 2016 17:20:08 +0200
Subject: [PATCH] fixup! Support for Librato Alerts and Services

---
 resource_librato_alert.go   | 57 +++++++++----------------------------
 resource_librato_service.go | 25 +++-------------
 2 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/resource_librato_alert.go b/resource_librato_alert.go
index 7f778b5..e8364d8 100644
--- a/resource_librato_alert.go
+++ b/resource_librato_alert.go
@@ -229,49 +229,20 @@ func resourceLibratoAlertRead(d *schema.ResourceData, meta interface{}) error {
 
 func resourceLibratoAlertReadResult(d *schema.ResourceData, alert *librato.Alert) error {
 	d.SetId(strconv.FormatUint(uint64(*alert.ID), 10))
-	if alert.ID != nil {
-		if err := d.Set("id", *alert.ID); err != nil {
-			return err
-		}
-	}
-	if alert.Name != nil {
-		if err := d.Set("name", *alert.Name); err != nil {
-			return err
-		}
-	}
-	if alert.Description != nil {
-		if err := d.Set("description", *alert.Description); err != nil {
-			return err
-		}
-	}
-	if alert.Active != nil {
-		if err := d.Set("active", *alert.Active); err != nil {
-			return err
-		}
-	}
-	if alert.RearmSeconds != nil {
-		if err := d.Set("rearm_seconds", *alert.RearmSeconds); err != nil {
-			return err
-		}
-	}
-	if alert.Services != nil {
-		services := resourceLibratoAlertServicesGather(d, alert.Services.([]interface{}))
-		if err := d.Set("services", services); err != nil {
-			return err
-		}
-	}
-	if alert.Conditions != nil {
-		conditions := resourceLibratoAlertConditionsGather(d, alert.Conditions)
-		if err := d.Set("condition", conditions); err != nil {
-			return err
-		}
-	}
-	if alert.Attributes != nil {
-		attributes := resourceLibratoAlertAttributesGather(d, alert.Attributes)
-		if err := d.Set("attributes", attributes); err != nil {
-			return err
-		}
-	}
+	d.Set("id", *alert.ID)
+	d.Set("name", *alert.Name)
+	d.Set("description", *alert.Description)
+	d.Set("active", *alert.Active)
+	d.Set("rearm_seconds", *alert.RearmSeconds)
+
+	services := resourceLibratoAlertServicesGather(d, alert.Services.([]interface{}))
+	d.Set("services", services)
+
+	conditions := resourceLibratoAlertConditionsGather(d, alert.Conditions)
+	d.Set("condition", conditions)
+
+	attributes := resourceLibratoAlertAttributesGather(d, alert.Attributes)
+	d.Set("attributes", attributes)
 
 	return nil
 }
diff --git a/resource_librato_service.go b/resource_librato_service.go
index c012b63..6556676 100644
--- a/resource_librato_service.go
+++ b/resource_librato_service.go
@@ -138,27 +138,10 @@ func resourceLibratoServiceRead(d *schema.ResourceData, meta interface{}) error
 
 func resourceLibratoServiceReadResult(d *schema.ResourceData, service *librato.Service) error {
 	d.SetId(strconv.FormatUint(uint64(*service.ID), 10))
-	if service.ID != nil {
-		if err := d.Set("id", *service.ID); err != nil {
-			return err
-		}
-	}
-	if service.Type != nil {
-		if err := d.Set("type", *service.Type); err != nil {
-			return err
-		}
-	}
-	if service.Title != nil {
-		if err := d.Set("title", *service.Title); err != nil {
-			return err
-		}
-	}
-	if service.Settings != nil {
-		settings, _ := resourceLibratoServicesFlatten(service.Settings)
-		if err := d.Set("settings", settings); err != nil {
-			return err
-		}
-	}
+	d.Set("id", *service.ID)
+	d.Set("type", *service.Type)
+	d.Set("title", *service.Title)
+	d.Set("settings", settings)
 
 	return nil
 }