feat: add project_id support to ory_json_web_key_set resource#130
Closed
feat: add project_id support to ory_json_web_key_set resource#130
Conversation
The JWK resource previously required project_slug and project_api_key on the provider, with no way to specify project_id at the resource level. This made it impossible to use with project_id-based workflows. Changes: - Add optional project_id attribute to ory_json_web_key_set (falls back to provider's project_id when not set) - Add ResolveProjectSlug and ProjectClientForProject methods to the client for resolving project_id to slug via the console API - Support composite import format: project_id/set_id - Update acceptance tests, examples, and documentation
Contributor
There was a problem hiding this comment.
Pull request overview
Adds project_id support to the ory_json_web_key_set resource, allowing project-scoped JWK operations without requiring project_slug on the provider.
Changes:
- New
ResolveProjectSlugandProjectClientForProjectmethods on the client for resolving project ID to slug project_idattribute added to JWK resource with CRUD operations using resolved project client- Import supports
project_id/set_idcomposite format
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| internal/client/client.go | Added methods to resolve project slug and create project-scoped clients |
| internal/resources/jwk/resource.go | Added project_id attribute, updated CRUD to use resolved client, updated import |
| internal/resources/jwk/resource_test.go | Updated tests for project_id usage and composite import |
| internal/resources/jwk/testdata/basic.tf.tmpl | Added project_id to test template |
| examples/resources/ory_json_web_key_set/resource.tf | Updated examples with project_id |
| docs/resources/json_web_key_set.md | Updated docs for project_id |
| templates/resources/json_web_key_set.md.tmpl | Updated doc template |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
+342
to
+346
| func (r *JWKResource) resolveProjectClient(ctx context.Context, projectID string) (*client.OryClient, error) { | ||
| if projectID != "" { | ||
| return r.client.ProjectClientForProject(ctx, projectID) | ||
| } | ||
| return r.client, nil |
Comment on lines
+332
to
+336
| func (r *JWKResource) resolveProjectID(tfProjectID types.String) string { | ||
| if !tfProjectID.IsNull() && !tfProjectID.IsUnknown() { | ||
| return tfProjectID.ValueString() | ||
| } | ||
| return r.client.ProjectID() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Add
project_idsupport to theory_json_web_key_setresource. The resource previously requiredproject_slugandproject_api_keyon the provider with no way to specifyproject_idat the resource level, making it unusable forproject_id-based workflows.The resource now accepts an optional
project_idattribute that auto-resolves the project slug via the console API, eliminating the need to manually configureproject_slugon the provider for JWK operations.Changes
Client (
internal/client/client.go):ResolveProjectSlug(ctx, projectID)-- resolves project ID to slug via console APIProjectClientForProject(ctx, projectID)-- returns a project-scoped client for a given project IDResource (
internal/resources/jwk/resource.go):project_idattribute (optional, computed, requires replace)project_idproject_id/set_idand plainset_idformatsTests, docs, examples updated to demonstrate
project_idusage.Related Issues
Fixes #120
Type of Change
Checklist
make test)make format)Testing
make test-short-- all pass)TestAccJWKResource_basicpasses with create, read, and composite import)Screenshots/Output
Security scans (
make sec && make sec-trivy) -- 0 issues, no leaks.