diff --git a/cmd/garm-cli/cmd/github_credentials.go b/cmd/garm-cli/cmd/github_credentials.go index ca345332..d328f5ee 100644 --- a/cmd/garm-cli/cmd/github_credentials.go +++ b/cmd/garm-cli/cmd/github_credentials.go @@ -15,6 +15,8 @@ package cmd import ( + "crypto/x509" + "encoding/pem" "fmt" "os" "strconv" @@ -258,20 +260,20 @@ func init() { } func parsePrivateKeyFromPath(path string) ([]byte, error) { - // if _, err := os.Stat(path); err != nil { - // return nil, fmt.Errorf("private key file not found: %s", credentialsPrivateKeyPath) - // } + if _, err := os.Stat(path); err != nil { + return nil, fmt.Errorf("private key file not found: %s", credentialsPrivateKeyPath) + } keyContents, err := os.ReadFile(path) if err != nil { return nil, fmt.Errorf("failed to read private key file: %w", err) } - // pemBlock, _ := pem.Decode(keyContents) - // if pemBlock == nil { - // return nil, fmt.Errorf("failed to decode PEM block") - // } - // if _, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes); err != nil { - // return nil, fmt.Errorf("failed to parse private key: %w", err) - // } + pemBlock, _ := pem.Decode(keyContents) + if pemBlock == nil { + return nil, fmt.Errorf("failed to decode PEM block") + } + if _, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes); err != nil { + return nil, fmt.Errorf("failed to parse private key: %w", err) + } return keyContents, nil } diff --git a/test/integration/e2e/credentials.go b/test/integration/e2e/credentials.go index 2ca027c5..67e1d35c 100644 --- a/test/integration/e2e/credentials.go +++ b/test/integration/e2e/credentials.go @@ -170,7 +170,7 @@ func TestGithubCredentialsFailWhenEndpointDoesntExist() { slog.Info("Testing error when endpoint doesn't exist") createCredsParams := params.CreateGithubCredentialsParams{ Name: dummyCredentialsName, - Endpoint: defaultEndpointName, + Endpoint: "iDontExist.example.com", Description: "GARM test credentials", AuthType: params.GithubAuthTypePAT, PAT: params.GithubPAT{