STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Context

Browse source
This commit is contained in:
Caleb Brose 2022-06-13 19:16:16 +00:00 • committed by GitHub
parent b5580f9503
commit 919dcebc45
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cmd/auth/shared/login_flow.go
View file

@ -37,7 +37,7 @@ type LoginOptions struct {
Executable string
GitProtocol string
sshContext ssh.SshContext
sshContext ssh.Context
}
func Login(opts *LoginOptions) error {

2
pkg/cmd/auth/shared/login_flow_test.go
View file

@ -85,7 +85,7 @@ func TestLogin_ssh(t *testing.T) {
HTTPClient: &http.Client{Transport: &tr},
Hostname: "example.com",
Interactive: true,
sshContext: ssh.SshContext{
sshContext: ssh.Context{
ConfigDir: dir,
KeygenExe: "ssh-keygen",
},

2
pkg/cmd/codespace/ssh.go
View file

@ -121,7 +121,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
args = opts.scpArgs
}
sshContext := ssh.SshContext{}
sshContext := ssh.Context{}
startSSHOptions := liveshare.StartSSHServerOptions{}
if shouldGenerateSSHKeys(args, opts) && sshContext.HasKeygen() {

12
pkg/ssh/ssh_keys.go
View file

@ -12,7 +12,7 @@ import (
"github.com/cli/safeexec"
)
type SshContext struct {
type Context struct {
ConfigDir string
KeygenExe string
}
@ -28,7 +28,7 @@ type KeyAlreadyExistsError struct {
func (err *KeyAlreadyExistsError) Error() string { return "SSH key already exists: " + err.keyPath }
func (c *SshContext) LocalPublicKeys() ([]string, error) {
func (c *Context) LocalPublicKeys() ([]string, error) {
sshDir, err := c.sshDir()
if err != nil {
return nil, err
@ -37,12 +37,12 @@ func (c *SshContext) LocalPublicKeys() ([]string, error) {
return filepath.Glob(filepath.Join(sshDir, "*.pub"))
}
func (c *SshContext) HasKeygen() bool {
func (c *Context) HasKeygen() bool {
_, err := c.findKeygen()
return err == nil
}
func (c *SshContext) GenerateSSHKey(keyName string, passphrase string) (*KeyPair, error) {
func (c *Context) GenerateSSHKey(keyName string, passphrase string) (*KeyPair, error) {
keygenExe, err := c.findKeygen()
if err != nil {
return nil, fmt.Errorf("could not find keygen executable")
@ -76,7 +76,7 @@ func (c *SshContext) GenerateSSHKey(keyName string, passphrase string) (*KeyPair
return &keyPair, nil
}
func (c *SshContext) sshDir() (string, error) {
func (c *Context) sshDir() (string, error) {
if c.ConfigDir != "" {
return c.ConfigDir, nil
}
@ -87,7 +87,7 @@ func (c *SshContext) sshDir() (string, error) {
return dir, err
}
func (c *SshContext) findKeygen() (string, error) {
func (c *Context) findKeygen() (string, error) {
if c.KeygenExe != "" {
return c.KeygenExe, nil
}