fix: use correct environment variable key (#368)

zepatrik · web-flow · commit 01e8ef0d1ed0 · 2024-07-29T15:01:30.000+02:00
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -22,7 +22,7 @@ jobs:
           go build -o ory .
           ./ory tunnel http://localhost:4001 --quiet &
         env:
-          ORY_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
+          ORY_PROJECT_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
           ORY_PROJECT_SLUG: admiring-tu-swczqlujc0
       - name: Install dependencies
         working-directory: cmd/cloudx/e2e
@@ -62,7 +62,7 @@ jobs:
           go build -o ory .
           ./ory proxy https://ory-network-httpbin-ijakee5waq-ez.a.run.app/anything --rewrite-host --quiet &
         env:
-          ORY_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
+          ORY_PROJECT_API_KEY: ${{ secrets.ORY_PROJECT_API_KEY }}
           ORY_PROJECT_SLUG: admiring-tu-swczqlujc0
       - name: Install Node
         working-directory: cmd/cloudx/e2e
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
           ./ory proxy https://ory-network-httpbin-ijakee5waq-ez.a.run.app --quiet --rewrite-host &
           npm run test
         env:
-          ORY_API_KEY: nokey
+          ORY_PROJECT_API_KEY: nokey
           ORY_PROJECT_SLUG: affectionate-archimedes-s9mkjq77k0
           ORY_CONSOLE_URL: https://console.staging.ory.dev
           ORY_ORYAPIS_URL: https://staging.oryapis.dev
diff --git a/cmd/cloudx/client/api_key.go b/cmd/cloudx/client/api_key.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 
 	cloud "github.com/ory/client-go"
 	"github.com/ory/x/cmdx"
@@ -65,7 +66,7 @@ func (h *CommandHelper) DeleteWorkspaceAPIKey(ctx context.Context, workspaceID,
 }
 
 func (h *CommandHelper) TemporaryAPIKey(ctx context.Context, name string) (apiKey string, cleanup func() error, err error) {
-	if ak := GetProjectAPIKeyFromEnvironment(); len(ak) > 0 {
+	if ak := os.Getenv(ProjectAPIKey); len(ak) > 0 {
 		return ak, noop, nil
 	}
 
diff --git a/cmd/cloudx/client/tokens.go b/cmd/cloudx/client/tokens.go
diff --git a/cmd/cloudx/project/patch_oauth2_config_test.go b/cmd/cloudx/project/patch_oauth2_config_test.go
@@ -51,8 +51,6 @@ func TestPatchHydraConfig(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
 			runWithProjectAsDefault(ctx, t, defaultProject.Id, tc.doPatch)
 			runWithProjectAsFlag(ctx, t, extraProject.Id, tc.doPatch)
 		})

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"context"`
`8`	`8`	`"errors"`
`9`	`9`	`"fmt"`
	`10`	`+ "os"`
`10`	`11`
`11`	`12`	`cloud "github.com/ory/client-go"`
`12`	`13`	`"github.com/ory/x/cmdx"`
`@@ -65,7 +66,7 @@ func (h *CommandHelper) DeleteWorkspaceAPIKey(ctx context.Context, workspaceID,`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`func (h *CommandHelper) TemporaryAPIKey(ctx context.Context, name string) (apiKey string, cleanup func() error, err error) {`
`68`		`- if ak := GetProjectAPIKeyFromEnvironment(); len(ak) > 0 {`
	`69`	`+ if ak := os.Getenv(ProjectAPIKey); len(ak) > 0 {`
`69`	`70`	`return ak, noop, nil`
`70`	`71`	`}`
`71`	`72`