Merge pull request grafana#130 from medains/grafana-api-golang-client-changes

Apply changes to match the change to a Config struct

Author: trotttrotttrott

go.mod

@@ -3,7 +3,8 @@ module github.com/terraform-providers/terraform-provider-grafana
 go 1.14
 
 require (
-	github.com/grafana/grafana-api-golang-client v0.0.0-20201012135725-c87fc20af1ea
+	github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166
+	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/terraform v0.12.2
 )

go.sum

@@ -141,6 +141,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grafana/grafana-api-golang-client v0.0.0-20201012135725-c87fc20af1ea h1:DB+ppVl+w8B5LtFmpjyuPf9zT6t5j95RzwuP/ypYZeU=
 github.com/grafana/grafana-api-golang-client v0.0.0-20201012135725-c87fc20af1ea/go.mod h1:jFjwT3lvwl4JKqCw3guRJvlQ1/fmhER1h3Zgix3z7jw=
+github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166 h1:Kl177VV8TQuyCQVYPF3grDYdRcINbSGP2aIuRqM7VZI=
+github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166/go.mod h1:jFjwT3lvwl4JKqCw3guRJvlQ1/fmhER1h3Zgix3z7jw=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=

grafana/provider.go

@@ -1,6 +1,10 @@
 package grafana
 
 import (
+	"net/url"
+	"strings"
+
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/terraform/helper/logging"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
@@ -42,15 +46,21 @@ func Provider() terraform.ResourceProvider {
 }
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
-	client, err := gapi.New(
-		d.Get("auth").(string),
-		d.Get("url").(string),
-	)
+	auth := strings.SplitN(d.Get("auth").(string), ":", 2)
+	cli := cleanhttp.DefaultClient()
+	cli.Transport = logging.NewTransport("Grafana", cli.Transport)
+	cfg := gapi.Config{
+		Client: cli,
+	}
+	if len(auth) == 2 {
+		cfg.BasicAuth = url.UserPassword(auth[0], auth[1])
+	} else {
+		cfg.APIKey = auth[0]
+	}
+	client, err := gapi.New(d.Get("url").(string), cfg)
 	if err != nil {
 		return nil, err
 	}
 
-	client.Transport = logging.NewTransport("Grafana", client.Transport)
-
 	return client, nil
 }

grafana/resource_alert_notification.go

@@ -126,12 +126,12 @@ func ReadAlertNotification(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	d.Set("id", alertNotification.Id)
+	d.Set("id", alertNotification.ID)
 	d.Set("is_default", alertNotification.IsDefault)
 	d.Set("name", alertNotification.Name)
 	d.Set("type", alertNotification.Type)
 	d.Set("settings", settings)
-	d.Set("uid", alertNotification.Uid)
+	d.Set("uid", alertNotification.UID)
 
 	return nil
 }
@@ -182,11 +182,11 @@ func makeAlertNotification(d *schema.ResourceData) (*gapi.AlertNotification, err
 	}
 
 	return &gapi.AlertNotification{
-		Id:           id,
+		ID:           id,
 		Name:         d.Get("name").(string),
 		Type:         d.Get("type").(string),
 		IsDefault:    d.Get("is_default").(bool),
-		Uid:          d.Get("uid").(string),
+		UID:          d.Get("uid").(string),
 		SendReminder: sendReminder,
 		Frequency:    frequency,
 		Settings:     settings,

grafana/resource_alert_notification_test.go

@@ -119,7 +119,7 @@ func testAccAlertNotificationDefinition(a *gapi.AlertNotification) resource.Test
 func testAccAlertNotificationCheckDestroy(a *gapi.AlertNotification) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*gapi.Client)
-		alert, err := client.AlertNotification(a.Id)
+		alert, err := client.AlertNotification(a.ID)
 		if err == nil && alert != nil {
 			return fmt.Errorf("alert-notification still exists")
 		}

grafana/resource_dashboard_test.go

@@ -124,8 +124,8 @@ func testAccDashboardCheckExists(rn string, dashboard *gapi.Dashboard) resource.
 
 func testAccDashboardCheckExistsInFolder(dashboard *gapi.Dashboard, folder *gapi.Folder) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		if dashboard.Folder != folder.Id && folder.Id != 0 {
-			return fmt.Errorf("dashboard.Folder(%d) does not match folder.Id(%d)", dashboard.Folder, folder.Id)
+		if dashboard.Folder != folder.ID && folder.ID != 0 {
+			return fmt.Errorf("dashboard.Folder(%d) does not match folder.ID(%d)", dashboard.Folder, folder.ID)
 		}
 		return nil
 	}
@@ -159,7 +159,7 @@ func testAccDashboardFolderCheckDestroy(dashboard *gapi.Dashboard, folder *gapi.
 		if err == nil {
 			return fmt.Errorf("dashboard still exists")
 		}
-		_, err = client.Folder(folder.Id)
+		_, err = client.Folder(folder.ID)
 		if err == nil {
 			return fmt.Errorf("folder still exists")
 		}

grafana/resource_data_source.go

@@ -284,7 +284,7 @@ func ReadDataSource(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	d.Set("id", dataSource.Id)
+	d.Set("id", dataSource.ID)
 	d.Set("access_mode", dataSource.Access)
 	d.Set("basic_auth_enabled", dataSource.BasicAuth)
 	d.Set("basic_auth_username", dataSource.BasicAuthUser)
@@ -322,7 +322,7 @@ func makeDataSource(d *schema.ResourceData) (*gapi.DataSource, error) {
 	}
 
 	return &gapi.DataSource{
-		Id:                id,
+		ID:                id,
 		Name:              d.Get("name").(string),
 		Type:              d.Get("type").(string),
 		URL:               d.Get("url").(string),
@@ -349,7 +349,7 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		Encrypt:                 d.Get("json_data.0.encrypt").(string),
 		EsVersion:               int64(d.Get("json_data.0.es_version").(int)),
 		GraphiteVersion:         d.Get("json_data.0.graphite_version").(string),
-		HttpMethod:              d.Get("json_data.0.http_method").(string),
+		HTTPMethod:              d.Get("json_data.0.http_method").(string),
 		Interval:                d.Get("json_data.0.interval").(string),
 		LogLevelField:           d.Get("json_data.0.log_level_field").(string),
 		LogMessageField:         d.Get("json_data.0.log_message_field").(string),
@@ -361,9 +361,9 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		Timescaledb:             d.Get("json_data.0.timescaledb").(bool),
 		TimeField:               d.Get("json_data.0.time_field").(string),
 		TimeInterval:            d.Get("json_data.0.time_interval").(string),
-		TlsAuth:                 d.Get("json_data.0.tls_auth").(bool),
-		TlsAuthWithCACert:       d.Get("json_data.0.tls_auth_with_ca_cert").(bool),
-		TlsSkipVerify:           d.Get("json_data.0.tls_skip_verify").(bool),
+		TLSAuth:                 d.Get("json_data.0.tls_auth").(bool),
+		TLSAuthWithCACert:       d.Get("json_data.0.tls_auth_with_ca_cert").(bool),
+		TLSSkipVerify:           d.Get("json_data.0.tls_skip_verify").(bool),
 		TsdbResolution:          d.Get("json_data.0.tsdb_resolution").(string),
 		TsdbVersion:             d.Get("json_data.0.tsdb_version").(string),
 	}
@@ -376,8 +376,8 @@ func makeSecureJSONData(d *schema.ResourceData) gapi.SecureJSONData {
 		Password:          d.Get("secure_json_data.0.password").(string),
 		PrivateKey:        d.Get("secure_json_data.0.private_key").(string),
 		SecretKey:         d.Get("secure_json_data.0.secret_key").(string),
-		TlsCACert:         d.Get("secure_json_data.0.tls_ca_cert").(string),
-		TlsClientCert:     d.Get("secure_json_data.0.tls_client_cert").(string),
-		TlsClientKey:      d.Get("secure_json_data.0.tls_client_key").(string),
+		TLSCACert:         d.Get("secure_json_data.0.tls_ca_cert").(string),
+		TLSClientCert:     d.Get("secure_json_data.0.tls_client_cert").(string),
+		TLSClientKey:      d.Get("secure_json_data.0.tls_client_key").(string),
 	}
 }

grafana/resource_data_source_test.go

@@ -348,7 +348,7 @@ func testAccDataSourceCheckExists(rn string, dataSource *gapi.DataSource) resour
 func testAccDataSourceCheckDestroy(dataSource *gapi.DataSource) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*gapi.Client)
-		_, err := client.DataSource(dataSource.Id)
+		_, err := client.DataSource(dataSource.ID)
 		if err == nil {
 			return fmt.Errorf("data source still exists")
 		}

grafana/resource_folder.go

@@ -43,9 +43,9 @@ func CreateFolder(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	id := strconv.FormatInt(resp.Id, 10)
+	id := strconv.FormatInt(resp.ID, 10)
 	d.SetId(id)
-	d.Set("uid", resp.Uid)
+	d.Set("uid", resp.UID)
 	d.Set("title", resp.Title)
 
 	return ReadFolder(d, meta)
@@ -70,7 +70,7 @@ func ReadFolder(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	d.SetId(strconv.FormatInt(folder.Id, 10))
+	d.SetId(strconv.FormatInt(folder.ID, 10))
 	d.Set("title", folder.Title)
 
 	return nil

grafana/resource_folder_test.go

@@ -72,14 +72,14 @@ func testAccFolderDisappear(folder *gapi.Folder) resource.TestCheckFunc {
 		// At this point testAccFolderCheckExists should have been called and
 		// folder should have been populated
 		client := testAccProvider.Meta().(*gapi.Client)
-		return client.DeleteFolder((*folder).Uid)
+		return client.DeleteFolder((*folder).UID)
 	}
 }
 
 func testAccFolderCheckDestroy(folder *gapi.Folder) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*gapi.Client)
-		_, err := client.Folder(folder.Id)
+		_, err := client.Folder(folder.ID)
 		if err == nil {
 			return fmt.Errorf("folder still exists")
 		}