Merge pull request #1189 from 99designs/fix-pointer-ref

Remove reference to pointer
99designs · Mar 16, 2023 · a782d74 · a782d74
2 parents b15cc22 + fd0462c
commit a782d74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.18.5
 	github.com/google/go-cmp v0.5.9
 	github.com/mattn/go-isatty v0.0.17
+	github.com/mattn/go-tty v0.0.4
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	golang.org/x/term v0.5.0
 	gopkg.in/ini.v1 v1.67.0
@@ -32,7 +33,6 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
-	github.com/mattn/go-tty v0.0.4 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/xhit/go-str2duration v1.2.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect

diff --git a/vault/assumeroleprovider.go b/vault/assumeroleprovider.go
@@ -21,7 +21,7 @@ type AssumeRoleProvider struct {
 	Tags              map[string]string
 	TransitiveTagKeys []string
 	SourceIdentity    string
-	*Mfa
+	Mfa
 }
 
 // Retrieve generates a new set of temporary credentials using STS AssumeRole
@@ -62,8 +62,8 @@ func (p *AssumeRoleProvider) assumeRole(ctx context.Context) (*ststypes.Credenti
 		input.ExternalId = aws.String(p.ExternalID)
 	}
 
-	if p.GetMfaSerial() != "" {
-		input.SerialNumber = aws.String(p.GetMfaSerial())
+	if p.MfaSerial != "" {
+		input.SerialNumber = aws.String(p.MfaSerial)
 		input.TokenCode, err = p.GetMfaToken()
 		if err != nil {
 			return nil, err

diff --git a/vault/mfa.go b/vault/mfa.go
@@ -14,28 +14,23 @@ import (
 
 // Mfa contains options for an MFA device
 type Mfa struct {
-	mfaSerial     string
+	MfaSerial     string
 	mfaPromptFunc prompt.Func
 }
 
 // GetMfaToken returns the MFA token
-func (m *Mfa) GetMfaToken() (*string, error) {
+func (m Mfa) GetMfaToken() (*string, error) {
 	if m.mfaPromptFunc != nil {
-		token, err := m.mfaPromptFunc(m.mfaSerial)
+		token, err := m.mfaPromptFunc(m.MfaSerial)
 		return aws.String(token), err
 	}
 
 	return nil, errors.New("No prompt found")
 }
 
-// GetMfaSerial returns the MFA serial
-func (m *Mfa) GetMfaSerial() string {
-	return m.mfaSerial
-}
-
-func NewMfa(config *ProfileConfig) *Mfa {
+func NewMfa(config *ProfileConfig) Mfa {
 	m := Mfa{
-		mfaSerial: config.MfaSerial,
+		MfaSerial: config.MfaSerial,
 	}
 	if config.MfaToken != "" {
 		m.mfaPromptFunc = func(_ string) (string, error) { return config.MfaToken, nil }
@@ -48,7 +43,7 @@ func NewMfa(config *ProfileConfig) *Mfa {
 		m.mfaPromptFunc = prompt.Method(config.MfaPromptMethod)
 	}
 
-	return &m
+	return m
 }
 
 func ProcessMfaProvider(processCmd string) (string, error) {

diff --git a/vault/sessiontokenprovider.go b/vault/sessiontokenprovider.go
@@ -14,7 +14,7 @@ import (
 type SessionTokenProvider struct {
 	StsClient *sts.Client
 	Duration  time.Duration
-	*Mfa
+	Mfa
 }
 
 // Retrieve generates a new set of temporary credentials using STS GetSessionToken
@@ -41,8 +41,8 @@ func (p *SessionTokenProvider) GetSessionToken(ctx context.Context) (*ststypes.C
 		DurationSeconds: aws.Int32(int32(p.Duration.Seconds())),
 	}
 
-	if p.GetMfaSerial() != "" {
-		input.SerialNumber = aws.String(p.GetMfaSerial())
+	if p.MfaSerial != "" {
+		input.SerialNumber = aws.String(p.MfaSerial)
 		input.TokenCode, err = p.GetMfaToken()
 		if err != nil {
 			return nil, err