Fixed #527

dynatrace-oss · Sep 11, 2024 · 57ad2ba · 57ad2ba
1 parent 1a21e9b
commit 57ad2ba
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/dynatrace/api/cluster/v1/bindings/service.go b/dynatrace/api/cluster/v1/bindings/service.go
@@ -16,7 +16,7 @@ const SchemaID = "accounts:policy-bindings"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*bindings.PolicyBinding] {
 	return &service{
-		serviceClient: NewPolicyService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/cluster/v2"), credentials.Cluster.Token),
+		serviceClient: NewPolicyService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/cluster/v2"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/api/cluster/v1/groups/service.go b/dynatrace/api/cluster/v1/groups/service.go
@@ -3,6 +3,7 @@ package groups
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api"
 	groups "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/cluster/v1/groups/settings"
@@ -14,7 +15,7 @@ const SchemaID = "accounts:groups"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*groups.GroupConfig] {
 	return &service{
-		serviceClient: NewService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/v1.0/onpremise"), credentials.Cluster.Token),
+		serviceClient: NewService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/v1.0/onpremise"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/api/cluster/v1/permissions/mgmz/service.go b/dynatrace/api/cluster/v1/permissions/mgmz/service.go
@@ -15,7 +15,7 @@ const SchemaID = "accounts:groups-mgmz"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*mgmz.Permission] {
 	return &service{
-		serviceClient: NewService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/v1.0/onpremise"), credentials.Cluster.Token),
+		serviceClient: NewService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/v1.0/onpremise"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/api/cluster/v1/policies/service.go b/dynatrace/api/cluster/v1/policies/service.go
@@ -21,7 +21,7 @@ func NewPolicyService(baseURL string, apiToken string) *PolicyServiceClient {
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*policies.Policy] {
 	return &service{
-		serviceClient: NewPolicyService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/cluster/v2"), credentials.Cluster.Token),
+		serviceClient: NewPolicyService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/cluster/v2"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/api/cluster/v1/users/service.go b/dynatrace/api/cluster/v1/users/service.go
@@ -16,7 +16,7 @@ const SchemaID = "accounts:users"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*users.UserConfig] {
 	return &service{
-		serviceClient: NewService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/v1.0/onpremise"), credentials.Cluster.Token),
+		serviceClient: NewService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/v1.0/onpremise"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/api/cluster/v2/networkzones/service.go b/dynatrace/api/cluster/v2/networkzones/service.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"strings"
 
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api"
 	networkzones "github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/api/cluster/v2/networkzones/settings"
@@ -33,7 +34,7 @@ const SchemaID = "cluster:networkzones"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*networkzones.NetworkZone] {
 	return &service{
-		serviceClient: NewService(fmt.Sprintf("%s%s", credentials.Cluster.URL, "/api/cluster/v2"), credentials.Cluster.Token),
+		serviceClient: NewService(fmt.Sprintf("%s%s", strings.TrimSuffix(credentials.Cluster.URL, "/"), "/api/cluster/v2"), credentials.Cluster.Token),
 	}
 }
 

diff --git a/dynatrace/settings/credentials.go b/dynatrace/settings/credentials.go
@@ -68,7 +68,9 @@ func getEnv(names ...string) string {
 		return ""
 	}
 	for _, name := range names {
+		fmt.Println("-GETENV-", name)
 		if value := os.Getenv(name); len(value) > 0 {
+			fmt.Println("    ", value)
 			return value
 		}
 	}
@@ -150,6 +152,9 @@ func CreateExportCredentials() (*Credentials, error) {
 	}
 
 	clusterURL := getEnv("DYNATRACE_CLUSTER_URL", "DT_CLUSTER_URL")
+	for strings.HasSuffix(clusterURL, "/") {
+		clusterURL = strings.TrimSuffix(clusterURL, "/")
+	}
 	clusterAPIToken := getEnv("DYNATRACE_CLUSTER_API_TOKEN", "DT_CLUSTER_API_TOKEN")
 
 	if environmentURL == "" && clusterURL == "" && iam_account_id == "" {