Add support for more data_source json_data values

go.mod

@@ -1,8 +1,9 @@
 module github.com/terraform-providers/terraform-provider-grafana
 
+go 1.12
+
 require (
 	github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform v0.12.2
-	github.com/nytm/go-grafana-api v0.0.0-20181022152830-9cc848df7385
+	github.com/hashicorp/terraform v0.12.4
+	github.com/kalinon/go-grafana-api v0.0.0-20190712154808-9d3ff1ed93f4
 )

grafana/provider.go

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func Provider() terraform.ResourceProvider {

grafana/resource_alert_notification.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func ResourceAlertNotification() *schema.Resource {

grafana/resource_alert_notification_test.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"

grafana/resource_dashboard.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func ResourceDashboard() *schema.Resource {

grafana/resource_dashboard_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"

grafana/resource_data_source.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func ResourceDataSource() *schema.Resource {
@@ -78,11 +78,11 @@ func ResourceDataSource() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"auth_type": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"default_region": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"custom_metrics_namespaces": {
 							Type:     schema.TypeString,
@@ -92,6 +92,18 @@ func ResourceDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"http_method": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"query_timeout": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"time_interval": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
 					},
 				},
 			},
@@ -241,6 +253,8 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		DefaultRegion:           d.Get("json_data.0.default_region").(string),
 		CustomMetricsNamespaces: d.Get("json_data.0.custom_metrics_namespaces").(string),
 		AssumeRoleArn:           d.Get("json_data.0.assume_role_arn").(string),
+		HttpMethod:              d.Get("json_data.0.http_method").(string),
+		TimeInterval:            d.Get("json_data.0.time_interval").(string),
 	}
 }
 

grafana/resource_data_source_test.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
@@ -78,6 +78,36 @@ func TestAccDataSource_basicCloudwatch(t *testing.T) {
 	})
 }
 
+func TestAccDataSource_basicPrometheus(t *testing.T) {
+	var dataSource gapi.DataSource
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccDataSourceCheckDestroy(&dataSource),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceConfig_basicPrometheus,
+				Check: resource.ComposeTestCheckFunc(
+					testAccDataSourceCheckExists("grafana_data_source.test_prometheus", &dataSource),
+					resource.TestCheckResourceAttr(
+						"grafana_data_source.test_prometheus", "type", "prometheus",
+					),
+					resource.TestCheckResourceAttr(
+						"grafana_data_source.test_prometheus", "json_data.0.http_method", "POST",
+					),
+					resource.TestCheckResourceAttr(
+						"grafana_data_source.test_prometheus", "json_data.0.query_timeout", "30s",
+					),
+					resource.TestCheckResourceAttr(
+						"grafana_data_source.test_prometheus", "json_data.0.time_interval", "1m",
+					),
+				),
+			},
+		},
+	})
+}
+
 func testAccDataSourceCheckExists(rn string, dataSource *gapi.DataSource) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[rn]
@@ -128,6 +158,7 @@ resource "grafana_data_source" "test_influxdb" {
   basic_auth_password = "basic_password"
 }
 `
+
 const testAccDataSourceConfig_basicCloudwatch = `
 resource "grafana_data_source" "test_cloudwatch" {
   type = "cloudwatch"
@@ -146,3 +177,16 @@ resource "grafana_data_source" "test_cloudwatch" {
   }
 }
 `
+
+const testAccDataSourceConfig_basicPrometheus = `
+resource "grafana_data_source" "test_prometheus" {
+  type = "prometheus"
+  name = "terraform-acc-test-prometheus"
+
+  json_data {
+    http_method   = "POST"
+	query_timeout = "30s"
+    time_interval = "1m"
+  }
+}
+`

grafana/resource_folder.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func ResourceFolder() *schema.Resource {

grafana/resource_folder_test.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"

grafana/resource_organization.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 type OrgUser struct {

grafana/resource_organization_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	gapi "github.com/nytm/go-grafana-api"
+	gapi "github.com/kalinon/go-grafana-api"
 )
 
 func TestAccOrganization_basic(t *testing.T) {