updating hcp link structs, and fix diagnose (#17097)

command/operator_diagnose.go

@@ -719,6 +719,12 @@ SEALFAIL:
 		diagnose.Skipped(ctx, "HCP link check will not run on OSS Vault.")
 	} else {
 		if config.HCPLinkConf != nil {
+			// we need to override API and Passthrough capabilities
+			// as they could not be initialized when Vault http handler
+			// is not fully initialized
+			config.HCPLinkConf.EnablePassThroughCapability = false
+			config.HCPLinkConf.EnableAPICapability = false
+
 			diagnose.Test(ctx, "Check HCP Connection", func(ctx context.Context) error {
 				hcpLink, err := hcp_link.NewHCPLink(config.HCPLinkConf, vaultCore, server.logger)
 				if err != nil || hcpLink == nil {
@@ -729,7 +735,7 @@ SEALFAIL:
 				deadline := time.Now().Add(5 * time.Second)
 				linkSessionStatus := "disconnected"
 				for time.Now().Before(deadline) {
-					linkSessionStatus = hcpLink.GetScadaSessionStatus()
+					linkSessionStatus = hcpLink.GetConnectionStatusMessage(hcpLink.GetScadaSessionStatus())
 					if linkSessionStatus == "connected" {
 						break
 					}

vault/hcp_link/link_oss.go

@@ -17,3 +17,7 @@ func (h *WrappedHCPLinkVault) Shutdown() error {
 }
 
 func (h *WrappedHCPLinkVault) GetScadaSessionStatus() string { return Disconnected }
+
+func (h *WrappedHCPLinkVault) GetConnectionStatusMessage(scadaStatus string) string {
+	return scadaStatus
+}

vault/hcp_link/structs.go

@@ -17,4 +17,5 @@ type WrappedHCPLinkVault struct {
 type HCPLinkVaultInterface interface {
 	Shutdown() error
 	GetScadaSessionStatus() string
+	GetConnectionStatusMessage(string) string
 }