datasource: add http headers support (#261)

* datasource: add http headers support

Signed-off-by: Guillaume Delbergue <[email protected]>

* Add test + Switch to newly released v0.2.1 client

Co-authored-by: Julien Duchesne <[email protected]>

Author: guyguy333

docs/resources/data_source.md

@@ -88,6 +88,7 @@ resource "grafana_data_source" "stackdriver" {
 - **basic_auth_password** (String, Sensitive) Basic auth password. Defaults to ``.
 - **basic_auth_username** (String) Basic auth username. Defaults to ``.
 - **database_name** (String) (Required by some data source types) The name of the database to use on the selected data source server. Defaults to ``.
+- **http_headers** (Map of String, Sensitive) Custom HTTP headers
 - **id** (String) The ID of this resource.
 - **is_default** (Boolean) Whether to set the data source as default. This should only be `true` to a single data source. Defaults to `false`.
 - **json_data** (Block List) (Required by some data source types) (see [below for nested schema](#nestedblock--json_data))

go.mod

@@ -3,7 +3,7 @@ module github.com/grafana/terraform-provider-grafana
 go 1.16
 
 require (
-	github.com/grafana/grafana-api-golang-client v0.1.3
+	github.com/grafana/grafana-api-golang-client v0.2.1
 	github.com/grafana/synthetic-monitoring-agent v0.4.1
 	github.com/grafana/synthetic-monitoring-api-go-client v0.3.0
 	github.com/hashicorp/go-cleanhttp v0.5.2

go.sum

@@ -452,8 +452,8 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/grafana/grafana-api-golang-client v0.1.3 h1:p0f8FB0/UlBX3nXv+Lt+dmms5p5cmp6hxuipio93lYc=
-github.com/grafana/grafana-api-golang-client v0.1.3/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
+github.com/grafana/grafana-api-golang-client v0.2.1 h1:5OizQpq+WP+A6t+wHoYCOrmbytWQMgnWwPfzXqSBGrI=
+github.com/grafana/grafana-api-golang-client v0.2.1/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/synthetic-monitoring-agent v0.3.0/go.mod h1:P8WTBnw3SIZW5Nm5obOlSKvD887IxAfbrJkSnoZyIlA=
 github.com/grafana/synthetic-monitoring-agent v0.4.1 h1:RiVOHi059tYIDixXPxmFQ2vCWCY4Vksslpfm5gNkgnQ=
 github.com/grafana/synthetic-monitoring-agent v0.4.1/go.mod h1:hcx3Pe76ixYsbjtM0eFpyE1bzPxiFgJIyXtdqgPeIkk=

grafana/resource_data_source.go

@@ -2,6 +2,7 @@ package grafana
 
 import (
 	"context"
+	"fmt"
 	"log"
 	"regexp"
 	"strconv"
@@ -62,6 +63,15 @@ source selected (via the 'type' argument).
 				Default:     "",
 				Description: "(Required by some data source types) The name of the database to use on the selected data source server.",
 			},
+			"http_headers": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Sensitive:   true,
+				Description: "Custom HTTP headers",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"is_default": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -481,6 +491,11 @@ func makeDataSource(d *schema.ResourceData) (*gapi.DataSource, error) {
 		id, err = strconv.ParseInt(idStr, 10, 64)
 	}
 
+	httpHeaders := make(map[string]string)
+	for key, value := range d.Get("http_headers").(map[string]interface{}) {
+		httpHeaders[key] = fmt.Sprintf("%v", value)
+	}
+
 	return &gapi.DataSource{
 		ID:                id,
 		Name:              d.Get("name").(string),
@@ -495,6 +510,7 @@ func makeDataSource(d *schema.ResourceData) (*gapi.DataSource, error) {
 		BasicAuthUser:     d.Get("basic_auth_username").(string),
 		BasicAuthPassword: d.Get("basic_auth_password").(string),
 		UID:               d.Get("uid").(string),
+		HTTPHeaders:       httpHeaders,
 		JSONData:          makeJSONData(d),
 		SecureJSONData:    makeSecureJSONData(d),
 	}, err