grafana_cloud_stack with proper prometheus urls (#489)

* grafana_cloud_stack with proper prometheus urls

Create prometheus_remote_endpoint and prometheus_remote_write_endpoint
using url.Parse instead of path.Join as the latter render an
invalid url, for example http:/test.com

* Return error from FlattenStack

* Apply suggestions from code review

Co-authored-by: Julien Duchesne <[email protected]>

* Beautify syntax

* Fix function name

* Add tests

Co-authored-by: Björn Ingeson <[email protected]>
Co-authored-by: Björn Ingeson <[email protected]>

Author: 3 people

grafana/data_source_cloud_stack.go

@@ -32,16 +32,16 @@ available at “https://<stack_slug>.grafana.net".`,
 func datasourceCloudStackRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*client).gcloudapi
 
-	var diags diag.Diagnostics
-
 	slug := d.Get("slug").(string)
 
 	stack, err := client.StackBySlug(slug)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	FlattenStack(d, stack)
+	if err := FlattenStack(d, stack); err != nil {
+		return diag.FromErr(err)
+	}
 
-	return diags
+	return nil
 }

grafana/data_source_cloud_stack_test.go

@@ -30,6 +30,8 @@ func TestAccDatasourceCloudStack_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.grafana_cloud_stack.test", "id"),
 					resource.TestCheckResourceAttr("data.grafana_cloud_stack.test", "name", resourceName),
 					resource.TestCheckResourceAttr("data.grafana_cloud_stack.test", "slug", resourceName),
+					resource.TestCheckResourceAttr("data.grafana_cloud_stack.test", "prometheus_remote_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_stack.test", "prometheus_remote_write_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push"),
 					resource.TestCheckResourceAttrSet("data.grafana_cloud_stack.test", "prometheus_url"),
 					resource.TestCheckResourceAttrSet("data.grafana_cloud_stack.test", "prometheus_user_id"),
 					resource.TestCheckResourceAttrSet("data.grafana_cloud_stack.test", "alertmanager_user_id"),

grafana/resource_cloud_stack.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"path"
+	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
@@ -266,15 +266,17 @@ func ReadStack(ctx context.Context, d *schema.ResourceData, meta interface{}) di
 		return nil
 	}
 
-	FlattenStack(d, stack)
+	if err := FlattenStack(d, stack); err != nil {
+		return diag.FromErr(err)
+	}
 	// Always set the wait attribute to true after creation
 	// It no longer matters and this will prevent drift if the stack was imported
 	d.Set("wait_for_readiness", true)
 
 	return nil
 }
 
-func FlattenStack(d *schema.ResourceData, stack gapi.Stack) {
+func FlattenStack(d *schema.ResourceData, stack gapi.Stack) error {
 	id := strconv.FormatInt(stack.ID, 10)
 
 	d.SetId(id)
@@ -292,8 +294,16 @@ func FlattenStack(d *schema.ResourceData, stack gapi.Stack) {
 	d.Set("prometheus_user_id", stack.HmInstancePromID)
 	d.Set("prometheus_url", stack.HmInstancePromURL)
 	d.Set("prometheus_name", stack.HmInstancePromName)
-	d.Set("prometheus_remote_endpoint", path.Join(stack.HmInstancePromURL, "api/prom"))
-	d.Set("prometheus_remote_write_endpoint", path.Join(stack.HmInstancePromURL, "api/prom/push"))
+	reURL, err := appendPath(stack.HmInstancePromURL, "/api/prom")
+	d.Set("prometheus_remote_endpoint", reURL)
+	if err != nil {
+		return err
+	}
+	rweURL, err := appendPath(stack.HmInstancePromURL, "/api/prom/push")
+	if err != nil {
+		return err
+	}
+	d.Set("prometheus_remote_write_endpoint", rweURL)
 	d.Set("prometheus_status", stack.HmInstancePromStatus)
 
 	d.Set("logs_user_id", stack.HlInstanceID)
@@ -305,6 +315,21 @@ func FlattenStack(d *schema.ResourceData, stack gapi.Stack) {
 	d.Set("alertmanager_name", stack.AmInstanceName)
 	d.Set("alertmanager_url", stack.AmInstanceURL)
 	d.Set("alertmanager_status", stack.AmInstanceStatus)
+
+	return nil
+}
+
+// Append path to baseurl
+func appendPath(baseUrl, path string) (string, error) {
+	bu, err := url.Parse(baseUrl)
+	if err != nil {
+		return "", err
+	}
+	u, err := bu.Parse(path)
+	if err != nil {
+		return "", err
+	}
+	return u.String(), nil
 }
 
 // waitForStackReadiness retries until the stack is ready, verified by querying the Grafana URL

grafana/resource_cloud_stack_test.go

@@ -38,6 +38,8 @@ func TestResourceCloudStack_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "name", resourceName),
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "slug", resourceName),
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "status", "active"),
+					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "prometheus_remote_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom"),
+					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "prometheus_remote_write_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push"),
 				),
 			},
 			{