deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #1958 from cortex3/main

Browse Source 
improve error output of git commands
This commit is contained in:
Kubernetes Prow Robot 2024-11-27 19:52:57 +00:00 committed by GitHub
commit feb82f1e7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/transformer/openshift/utils.go
View File

@ -1,6 +1,7 @@
package openshift package openshift
import ( import (
"github.com/pkg/errors"
"os/exec" "os/exec"
"strings" "strings"
) )
@ -34,12 +35,16 @@ func GetImageTag(image string) string {
func GetAbsBuildContext(context string) (string, error) { func GetAbsBuildContext(context string) (string, error) {
cmd := exec.Command("git", "rev-parse", "--show-prefix") cmd := exec.Command("git", "rev-parse", "--show-prefix")
cmd.Dir = context cmd.Dir = context
out, err := cmd.Output() var out strings.Builder
var stderr strings.Builder
cmd.Stdout = &out
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil { if err != nil {
return "", err return "", errors.New(stderr.String())
} }
//convert output of command to string //convert output of command to string
contextDir := strings.Trim(string(out), "\n") contextDir := strings.Trim(out.String(), "\n")
return contextDir, nil return contextDir, nil
} }
@ -53,11 +58,15 @@ func HasGitBinary() bool {
func GetGitCurrentRemoteURL(composeFileDir string) (string, error) { func GetGitCurrentRemoteURL(composeFileDir string) (string, error) {
cmd := exec.Command("git", "ls-remote", "--get-url") cmd := exec.Command("git", "ls-remote", "--get-url")
cmd.Dir = composeFileDir cmd.Dir = composeFileDir
out, err := cmd.Output() var out strings.Builder
var stderr strings.Builder
cmd.Stdout = &out
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil { if err != nil {
return "", err return "", errors.New(stderr.String())
} }
url := strings.TrimRight(string(out), "\n") url := strings.TrimRight(out.String(), "\n")
if !strings.HasSuffix(url, ".git") { if !strings.HasSuffix(url, ".git") {
url += ".git" url += ".git"
} }
@ -68,9 +77,13 @@ func GetGitCurrentRemoteURL(composeFileDir string) (string, error) {
func GetGitCurrentBranch(composeFileDir string) (string, error) { func GetGitCurrentBranch(composeFileDir string) (string, error) {
cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD") cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
cmd.Dir = composeFileDir cmd.Dir = composeFileDir
out, err := cmd.Output() var out strings.Builder
var stderr strings.Builder
cmd.Stdout = &out
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil { if err != nil {
return "", err return "", errors.New(stderr.String())
} }
return strings.TrimRight(string(out), "\n"), nil return strings.TrimRight(out.String(), "\n"), nil
} }