Support tracingDatasourceUid for Cloudwatch datasource (#505)

* Support `tracingDatasourceUid` for Cloudwatch datasource
Closes #462

* Generate docs

Author: julienduchesne

docs/resources/data_source.md

@@ -157,6 +157,7 @@ Optional:
 - `tls_configuration_method` (String) (All) SSL Certificate configuration, either by ‘file-path’ or ‘file-content’.
 - `tls_skip_verify` (Boolean) (All) Controls whether a client verifies the server’s certificate chain and host name.
 - `token_uri` (String) (Stackdriver) The token URI used, provided in the service account key.
+- `tracing_datasource_uid` (String) (Cloudwatch) The X-Ray datasource uid to associate to this Cloudwatch datasource.
 - `tsdb_resolution` (Number) (OpenTSDB) Resolution.
 - `tsdb_version` (Number) (OpenTSDB) Version.
 - `version` (String) (InfluxDB) InfluxQL or Flux.

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/grafana/amixr-api-go-client v0.0.1
-	github.com/grafana/grafana-api-golang-client v0.5.2
+	github.com/grafana/grafana-api-golang-client v0.5.3
 	github.com/grafana/machine-learning-go-client v0.1.1
 	github.com/grafana/synthetic-monitoring-agent v0.8.2
 	github.com/grafana/synthetic-monitoring-api-go-client v0.6.0

go.sum

@@ -114,8 +114,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/amixr-api-go-client v0.0.1 h1:vj5gNxZ1LC3Yu6AavRfDKdqzq1h4WR5wXZEyHLaGkm8=
 github.com/grafana/amixr-api-go-client v0.0.1/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
-github.com/grafana/grafana-api-golang-client v0.5.2 h1:QKRXxLoThdQXtJp6TLCyaY0aW0Z9IDT9/udHhfhhovQ=
-github.com/grafana/grafana-api-golang-client v0.5.2/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
+github.com/grafana/grafana-api-golang-client v0.5.3 h1:QoIesfzqt4Ges7ocNDatHIBRjagGInOJ50LSIfzPmp4=
+github.com/grafana/grafana-api-golang-client v0.5.3/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/machine-learning-go-client v0.1.1 h1:Gw6cX8xAd6IVF2LApkXOIdBK8Gzz07B3jQPukecw7fc=
 github.com/grafana/machine-learning-go-client v0.1.1/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/synthetic-monitoring-agent v0.8.2 h1:retJc4xWxoHwqhWa4HZ9t4mO+Je0DWm8wCGdPW2hmuw=

grafana/resource_data_source.go

@@ -398,6 +398,11 @@ source selected (via the 'type' argument).
 							Optional:    true,
 							Description: "(Stackdriver) The token URI used, provided in the service account key.",
 						},
+						"tracing_datasource_uid": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "(Cloudwatch) The X-Ray datasource uid to associate to this Cloudwatch datasource.",
+						},
 						"tsdb_resolution": {
 							Type:        schema.TypeInt,
 							Optional:    true,
@@ -729,6 +734,7 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		TLSConfigurationMethod:     d.Get("json_data.0.tls_configuration_method").(string),
 		TLSSkipVerify:              d.Get("json_data.0.tls_skip_verify").(bool),
 		TokenURI:                   d.Get("json_data.0.token_uri").(string),
+		TracingDatasourceUID:       d.Get("json_data.0.tracing_datasource_uid").(string),
 		TsdbResolution:             int64(d.Get("json_data.0.tsdb_resolution").(int)),
 		TsdbVersion:                int64(d.Get("json_data.0.tsdb_version").(int)),
 		Version:                    d.Get("json_data.0.version").(string),

grafana/resource_data_source_test.go

@@ -263,6 +263,7 @@ func TestAccDataSource_basic(t *testing.T) {
 					assume_role_arn           = "arn:aws:sts::*:assumed-role/*/*"
 					custom_metrics_namespaces = "foo"
 					external_id               = "abc123"
+					tracing_datasource_uid    = "my-datasource-uid"
 				}
 				secure_json_data {
 					access_key = "123"
@@ -281,6 +282,17 @@ func TestAccDataSource_basic(t *testing.T) {
 				"secure_json_data.0.access_key":         "123",
 				"secure_json_data.0.secret_key":         "456",
 			},
+			additionalChecks: []resource.TestCheckFunc{
+				func(s *terraform.State) error {
+					if dataSource.Name != "cloudwatch" {
+						return fmt.Errorf("bad name: %s", dataSource.Name)
+					}
+					if dataSource.JSONData.TracingDatasourceUID != "my-datasource-uid" {
+						return fmt.Errorf("bad tracing_datasource_uid: %s", dataSource.JSONData.TracingDatasourceUID)
+					}
+					return nil
+				},
+			},
 		},
 		{
 			resource: "grafana_data_source.mssql",