Merge pull request #22 from kubescape/load-creds

David Wertenteil · web-flow · commit 7ff4789192ff · 2024-01-16T07:57:07.000+02:00
trim newline
diff --git a/pkg/utils/credentials.go b/pkg/utils/credentials.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"fmt"
 	"os"
+	"strings"
 )
 
 const (
@@ -29,10 +30,10 @@ func LoadCredentialsFromFile(secretPath string) (*Credentials, error) {
 
 	t := &Credentials{}
 	if accessKey, err := os.ReadFile(accessKeyPath); err == nil {
-		t.AccessKey = string(accessKey)
+		t.AccessKey = strings.TrimSuffix(string(accessKey), "\n")
 	}
 	if account, err := os.ReadFile(accountPath); err == nil {
-		t.Account = string(account)
+		t.Account = strings.TrimSuffix(string(account), "\n")
 	}
 
 	return t, nil

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package utils`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"os"`
	`6`	`+ "strings"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`const (`
`@@ -29,10 +30,10 @@ func LoadCredentialsFromFile(secretPath string) (*Credentials, error) {`
`29`	`30`
`30`	`31`	`t := &Credentials{}`
`31`	`32`	`if accessKey, err := os.ReadFile(accessKeyPath); err == nil {`
`32`		`- t.AccessKey = string(accessKey)`
	`33`	`+ t.AccessKey = strings.TrimSuffix(string(accessKey), "\n")`
`33`	`34`	`}`
`34`	`35`	`if account, err := os.ReadFile(accountPath); err == nil {`
`35`		`- t.Account = string(account)`
	`36`	`+ t.Account = strings.TrimSuffix(string(account), "\n")`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`return t, nil`