1Password/onepassword-operator
1
0
Fork 0
mirror of https://github.com/1Password/onepassword-operator.git synced 2025-10-22 23:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use GetProjectRoot in Run

Browse Source
This commit is contained in:
Volodymyr Zotov
2025-08-20 14:15:26 -05:00
parent e167db2357
commit 88b2dfbf67
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/cmd/cmd.go
View File

@@ -12,13 +12,13 @@ import (
func Run(name string, args ...string) (string, error) { func Run(name string, args ...string) (string, error) {
cmd := exec.Command(name, args...) cmd := exec.Command(name, args...)
wd, err := os.Getwd() rootDir, err := GetProjectRoot()
if err != nil { if err != nil {
return wd, err return "", err
} }
wd = strings.Replace(wd, "/test/e2e", "", -1)
// Command will run from project root // Command will run from project root
cmd.Dir = wd cmd.Dir = rootDir
command := strings.Join(cmd.Args, " ") command := strings.Join(cmd.Args, " ")
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()

3
test/testhelper/kube/kube.go
View File

@@ -15,6 +15,7 @@ import (
func CreateSecretFromEnvVar(envVar, secretName string) { func CreateSecretFromEnvVar(envVar, secretName string) {
value, _ := os.LookupEnv(envVar) value, _ := os.LookupEnv(envVar)
Expect(value).NotTo(BeEmpty()) Expect(value).NotTo(BeEmpty())
_, err := cmd.Run("kubectl", "create", "secret", "generic", secretName, "--from-literal=token="+value) _, err := cmd.Run("kubectl", "create", "secret", "generic", secretName, "--from-literal=token="+value)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
@@ -26,6 +27,8 @@ func CreateSecretFromFile(fileName, secretName string) {
func CreateOpCredentialsSecret() { func CreateOpCredentialsSecret() {
rootDir, err := cmd.GetProjectRoot() rootDir, err := cmd.GetProjectRoot()
Expect(err).NotTo(HaveOccurred())
credentialsFilePath := filepath.Join(rootDir, "1password-credentials.json") credentialsFilePath := filepath.Join(rootDir, "1password-credentials.json")
data, err := os.ReadFile(credentialsFilePath) data, err := os.ReadFile(credentialsFilePath)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())