From a9138889f0670934d5240d8891c56b033bb29e81 Mon Sep 17 00:00:00 2001
From: Hamid Ghaf <83242695+hghaf099@users.noreply.github.com>
Date: Mon, 12 Sep 2022 11:10:01 -0400
Subject: [PATCH] updating hcp link structs, and fix diagnose (#17097)

---
 command/operator_diagnose.go | 8 +++++++-
 vault/hcp_link/link_oss.go   | 4 ++++
 vault/hcp_link/structs.go    | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/command/operator_diagnose.go b/command/operator_diagnose.go
index 080771b652..fc9ed178f5 100644
--- a/command/operator_diagnose.go
+++ b/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
 					}
diff --git a/vault/hcp_link/link_oss.go b/vault/hcp_link/link_oss.go
index bb816ed013..badc7d7761 100644
--- a/vault/hcp_link/link_oss.go
+++ b/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
+}
diff --git a/vault/hcp_link/structs.go b/vault/hcp_link/structs.go
index e02246bac7..9ca057168f 100644
--- a/vault/hcp_link/structs.go
+++ b/vault/hcp_link/structs.go
@@ -17,4 +17,5 @@ type WrappedHCPLinkVault struct {
 type HCPLinkVaultInterface interface {
 	Shutdown() error
 	GetScadaSessionStatus() string
+	GetConnectionStatusMessage(string) string
 }