Merge pull request #58 from grafana/inkel/sentry-url-attribute

inkel · web-flow · commit 8d1d81f99fef · 2022-02-07T14:51:03.000-03:00
Fix passing Sentry URL attribute
diff --git a/datasource.go b/datasource.go
@@ -49,6 +49,14 @@ func (ds *DataSource) MarshalJSON() ([]byte, error) {
 		dataSource.JSONData.httpHeaderNames = append(dataSource.JSONData.httpHeaderNames, name)
 		dataSource.SecureJSONData.httpHeaderValues = append(dataSource.SecureJSONData.httpHeaderValues, value)
 	}
+
+	// Sentry provider expects this value in the JSON data payload,
+	// ignoring the url attribute. This hack allows passing the URL as
+	// an attribute but then sends it in the payload.
+	if ds.Type == "grafana-sentry-datasource" {
+		dataSource.JSONData.URL = ds.URL
+	}
+
 	return json.Marshal(dataSource)
 }
 
@@ -152,6 +160,7 @@ type JSONData struct {
 
 	// Used by Sentry
 	OrgSlug string `json:"orgSlug,omitempty"`
+	URL     string `json:"url,omitempty"` // Sentry is not using the datasource URL attribute
 }
 
 // Required to avoid recursion during (un)marshal

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,14 @@ func (ds *DataSource) MarshalJSON() ([]byte, error) {`
`49`	`49`	`dataSource.JSONData.httpHeaderNames = append(dataSource.JSONData.httpHeaderNames, name)`
`50`	`50`	`dataSource.SecureJSONData.httpHeaderValues = append(dataSource.SecureJSONData.httpHeaderValues, value)`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ // Sentry provider expects this value in the JSON data payload,`
	`54`	`+ // ignoring the url attribute. This hack allows passing the URL as`
	`55`	`+ // an attribute but then sends it in the payload.`
	`56`	`+ if ds.Type == "grafana-sentry-datasource" {`
	`57`	`+ dataSource.JSONData.URL = ds.URL`
	`58`	`+ }`
	`59`	`+`
`52`	`60`	`return json.Marshal(dataSource)`
`53`	`61`	`}`
`54`	`62`
`@@ -152,6 +160,7 @@ type JSONData struct {`
`152`	`160`
`153`	`161`	`// Used by Sentry`
`154`	`162`	OrgSlug string `json:"orgSlug,omitempty"`
	`163`	+ URL string `json:"url,omitempty"` // Sentry is not using the datasource URL attribute
`155`	`164`	`}`
`156`	`165`
`157`	`166`	`// Required to avoid recursion during (un)marshal`