Use const instead of string

coupergateway · Jan 14, 2023 · 4eecf2d · 4eecf2d
1 parent 7b4281c
commit 4eecf2d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/config/configload/backend.go b/config/configload/backend.go
@@ -182,7 +182,7 @@ func setOAuth2Backend(helper *helper, parent *hclsyntax.Body) (*hclsyntax.Body,
 
 func checkTokenRequestLabels(trbs []*hclsyntax.Block, unique map[string]struct{}) error {
 	for _, trb := range trbs {
-		label := defaultNameLabel
+		label := config.DefaultNameLabel
 		dr := trb.DefRange()
 		r := &dr
 		if len(trb.Labels) > 0 {

diff --git a/config/configload/endpoint.go b/config/configload/endpoint.go
@@ -64,7 +64,7 @@ func refineEndpoints(helper *helper, endpoints config.Endpoints, checkPathPatter
 
 		for _, proxyConfig := range ep.Proxies {
 			if proxyConfig.Name == "" {
-				proxyConfig.Name = defaultNameLabel
+				proxyConfig.Name = config.DefaultNameLabel
 			}
 
 			names[proxyConfig.Name] = proxyConfig.HCLBody()
@@ -86,7 +86,7 @@ func refineEndpoints(helper *helper, endpoints config.Endpoints, checkPathPatter
 			}
 
 			if wsEnabled {
-				if proxyConfig.Name != defaultNameLabel {
+				if proxyConfig.Name != config.DefaultNameLabel {
 					return errors.Configuration.Message("websockets attribute or block is only allowed in a 'default' proxy block")
 				}
 				if proxyRequestLabelRequired || ep.Response != nil {
@@ -106,7 +106,7 @@ func refineEndpoints(helper *helper, endpoints config.Endpoints, checkPathPatter
 
 		for _, reqConfig := range ep.Requests {
 			if reqConfig.Name == "" {
-				reqConfig.Name = defaultNameLabel
+				reqConfig.Name = config.DefaultNameLabel
 			}
 
 			names[reqConfig.Name] = reqConfig.HCLBody()
@@ -143,7 +143,7 @@ func refineEndpoints(helper *helper, endpoints config.Endpoints, checkPathPatter
 			}
 		}
 
-		if _, ok := names[defaultNameLabel]; checkPathPattern && !ok && ep.Response == nil {
+		if _, ok := names[config.DefaultNameLabel]; checkPathPattern && !ok && ep.Response == nil {
 			return newDiagErr(&subject, "Missing a 'default' proxy or request definition, or a response block")
 		}
 

diff --git a/config/configload/load.go b/config/configload/load.go
@@ -44,8 +44,6 @@ const (
 	spa             = "spa"
 	tls             = "tls"
 	tokenRequest    = "beta_token_request"
-	// defaultNameLabel maps the hcl label attr 'name'.
-	defaultNameLabel = "default"
 )
 
 var defaultsConfig *config.Defaults

diff --git a/config/configload/merge.go b/config/configload/merge.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/avenga/couper/config"
 	"github.com/avenga/couper/eval"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
@@ -535,7 +536,7 @@ func mergeDefinitions(bodies []*hclsyntax.Body) (*hclsyntax.Block, map[string]*h
 
 							delete(innerBlock.Body.Attributes, "name")
 						} else {
-							innerBlock.Labels[0] = defaultNameLabel
+							innerBlock.Labels[0] = config.DefaultNameLabel
 						}
 
 						proxiesList[label] = innerBlock

diff --git a/config/const.go b/config/const.go
@@ -0,0 +1,4 @@
+package config
+
+// DefaultNameLabel maps the hcl label attr 'name'.
+const DefaultNameLabel = "default"
diff --git a/logging/upstream_log.go b/logging/upstream_log.go
@@ -13,6 +13,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/zclconf/go-cty/cty"
 
+	"github.com/avenga/couper/config"
 	"github.com/avenga/couper/config/env"
 	"github.com/avenga/couper/config/request"
 	"github.com/avenga/couper/errors"
@@ -162,7 +163,7 @@ func (u *UpstreamLog) RoundTrip(req *http.Request) (*http.Response, error) {
 		}
 	}
 
-	if name, ok := requestFields["name"].(string); ok && name != "default" {
+	if name, ok := requestFields["name"].(string); ok && name != config.DefaultNameLabel {
 		serverTimingsKey += "_" + name
 	}