manual backport of #17296 to release/1.15.x (#17343)

* update hcp-sdk-go * add version, datacenter and acl info * fewer changes * go mod tidy and lint * less code * remove duplicated dep * fmt * trigger ci
hashicorp · May 13, 2023 · 85fbc59 · 85fbc59
1 parent 42eec33
commit 85fbc59
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/agent/consul/server.go b/agent/consul/server.go
@@ -1866,6 +1866,7 @@ func (s *Server) hcpServerStatus(deps Deps) hcp.StatusCallback {
 		status.LanAddress = s.config.RPCAdvertise.IP.String()
 		status.GossipPort = s.config.SerfLANConfig.MemberlistConfig.AdvertisePort
 		status.RPCPort = s.config.RPCAddr.Port
+		status.Datacenter = s.config.Datacenter
 
 		tlsCert := s.tlsConfigurator.Cert()
 		if tlsCert != nil {
@@ -1907,6 +1908,8 @@ func (s *Server) hcpServerStatus(deps Deps) hcp.StatusCallback {
 			status.ScadaStatus = deps.HCP.Provider.SessionStatus()
 		}
 
+		status.ACL.Enabled = s.config.ACLsEnabled
+
 		return status, nil
 	}
 }

diff --git a/agent/hcp/client.go b/agent/hcp/client.go
@@ -77,10 +77,12 @@ func httpClient(c config.CloudConfig) (*httptransport.Runtime, error) {
 }
 
 func (c *hcpClient) FetchBootstrap(ctx context.Context) (*BootstrapConfig, error) {
+	version := version.GetHumanVersion()
 	params := hcpgnm.NewAgentBootstrapConfigParamsWithContext(ctx).
 		WithID(c.resource.ID).
 		WithLocationOrganizationID(c.resource.Organization).
-		WithLocationProjectID(c.resource.Project)
+		WithLocationProjectID(c.resource.Project).
+		WithConsulVersion(&version)
 
 	resp, err := c.gnm.AgentBootstrapConfig(params, nil)
 	if err != nil {
@@ -129,10 +131,12 @@ type ServerStatus struct {
 	LanAddress string
 	GossipPort int
 	RPCPort    int
+	Datacenter string
 
 	Autopilot ServerAutopilot
 	Raft      ServerRaft
 	TLS       ServerTLSInfo
+	ACL       ServerACLInfo
 
 	ScadaStatus string
 }
@@ -152,6 +156,10 @@ type ServerRaft struct {
 	TimeSinceLastContact time.Duration
 }
 
+type ServerACLInfo struct {
+	Enabled bool
+}
+
 type ServerTLSInfo struct {
 	Enabled              bool
 	CertExpiry           time.Time
@@ -196,6 +204,10 @@ func serverStatusToHCP(s *ServerStatus) *gnmmod.HashicorpCloudGlobalNetworkManag
 		},
 		Version:     s.Version,
 		ScadaStatus: s.ScadaStatus,
+		ACL: &gnmmod.HashicorpCloudGlobalNetworkManager20220215ACLInfo{
+			Enabled: s.ACL.Enabled,
+		},
+		Datacenter: s.Datacenter,
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -59,7 +59,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/hcp-scada-provider v0.2.3
-	github.com/hashicorp/hcp-sdk-go v0.40.1-0.20230404193545-846aea419cd1
+	github.com/hashicorp/hcp-sdk-go v0.44.1-0.20230508124639-28da4c5b03f3
 	github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038
 	github.com/hashicorp/memberlist v0.5.0
 	github.com/hashicorp/raft v1.5.0

diff --git a/go.sum b/go.sum
@@ -601,8 +601,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/hcp-scada-provider v0.2.3 h1:AarYR+/Pcv+cMvPdAlb92uOBmZfEH6ny4+DT+4NY2VQ=
 github.com/hashicorp/hcp-scada-provider v0.2.3/go.mod h1:ZFTgGwkzNv99PLQjTsulzaCplCzOTBh0IUQsPKzrQFo=
-github.com/hashicorp/hcp-sdk-go v0.40.1-0.20230404193545-846aea419cd1 h1:C1des4/oIeUqQJVUWypnZth19Kg+k01q+V59OVNMB+Q=
-github.com/hashicorp/hcp-sdk-go v0.40.1-0.20230404193545-846aea419cd1/go.mod h1:hZqky4HEzsKwvLOt4QJlZUrjeQmb4UCZUhDP2HyQFfc=
+github.com/hashicorp/hcp-sdk-go v0.44.1-0.20230508124639-28da4c5b03f3 h1:9QstZdsLIS6iPyYxQoyymRz8nBw9jMdEbGy29gtgzVQ=
+github.com/hashicorp/hcp-sdk-go v0.44.1-0.20230508124639-28da4c5b03f3/go.mod h1:hZqky4HEzsKwvLOt4QJlZUrjeQmb4UCZUhDP2HyQFfc=
 github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 h1:n9J0rwVWXDpNd5iZnwY7w4WZyq53/rROeI7OVvLW8Ok=
 github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=