Merge pull request grafana#100 from terraform-providers/data_source_stackdriver

resource/data_source: add support for stackdriver privatekey

Author: tonglil

grafana/resource_data_source.go

@@ -188,6 +188,11 @@ func ResourceDataSource() *schema.Resource {
 							Optional:  true,
 							Sensitive: true,
 						},
+						"private_key": {
+							Type:      schema.TypeString,
+							Optional:  true,
+							Sensitive: true,
+						},
 						"secret_key": {
 							Type:      schema.TypeString,
 							Optional:  true,
@@ -369,6 +374,7 @@ func makeSecureJSONData(d *schema.ResourceData) gapi.SecureJSONData {
 		AccessKey:         d.Get("secure_json_data.0.access_key").(string),
 		BasicAuthPassword: d.Get("secure_json_data.0.basic_auth_password").(string),
 		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),

grafana/resource_data_source_test.go

@@ -257,6 +257,23 @@ resource "grafana_data_source" "testdata" {
 			"json_data.0.query_timeout": "1",
 		},
 	},
+	{
+		"grafana_data_source.stackdriver",
+		`
+		resource "grafana_data_source" "stackdriver" {
+			type = "stackdriver"
+			name = "stackdriver"
+			secure_json_data {
+				private_key = "-----BEGIN PRIVATE KEY-----\nprivate-key\n-----END PRIVATE KEY-----\n"
+			}
+		}
+		`,
+		map[string]string{
+			"type":                           "stackdriver",
+			"name":                           "stackdriver",
+			"secure_json_data.0.private_key": "-----BEGIN PRIVATE KEY-----\nprivate-key\n-----END PRIVATE KEY-----\n",
+		},
+	},
 }
 
 func TestAccDataSource_basic(t *testing.T) {

website/docs/r/data_source.html.md

@@ -13,8 +13,8 @@ The data source resource allows a data source to be created on a Grafana server.
 ## Example Usage
 
 The required arguments for this resource vary depending on the type of data
-source selected (via the `type` argument). The following example is for
-InfluxDB. See [Grafana's Data Sources Guides][datasources] for more details on
+source selected (via the `type` argument). The following examples are for
+InfluxDB, CloudWatch, and Google Stackdriver. See [Grafana's Data Sources Guides][datasources] for more details on
 the supported data source types and the arguments they use.
 
 [datasources]: https://grafana.com/docs/grafana/latest/features/datasources/
@@ -51,6 +51,19 @@ resource "grafana_data_source" "test_cloudwatch" {
 }
 ```
 
+For a Stackdriver datasource:
+
+```hcl
+resource "grafana_data_source" "test_stackdriver" {
+  type = "stackdriver"
+  name = "sd-example"
+
+  secure_json_data {
+    private_key = "-----BEGIN PRIVATE KEY-----\nprivate-key\n-----END PRIVATE KEY-----\n"
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -183,6 +196,8 @@ fields to operate properly.
 
 * `password` - (All) Password to use for authentication.
 
+* `private_key` - (Stackdriver) The [service account key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys) `private_key` to use to access the data source.
+
 * `tls_ca_cert` - (All) CA cert for out going requests.
 
 * `tls_client_cert` - (All) TLS Client cert for outgoing requests.