Skip to content

fix: use correct project API environment key #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zepatrik merged 3 commits into from
Jul 29, 2024
Merged

fix: use correct project API environment key #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62dcf15
fix: use correct project API environment key
zepatrik Jul 28, 2024
6135641
test: deflake
zepatrik Jul 29, 2024
914f0b9
fix: use correct env var key for consent UI
zepatrik Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cmd/cloudx/client/api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"errors"
"fmt"
"os"

cloud "github.com/ory/client-go"
"github.com/ory/x/cmdx"
Expand Down Expand Up @@ -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
}

Expand Down
13 changes: 0 additions & 13 deletions cmd/cloudx/client/tokens.go
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions cmd/cloudx/project/patch_oauth2_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
Expand Down