Fix TLS + urls in resources

grafana · Nov 6, 2023 · ca1aa08 · ca1aa08
1 parent 10ee1f0
commit ca1aa08
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -23,7 +23,7 @@ testacc-oss-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://localhost:3000" \
+	GRAFANA_URL="http://127.0.0.1:3000" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-oss
 
@@ -33,7 +33,7 @@ testacc-enterprise-docker:
 	GRAFANA_IMAGE=grafana/grafana-enterprise GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://localhost:3000" \
+	GRAFANA_URL="http://127.0.0.1:3000" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-enterprise
 
@@ -44,7 +44,7 @@ testacc-tls-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose --profile tls up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="https://localhost:3001" \
+	GRAFANA_URL="https://127.0.0.1:3001" \
 	GRAFANA_AUTH="admin:admin" \
 	GRAFANA_TLS_KEY=$$(pwd)/testdata/client.key \
     GRAFANA_TLS_CERT=$$(pwd)/testdata/client.crt \
@@ -57,7 +57,7 @@ testacc-subpath-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) GRAFANA_SUBPATH=/grafana/ GF_SERVER_SERVE_FROM_SUB_PATH=true docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://localhost:3000/grafana" \
+	GRAFANA_URL="http://127.0.0.1:3000/grafana" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-oss
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,11 +5,11 @@ services:
       - 3000:3000
     image: ${GRAFANA_IMAGE:-grafana/grafana}:${GRAFANA_VERSION}
     environment:
-      - GF_SERVER_ROOT_URL=http://0.0.0.0:3000${GRAFANA_SUBPATH:-}
+      - GF_SERVER_ROOT_URL=http://127.0.0.1:3000${GRAFANA_SUBPATH:-}
       - GF_ENTERPRISE_LICENSE_TEXT=${GF_ENTERPRISE_LICENSE_TEXT:-}
       - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-}
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://0.0.0.0:3000${GRAFANA_SUBPATH:-}/api/health || exit 1 # Use wget because older versions of Grafana don't have curl
+      test: wget --no-verbose --tries=1 --spider http://127.0.0.1:3000${GRAFANA_SUBPATH:-}/api/health || exit 1 # Use wget because older versions of Grafana don't have curl
       interval: 10s
       retries: 10
       start_period: 10s

diff --git a/internal/resources/grafana/data_source_dashboard.go b/internal/resources/grafana/data_source_dashboard.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/url"
 	"strconv"
-	"strings"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
 	"github.com/grafana/terraform-provider-grafana/internal/common"
@@ -96,7 +95,7 @@ func findDashboardWithID(client *gapi.Client, id int64) (*gapi.FolderDashboardSe
 }
 
 func dataSourceDashboardRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	gapiURL := meta.(*common.Client).GrafanaAPIURL
+	metaClient := meta.(*common.Client)
 	var dashboard *gapi.Dashboard
 	client := meta.(*common.Client).GrafanaAPI
 
@@ -129,7 +128,7 @@ func dataSourceDashboardRead(ctx context.Context, d *schema.ResourceData, meta i
 	d.Set("folder", dashboard.FolderID)
 	d.Set("is_starred", dashboard.Meta.IsStarred)
 	d.Set("slug", dashboard.Meta.Slug)
-	d.Set("url", strings.TrimRight(gapiURL, "/")+dashboard.Meta.URL)
+	d.Set("url", metaClient.GrafanaSubpath(dashboard.Meta.URL))
 
 	return nil
 }
diff --git a/internal/resources/grafana/data_source_folder.go b/internal/resources/grafana/data_source_folder.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
 	"github.com/grafana/terraform-provider-grafana/internal/common"
@@ -61,7 +60,7 @@ func findFolderWithTitle(client *gapi.Client, title string) (*gapi.Folder, error
 }
 
 func dataSourceFolderRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	gapiURL := meta.(*common.Client).GrafanaAPIURL
+	metaClient := meta.(*common.Client)
 	client := meta.(*common.Client).GrafanaAPI
 	title := d.Get("title").(string)
 	folder, err := findFolderWithTitle(client, title)
@@ -74,7 +73,7 @@ func dataSourceFolderRead(ctx context.Context, d *schema.ResourceData, meta inte
 	d.SetId(id)
 	d.Set("uid", folder.UID)
 	d.Set("title", folder.Title)
-	d.Set("url", strings.TrimRight(gapiURL, "/")+folder.URL)
+	d.Set("url", metaClient.GrafanaSubpath(folder.URL))
 
 	return nil
 }
diff --git a/internal/resources/grafana/resource_dashboard.go b/internal/resources/grafana/resource_dashboard.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -110,7 +109,7 @@ func CreateDashboard(ctx context.Context, d *schema.ResourceData, meta interface
 }
 
 func ReadDashboard(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	gapiURL := meta.(*common.Client).GrafanaAPIURL
+	metaClient := meta.(*common.Client)
 	client, orgID, uid := ClientFromExistingOrgResource(meta, d.Id())
 
 	dashboard, err := client.DashboardByUID(uid)
@@ -123,7 +122,7 @@ func ReadDashboard(ctx context.Context, d *schema.ResourceData, meta interface{}
 	d.Set("uid", dashboard.Model["uid"].(string))
 	d.Set("dashboard_id", int64(dashboard.Model["id"].(float64)))
 	d.Set("version", int64(dashboard.Model["version"].(float64)))
-	d.Set("url", strings.TrimRight(gapiURL, "/")+dashboard.Meta.URL)
+	d.Set("url", metaClient.GrafanaSubpath(dashboard.Meta.URL))
 
 	// If the folder was originally set to a numeric ID, we read the folder ID
 	// Othwerwise, we read the folder UID