From a589c32269f7eacf1b409e4bd81b20469d36119b Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 16 Jun 2022 09:21:11 -0500 Subject: [PATCH] Minor capitalization change --- internal/cmd/commands/server/server.go | 6 +++--- internal/cmd/config/config.go | 2 +- internal/daemon/worker/controller_connection.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index 5013282e32..d6bb25c490 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -353,10 +353,10 @@ func (c *Command) Run(args []string) int { } } - if c.Config.HCPBClusterId != "" { - _, err := uuid.ParseUUID(c.Config.HCPBClusterId) + if c.Config.HcpbClusterId != "" { + _, err := uuid.ParseUUID(c.Config.HcpbClusterId) if err != nil { - c.UI.Error(fmt.Errorf("Invalid HCPB cluster id %q: %w", c.Config.HCPBClusterId, err).Error()) + c.UI.Error(fmt.Errorf("Invalid HCP Boundary cluster id %q: %w", c.Config.HcpbClusterId, err).Error()) return base.CommandUserError } } diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index 91135af4cf..1a59811f72 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -126,7 +126,7 @@ type Config struct { Plugins Plugins `hcl:"plugins"` // Internal field for use with HCP deployments. Used if controllers/ initial_upstreams is not set - HCPBClusterId string `hcl:"hcp_boundary_cluster_id"` + HcpbClusterId string `hcl:"hcp_boundary_cluster_id"` } type Controller struct { diff --git a/internal/daemon/worker/controller_connection.go b/internal/daemon/worker/controller_connection.go index 1779784a3c..f6ca52c36e 100644 --- a/internal/daemon/worker/controller_connection.go +++ b/internal/daemon/worker/controller_connection.go @@ -59,10 +59,10 @@ func (w *Worker) StartControllerConnections() error { } if len(initialAddrs) == 0 { - if w.conf.RawConfig.HCPBClusterId != "" { - clusterAddress := fmt.Sprintf("%s%s", w.conf.RawConfig.HCPBClusterId, hcpbUrlSuffix) + if w.conf.RawConfig.HcpbClusterId != "" { + clusterAddress := fmt.Sprintf("%s%s", w.conf.RawConfig.HcpbClusterId, hcpbUrlSuffix) initialAddrs = append(initialAddrs, resolver.Address{Addr: clusterAddress}) - event.WriteSysEvent(w.baseContext, op, fmt.Sprintf("Setting HCPB Cluster address %s as upstream address", clusterAddress)) + event.WriteSysEvent(w.baseContext, op, fmt.Sprintf("Setting HCP Boundary cluster address %s as upstream address", clusterAddress)) } else { return errors.New("no initial upstream addresses found") }