mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-08 15:47:00 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hamid Ghaf 2022-09-12 11:10:01 -04:00 committed by GitHub
parent 71cb0a2ae5
commit a9138889f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/operator_diagnose.go
View File

@ -719,6 +719,12 @@ SEALFAIL:
diagnose.Skipped(ctx, "HCP link check will not run on OSS Vault.") diagnose.Skipped(ctx, "HCP link check will not run on OSS Vault.")
} else { } else {
if config.HCPLinkConf != nil { 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 { diagnose.Test(ctx, "Check HCP Connection", func(ctx context.Context) error {
hcpLink, err := hcp_link.NewHCPLink(config.HCPLinkConf, vaultCore, server.logger) hcpLink, err := hcp_link.NewHCPLink(config.HCPLinkConf, vaultCore, server.logger)
if err != nil || hcpLink == nil { if err != nil || hcpLink == nil {
@ -729,7 +735,7 @@ SEALFAIL:
deadline := time.Now().Add(5 * time.Second) deadline := time.Now().Add(5 * time.Second)
linkSessionStatus := "disconnected" linkSessionStatus := "disconnected"
for time.Now().Before(deadline) { for time.Now().Before(deadline) {
linkSessionStatus = hcpLink.GetScadaSessionStatus() linkSessionStatus = hcpLink.GetConnectionStatusMessage(hcpLink.GetScadaSessionStatus())
if linkSessionStatus == "connected" { if linkSessionStatus == "connected" {
break break
} }

4
vault/hcp_link/link_oss.go
View File

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

1
vault/hcp_link/structs.go
View File

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