Review remarks

Dynatrace · Feb 28, 2022 · 99313f8 · 99313f8
1 parent 0a39ab5
commit 99313f8
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 74 deletions.
diff --git a/src/api/v1beta1/properties.go b/src/api/v1beta1/properties.go
@@ -22,7 +22,6 @@ import (
 	"strings"
 
 	"github.com/Dynatrace/dynatrace-operator/src/dtclient"
-	"github.com/Dynatrace/dynatrace-operator/src/util"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -256,19 +255,25 @@ func (dk *DynaKube) TenantUUID() (string, error) {
 	return tenantUUID(dk.Spec.APIURL)
 }
 
+func runeIs(wanted rune) func(rune) bool {
+	return func(actual rune) bool {
+		return actual == wanted
+	}
+}
+
 func tenantUUID(apiUrl string) (string, error) {
 	parsedUrl, err := url.Parse(apiUrl)
 	if err != nil {
 		return "", errors.WithMessagef(err, "problem parsing tenant id from url %s", apiUrl)
 	}
 
 	// Path = "/e/<token>/api" -> ["e",  "<tenant>", "api"]
-	subPaths := util.Tokenize(parsedUrl.Path, '/')
+	subPaths := strings.FieldsFunc(parsedUrl.Path, runeIs('/'))
 	if len(subPaths) >= 3 && subPaths[0] == "e" && subPaths[2] == "api" {
 		return subPaths[1], nil
 	}
 
-	hostnameWithDomains := util.Tokenize(parsedUrl.Hostname(), '.')
+	hostnameWithDomains := strings.FieldsFunc(parsedUrl.Hostname(), runeIs('.'))
 	if len(hostnameWithDomains) >= 1 {
 		return hostnameWithDomains[0], nil
 

diff --git a/src/api/v1beta1/properties_test.go b/src/api/v1beta1/properties_test.go
@@ -117,8 +117,8 @@ func TestTokens(t *testing.T) {
 
 func TestTenantUUID(t *testing.T) {
 	t.Run("happy path", func(t *testing.T) {
-		const apiUrl = "https://demo.dev.dynatracelabs.com/api"
-		const expectedTenantId = "demo"
+		apiUrl := "https://demo.dev.dynatracelabs.com/api"
+		expectedTenantId := "demo"
 
 		actualTenantId, err := tenantUUID(apiUrl)
 
@@ -129,8 +129,8 @@ func TestTenantUUID(t *testing.T) {
 	})
 
 	t.Run("happy path (alternative)", func(t *testing.T) {
-		const apiUrl = "https://dynakube-activegate.dynatrace/e/tenant/api/v2/metrics/ingest"
-		const expectedTenantId = "tenant"
+		apiUrl := "https://dynakube-activegate.dynatrace/e/tenant/api/v2/metrics/ingest"
+		expectedTenantId := "tenant"
 
 		actualTenantId, err := tenantUUID(apiUrl)
 
@@ -141,9 +141,9 @@ func TestTenantUUID(t *testing.T) {
 	})
 
 	t.Run("missing API URL protocol", func(t *testing.T) {
-		const apiUrl = "demo.dev.dynatracelabs.com/api"
-		const expectedTenantId = ""
-		const expectedError = "problem getting tenant id from API URL 'demo.dev.dynatracelabs.com/api'"
+		apiUrl := "demo.dev.dynatracelabs.com/api"
+		expectedTenantId := ""
+		expectedError := "problem getting tenant id from API URL 'demo.dev.dynatracelabs.com/api'"
 
 		actualTenantId, err := tenantUUID(apiUrl)
 
@@ -156,9 +156,9 @@ func TestTenantUUID(t *testing.T) {
 	})
 
 	t.Run("suffix-only, relative API URL", func(t *testing.T) {
-		const apiUrl = "/api"
-		const expectedTenantId = ""
-		const expectedError = "problem getting tenant id from API URL '/api'"
+		apiUrl := "/api"
+		expectedTenantId := ""
+		expectedError := "problem getting tenant id from API URL '/api'"
 
 		actualTenantId, err := tenantUUID(apiUrl)
 

diff --git a/src/controllers/activegate/reconciler/statefulset/container_eec.go b/src/controllers/activegate/reconciler/statefulset/container_eec.go
@@ -7,7 +7,7 @@ import (
 	dynatracev1beta1 "github.com/Dynatrace/dynatrace-operator/src/api/v1beta1"
 	"github.com/Dynatrace/dynatrace-operator/src/controllers/activegate/capability"
 	"github.com/Dynatrace/dynatrace-operator/src/kubeobjects"
-	"github.com/Dynatrace/dynatrace-operator/src/util/address_of"
+	"github.com/Dynatrace/dynatrace-operator/src/kubeobjects/address_of"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"

diff --git a/src/controllers/activegate/reconciler/statefulset/container_statsd.go b/src/controllers/activegate/reconciler/statefulset/container_statsd.go
@@ -6,7 +6,7 @@ import (
 	dynatracev1beta1 "github.com/Dynatrace/dynatrace-operator/src/api/v1beta1"
 	"github.com/Dynatrace/dynatrace-operator/src/controllers/activegate/capability"
 	"github.com/Dynatrace/dynatrace-operator/src/kubeobjects"
-	"github.com/Dynatrace/dynatrace-operator/src/util/address_of"
+	"github.com/Dynatrace/dynatrace-operator/src/kubeobjects/address_of"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"

diff --git a/src/util/address_of/address_of.go → src/kubeobjects/address_of/address_of.go b/src/util/address_of/address_of.go → src/kubeobjects/address_of/address_of.go
diff --git a/src/util/address_of/address_of_test.go → ...kubeobjects/address_of/address_of_test.go b/src/util/address_of/address_of_test.go → ...kubeobjects/address_of/address_of_test.go
diff --git a/src/util/strings.go b/src/util/strings.go
diff --git a/src/util/strings_test.go b/src/util/strings_test.go