yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #117 - handle whitespace in actrc secrets (#118)

Browse source 
* fix #117 - handle whitespace in actrc secrets

* Switch to raw string on regex pattern

Co-authored-by: Casey Lee <cplee@nektos.com>
This commit is contained in:
Steffen Schmitz 2020-03-02 17:11:46 +01:00 committed by GitHub
parent a5570ffdd6
commit 4f84be12e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/root.go
View file

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"regexp"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/nektos/act/pkg/common"
@ -74,7 +75,7 @@ func readArgsFile(file string) []string {
for scanner.Scan() { for scanner.Scan() {
arg := scanner.Text() arg := scanner.Text()
if strings.HasPrefix(arg, "-") { if strings.HasPrefix(arg, "-") {
args = append(args, strings.Fields(arg)...) args = append(args, regexp.MustCompile(`\s`).Split(arg, 2)...)
} }
} }
return args return args

2
cmd/secrets.go
View file

@ -14,7 +14,7 @@ type secrets map[string]string
func newSecrets(secretList []string) secrets { func newSecrets(secretList []string) secrets {
s := make(map[string]string) s := make(map[string]string)
for _, secretPair := range secretList { for _, secretPair := range secretList {
secretPairParts := strings.Split(secretPair, "=") secretPairParts := strings.SplitN(secretPair, "=", 2)
if len(secretPairParts) == 2 { if len(secretPairParts) == 2 {
s[secretPairParts[0]] = secretPairParts[1] s[secretPairParts[0]] = secretPairParts[1]
} else if env, ok := os.LookupEnv(secretPairParts[0]); ok && env != "" { } else if env, ok := os.LookupEnv(secretPairParts[0]); ok && env != "" {