mirror of
https://github.com/1Password/onepassword-operator.git
synced 2025-10-22 15:38:06 +00:00
Use GetProjectRoot
in Run
This commit is contained in:
@@ -12,13 +12,13 @@ import (
|
||||
func Run(name string, args ...string) (string, error) {
|
||||
cmd := exec.Command(name, args...)
|
||||
|
||||
wd, err := os.Getwd()
|
||||
rootDir, err := GetProjectRoot()
|
||||
if err != nil {
|
||||
return wd, err
|
||||
return "", err
|
||||
}
|
||||
wd = strings.Replace(wd, "/test/e2e", "", -1)
|
||||
|
||||
// Command will run from project root
|
||||
cmd.Dir = wd
|
||||
cmd.Dir = rootDir
|
||||
|
||||
command := strings.Join(cmd.Args, " ")
|
||||
output, err := cmd.CombinedOutput()
|
||||
|
@@ -15,6 +15,7 @@ import (
|
||||
func CreateSecretFromEnvVar(envVar, secretName string) {
|
||||
value, _ := os.LookupEnv(envVar)
|
||||
Expect(value).NotTo(BeEmpty())
|
||||
|
||||
_, err := cmd.Run("kubectl", "create", "secret", "generic", secretName, "--from-literal=token="+value)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
}
|
||||
@@ -26,6 +27,8 @@ func CreateSecretFromFile(fileName, secretName string) {
|
||||
|
||||
func CreateOpCredentialsSecret() {
|
||||
rootDir, err := cmd.GetProjectRoot()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
credentialsFilePath := filepath.Join(rootDir, "1password-credentials.json")
|
||||
data, err := os.ReadFile(credentialsFilePath)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
Reference in New Issue
Block a user