Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor the cluster listener #6232

Merged
merged 8 commits into from
Feb 15, 2019
Merged

Refactor the cluster listener #6232

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aec41ce
Port over OSS cluster port refactor components
Feb 13, 2019
94b822f
Start forwarding
Feb 13, 2019
833f498
Cleanup a bit
Feb 13, 2019
0063484
Fix copy error
Feb 13, 2019
f79f748
Return error from perf standby creation
Feb 13, 2019
d9aa4dc
Add some more comments
Feb 14, 2019
f123ae6
Fix copy/paste error
Feb 14, 2019
7933d75
Merge branch '1.1-beta' into cluster-refactor-oss
briankassouf Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions helper/certutil/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,21 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
"math/big"
"strings"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/helper/errutil"
)

// This can be one of a few key types so the different params may or may not be filled
type ClusterKeyParams struct {
Type string `json:"type" structs:"type" mapstructure:"type"`
X *big.Int `json:"x" structs:"x" mapstructure:"x"`
Y *big.Int `json:"y" structs:"y" mapstructure:"y"`
D *big.Int `json:"d" structs:"d" mapstructure:"d"`
}

// Secret is used to attempt to unmarshal a Vault secret
// JSON response, as a convenience
type Secret struct {
Expand Down
Loading