Merge pull request grafana#87 from 58231/master

Author: tonglil

go.mod

@@ -3,5 +3,5 @@ module github.com/terraform-providers/terraform-provider-grafana
 require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/terraform v0.12.2
-	github.com/nytm/go-grafana-api v0.3.1
+	github.com/nytm/go-grafana-api v0.5.0
 )

go.sum

@@ -300,6 +300,8 @@ github.com/nytm/go-grafana-api v0.2.0 h1:Aa5h2zMKDGjY1gS0bfesAfwSeRdTZG1GF8it+Nk
 github.com/nytm/go-grafana-api v0.2.0/go.mod h1:YOJL2MOLAmCeqz0cbHU9tZIDj0OxpOiIFKSJXRbAorY=
 github.com/nytm/go-grafana-api v0.3.1 h1:UMQYx88ZIpAxW2GunD2JgNve4QJt/T31PQXIyEtxzEs=
 github.com/nytm/go-grafana-api v0.3.1/go.mod h1:YOJL2MOLAmCeqz0cbHU9tZIDj0OxpOiIFKSJXRbAorY=
+github.com/nytm/go-grafana-api v0.5.0 h1:8pIbNPNDguBa4aUNxcYl0GN247W6PXMvsOwiRBmk1sE=
+github.com/nytm/go-grafana-api v0.5.0/go.mod h1:YOJL2MOLAmCeqz0cbHU9tZIDj0OxpOiIFKSJXRbAorY=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

grafana/resource_alert_notification.go

@@ -56,6 +56,12 @@ func ResourceAlertNotification() *schema.Resource {
 				Optional:  true,
 				Sensitive: true,
 			},
+
+			"uid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -125,6 +131,7 @@ func ReadAlertNotification(d *schema.ResourceData, meta interface{}) error {
 	d.Set("name", alertNotification.Name)
 	d.Set("type", alertNotification.Type)
 	d.Set("settings", settings)
+	d.Set("uid", alertNotification.Uid)
 
 	return nil
 }
@@ -179,6 +186,7 @@ func makeAlertNotification(d *schema.ResourceData) (*gapi.AlertNotification, err
 		Name:         d.Get("name").(string),
 		Type:         d.Get("type").(string),
 		IsDefault:    d.Get("is_default").(bool),
+		Uid:          d.Get("uid").(string),
 		SendReminder: sendReminder,
 		Frequency:    frequency,
 		Settings:     settings,