Skip to content

Commit

Permalink
customizations
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidsiaw
davidsiaw committed Jul 18, 2024
1 parent 5b566bd commit 074938b
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 20 deletions.
7 changes: 6 additions & 1 deletion cmd/login.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,18 @@ var LoginCommand = cli.Command{
Name: "vault-url",
Usage: "Vault URL",
},
cli.StringFlag{
Name: "keytype",
Usage: "Override key type. Default: ecdsa",
},
},
Action: func(c *cli.Context) error {
endpoint := c.Args().Get(0)
backend := c.String("auth")
gh_token := c.String("github-token")
vault_token := c.String("vault-token")
vault_url := c.String("vault-url")
keytype := c.String("keytype")

ext := struct {
utils.UserInputReader
Expand All @@ -52,7 +57,7 @@ var LoginCommand = cli.Command{
&utils.FileOps{},
}

operation := operations.NewLoginOperation(endpoint, backend, gh_token, vault_token, vault_url, ext)
operation := operations.NewLoginOperation(endpoint, backend, gh_token, vault_token, vault_url, keytype, ext)
return operations.Execute(operation)
},
Subcommands: []cli.Command{
Expand Down
1 change: 1 addition & 0 deletions cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ var RunCommand = cli.Command{
if user != "" {
params["user"] = user
}

err := connectToHeritage(params, heritageName, detach)

if err != nil {
Expand Down
6 changes: 4 additions & 2 deletions operations/login_operation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,18 @@ type LoginOperation struct {
ghToken string
vaultToken string
vaultUrl string
keytype string
ext LoginOperationExternals
}

func NewLoginOperation(endpoint string, backend string, ghToken string, vaultToken string, vaultUrl string, ext LoginOperationExternals) *LoginOperation {
func NewLoginOperation(endpoint string, backend string, ghToken string, vaultToken string, vaultUrl string, keytype string, ext LoginOperationExternals) *LoginOperation {
return &LoginOperation{
endpoint: endpoint,
backend: backend,
ghToken: ghToken,
vaultToken: vaultToken,
vaultUrl: vaultUrl,
keytype: keytype,
ext: ext,
}
}
Expand Down Expand Up @@ -134,7 +136,7 @@ func setUpKeys(oper LoginOperation, user *api.User) *runResult {
if !keyExists {
fmt.Println("Generating your SSH key pair...")
err := oper.ext.RunCommand("ssh-keygen",
"-t", "ecdsa",
"-t", "ecdsa-sk",
"-b", "521",
"-f", oper.ext.GetPrivateKeyPath(),
"-C", "")
Expand Down
119 changes: 102 additions & 17 deletions operations/login_operation_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package operations

import (
"fmt"
"io"
"testing"

Expand Down Expand Up @@ -79,7 +80,7 @@ func (m mockLoginOperationExternals) GetPrivateKeyPath() string {
}

func TestUnknownBackend(t *testing.T) {
op := NewLoginOperation("https://endpoint", "mybckend", "gh_token", "vault_token", "https://vault_url", &mockLoginOperationExternals{})
op := NewLoginOperation("https://endpoint", "mybckend", "gh_token", "vault_token", "https://vault_url", "", &mockLoginOperationExternals{})
result := op.run()

if result.is_error != true {
Expand All @@ -100,7 +101,7 @@ func TestGithubBackend(t *testing.T) {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "github", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "github", "", "", "", "", ext)
result := op.run()

if result.is_error != false {
Expand All @@ -118,7 +119,7 @@ func ExampleLoginOperation_run_with_github_already_has_ssh() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "github", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "github", "", "", "", "", ext)
op.run()

// Output:
Expand All @@ -137,7 +138,7 @@ func ExampleLoginOperation_run_with_github_token_already_has_ssh() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "github", "gh_token", "", "", ext)
op := NewLoginOperation("https://endpoint", "github", "gh_token", "", "", "", ext)
op.run()

// Output:
Expand All @@ -154,7 +155,7 @@ func ExampleLoginOperation_run_with_github() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "github", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "github", "", "", "", "", ext)
op.run()

// Output:
Expand All @@ -173,7 +174,7 @@ func ExampleLoginOperation_run_with_github_token() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "github", "gh_token", "", "", ext)
op := NewLoginOperation("https://endpoint", "github", "gh_token", "", "", "", ext)
op.run()

// Output:
Expand All @@ -191,7 +192,7 @@ func TestVaultBackend(t *testing.T) {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "", "", "", ext)
result := op.run()

if result.is_error != false {
Expand All @@ -209,7 +210,7 @@ func ExampleLoginOperation_run_with_vault_already_has_ssh() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "vault", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "", "", "", ext)
op.run()

// Output:
Expand All @@ -229,7 +230,7 @@ func ExampleLoginOperation_run_with_vault_token_already_has_ssh() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "", "", ext)
op.run()

// Output:
Expand All @@ -247,7 +248,7 @@ func ExampleLoginOperation_run_with_vault() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "", "", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "", "", "", ext)
op.run()

// Output:
Expand All @@ -267,7 +268,7 @@ func ExampleLoginOperation_run_with_vault_token() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "", "", ext)
op.run()

// Output:
Expand All @@ -287,7 +288,7 @@ func ExampleLoginOperation_run_with_vault_already_has_ssh_given_url() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "vault", "", "", "https://vaultserv", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "", "https://vaultserv", "", ext)
op.run()

// Output:
Expand All @@ -306,7 +307,7 @@ func ExampleLoginOperation_run_with_vault_token_already_has_ssh_given_url() {
fileExistsBool: true,
}

op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", "", ext)
op.run()

// Output:
Expand All @@ -323,7 +324,7 @@ func ExampleLoginOperation_run_with_vault_given_url() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "", "https://vaultserv", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "", "https://vaultserv", "", ext)
op.run()

// Output:
Expand All @@ -342,7 +343,7 @@ func ExampleLoginOperation_run_with_vault_token_given_url() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", "", ext)
op.run()

// Output:
Expand All @@ -366,7 +367,7 @@ func ExampleLoginOperation_run_with_vault_token_given_url_but_fails() {
readFileBytes: []byte("stuff"),
}

op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", ext)
op := NewLoginOperation("https://endpoint", "vault", "", "gh_token", "https://vaultserv", "", ext)
op.run()

// Output:
Expand All @@ -375,9 +376,93 @@ func ExampleLoginOperation_run_with_vault_token_given_url_but_fails() {

func ExampleLoginOperation_run_output() {

op := NewLoginOperation("https://endpoint", "somethingrando", "gh_token", "vault_token", "https://vault_url", &mockLoginOperationExternals{})
op := NewLoginOperation("https://endpoint", "somethingrando", "gh_token", "vault_token", "https://vault_url", "", &mockLoginOperationExternals{})
op.run()

// Output:
//
}




type mockLoginOperationExternalsForSetup struct {
readString string
readError error

loginWithGithubUser *api.User
loginWithGithubError error

loginWithVaultUser *api.User
loginWithVaultError error

readFileBytes []byte
readFileError error

patchBytes []byte
patchError error

fileExistsBool bool
}

func (m mockLoginOperationExternalsForSetup) Read(secret bool) (string, error) {
return m.readString, m.readError
}

func (m mockLoginOperationExternalsForSetup) RunCommand(name string, arg ...string) error {
fmt.Println("RunName: ", name)
fmt.Println("RunArg: ", arg)
return nil
}

func (m mockLoginOperationExternalsForSetup) FileExists(path string) bool {
return m.fileExistsBool
}

func (m mockLoginOperationExternalsForSetup) ReadFile(path string) ([]byte, error) {
return m.readFileBytes, m.readFileError
}

func (m mockLoginOperationExternalsForSetup) LoginWithGithub(endpoint string, token string) (*api.User, error) {
return m.loginWithGithubUser, m.loginWithGithubError
}

func (m mockLoginOperationExternalsForSetup) LoginWithVault(vault_url string, token string) (*api.User, error) {
return m.loginWithVaultUser, m.loginWithVaultError
}

func (m mockLoginOperationExternalsForSetup) ReloadDefaultClient() (LoginOperationClient, error) {
return m, nil
}

func (m mockLoginOperationExternalsForSetup) Patch(path string, body io.Reader) ([]byte, error) {

return m.patchBytes, m.patchError
}

func (m mockLoginOperationExternalsForSetup) WriteLogin(auth string, token string, endpoint string, vaultUrl string, vaultToken string) error {
return nil
}

func (m mockLoginOperationExternalsForSetup) GetPublicKeyPath() string {
return ""
}

func (m mockLoginOperationExternalsForSetup) GetPrivateKeyPath() string {
return ""
}

func ExampleLoginOperation_setUpKeys_() {

var user api.User
op := NewLoginOperation("https://endpoint", "somethingrando", "gh_token", "vault_token", "https://vault_url", "", &mockLoginOperationExternalsForSetup{})

setUpKeys(*op, &user)

// Output:
// Generating your SSH key pair...
// RunName: ssh-keygen
// RunArg: [-t ecdsa -b 521 -f -C ]
// Registering your public key...
}

0 comments on commit 074938b

Please sign in to comment.