Merge remote-tracking branch 'upstream/master' into annotations

Author: mdb

.drone.yml

@@ -0,0 +1,11 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: test
+  image: golang
+  commands:
+  - go mod download
+  - go test -cover -race -vet all -mod readonly ./...

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem?**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -22,3 +22,7 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+# vim swap files
+.*.sw?
+.idea

README.md

@@ -1,5 +1,7 @@
 # grafana-api-golang-client
 
+[![Build Status](https://cloud.drone.io/api/badges/nytm/go-grafana-api/status.svg)](https://cloud.drone.io/nytm/go-grafana-api)
+
 Grafana HTTP API Client for Go
 
 ## Tests

admin.go

@@ -6,32 +6,42 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-
-	"github.com/grafana/grafana/pkg/api/dtos"
 )
 
-func (c *Client) CreateUserForm(settings dtos.AdminCreateUserForm) error {
-	data, err := json.Marshal(settings)
-	req, err := c.newRequest("POST", "/api/admin/users", bytes.NewBuffer(data))
+func (c *Client) CreateUser(user User) (int64, error) {
+	id := int64(0)
+	data, err := json.Marshal(user)
 	if err != nil {
-		return err
+		return id, err
+	}
+
+	req, err := c.newRequest("POST", "/api/admin/users", nil, bytes.NewBuffer(data))
+	if err != nil {
+		return id, err
 	}
 	resp, err := c.Do(req)
 	if err != nil {
-		return err
+		return id, err
+	}
+	if resp.StatusCode != 200 {
+		return id, errors.New(resp.Status)
 	}
 	data, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return err
+		return id, err
 	}
-	if resp.StatusCode != 200 {
-		return errors.New(resp.Status)
+	created := struct {
+		Id int64 `json:"id"`
+	}{}
+	err = json.Unmarshal(data, &created)
+	if err != nil {
+		return id, err
 	}
-	return err
+	return created.Id, err
 }
 
 func (c *Client) DeleteUser(id int64) error {
-	req, err := c.newRequest("DELETE", fmt.Sprintf("/api/admin/users/%d", id), nil)
+	req, err := c.newRequest("DELETE", fmt.Sprintf("/api/admin/users/%d", id), nil, nil)
 	if err != nil {
 		return err
 	}

admin_test.go

@@ -0,0 +1,39 @@
+package gapi
+
+import (
+	"testing"
+)
+
+const (
+	createUserJSON = `{"id":1,"message":"User created"}`
+	deleteUserJSON = `{"message":"User deleted"}`
+)
+
+func TestCreateUser(t *testing.T) {
+	server, client := gapiTestTools(200, createUserJSON)
+	defer server.Close()
+	user := User{
+		Email:    "admin@localhost",
+		Login:    "admin",
+		Name:     "Administrator",
+		Password: "password",
+	}
+	resp, err := client.CreateUser(user)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if resp != 1 {
+		t.Error("Not correctly parsing returned user message.")
+	}
+}
+
+func TestDeleteUser(t *testing.T) {
+	server, client := gapiTestTools(200, deleteUserJSON)
+	defer server.Close()
+
+	err := client.DeleteUser(int64(1))
+	if err != nil {
+		t.Error(err)
+	}
+}

alertnotification.go

@@ -9,16 +9,45 @@ import (
 )
 
 type AlertNotification struct {
-	Id          int64       `json:"id,omitempty"`
-	Name        string      `json:"name"`
-	Type        string      `json:"type"`
-	IsDefault   bool        `json:"isDefault"`
-	Settings    interface{} `json:"settings"`
+	Id                    int64       `json:"id,omitempty"`
+	Uid                   string      `json:"uid"`
+	Name                  string      `json:"name"`
+	Type                  string      `json:"type"`
+	IsDefault             bool        `json:"isDefault"`
+	DisableResolveMessage bool        `json:"disableResolveMessage"`
+	SendReminder          bool        `json:"sendReminder"`
+	Frequency             string      `json:"frequency"`
+	Settings              interface{} `json:"settings"`
+}
+
+func (c *Client) AlertNotifications() ([]AlertNotification, error) {
+	alertnotifications := make([]AlertNotification, 0)
+
+	req, err := c.newRequest("GET", "/api/alert-notifications/", nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != 200 {
+		return nil, errors.New(resp.Status)
+	}
+
+	data, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(data, &alertnotifications)
+	return alertnotifications, err
 }
 
 func (c *Client) AlertNotification(id int64) (*AlertNotification, error) {
 	path := fmt.Sprintf("/api/alert-notifications/%d", id)
-	req, err := c.newRequest("GET", path, nil)
+	req, err := c.newRequest("GET", path, nil, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -46,7 +75,7 @@ func (c *Client) NewAlertNotification(a *AlertNotification) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	req, err := c.newRequest("POST", "/api/alert-notifications", bytes.NewBuffer(data))
+	req, err := c.newRequest("POST", "/api/alert-notifications", nil, bytes.NewBuffer(data))
 	if err != nil {
 		return 0, err
 	}
@@ -77,7 +106,7 @@ func (c *Client) UpdateAlertNotification(a *AlertNotification) error {
 	if err != nil {
 		return err
 	}
-	req, err := c.newRequest("PUT", path, bytes.NewBuffer(data))
+	req, err := c.newRequest("PUT", path, nil, bytes.NewBuffer(data))
 	if err != nil {
 		return err
 	}
@@ -95,7 +124,7 @@ func (c *Client) UpdateAlertNotification(a *AlertNotification) error {
 
 func (c *Client) DeleteAlertNotification(id int64) error {
 	path := fmt.Sprintf("/api/alert-notifications/%d", id)
-	req, err := c.newRequest("DELETE", path, nil)
+	req, err := c.newRequest("DELETE", path, nil, nil)
 	if err != nil {
 		return err
 	}