Skip to content
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

Jump to bottom

Add support for Org. Token types #943

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Add support for Org. Token types #943

merged 1 commit into from
Aug 16, 2024

Conversation

glennsarti
Copy link
Contributor

Description

HCP Terraform organizations now support different types of tokens. This commit updates the org. auth. token client to support CRUD operations with a token type URL attribute.

Note that the integration tests require an organization that supports audit-logging

Testing plan

Handled by integration tests

External links

Output from tests

Handled by CI

@glennsarti glennsarti self-assigned this Jul 31, 2024
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch 2 times, most recently from ee354e6 to 33ce473 Compare July 31, 2024 08:35
@glennsarti glennsarti requested review from a team July 31, 2024 08:35
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch from 33ce473 to 8f9efea Compare August 1, 2024 01:53
mrinalirao
mrinalirao reviewed Aug 1, 2024
View reviewed changes
organization_token.go Outdated Show resolved Hide resolved
mrinalirao
mrinalirao reviewed Aug 1, 2024
View reviewed changes
organization_token.go Outdated Show resolved Hide resolved
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch from 8f9efea to 97a621f Compare August 1, 2024 02:55
mrinalirao
mrinalirao previously approved these changes Aug 1, 2024
View reviewed changes
Copy link
Contributor

@mrinalirao mrinalirao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! 👍

@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch from 97a621f to 4aec160 Compare August 1, 2024 05:24
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch 2 times, most recently from f8d0b95 to 273b6e0 Compare August 5, 2024 01:12
@glennsarti glennsarti requested a review from mrinalirao August 5, 2024 02:28
mrinalirao
mrinalirao previously approved these changes Aug 5, 2024
View reviewed changes
Maed223
Maed223 previously approved these changes Aug 5, 2024
View reviewed changes
@Maed223 Maed223 dismissed their stale review August 5, 2024 18:30

Caught something after the fact

brandonc
brandonc previously approved these changes Aug 7, 2024
View reviewed changes
organization_token.go Outdated Show resolved Hide resolved
organization_token.go Outdated Show resolved Hide resolved
@glennsarti
Copy link
Contributor Author

Blocking merging pending comments from Brandon and I noticed the delete unit test is giving false positives 😢

@brandonc
Copy link
Collaborator

@glennsarti Yuck! I didn't realize the query param handling was so inconsistent in NewRequest. I tried to make it more consistent in #959, as well as replacing all the QueryEscape usage with PathEscape

If you like it, we can get that merged and rebase this on top, utilizing NewRequestWithAdditionalQueryParams if that helps.

@glennsarti
Copy link
Contributor Author

@brandonc 100% I'll rebase and fixup once that's merged

@glennsarti glennsarti dismissed stale reviews from brandonc and mrinalirao via 02c4c33 August 14, 2024 04:31
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch 3 times, most recently from 28252e6 to a818252 Compare August 14, 2024 04:45
@glennsarti glennsarti requested a review from brandonc August 14, 2024 04:54
@glennsarti glennsarti requested a review from Maed223 August 14, 2024 04:54
@glennsarti
Copy link
Contributor Author

Rebased and modified for main. Back to review @brandonc

brandonc
brandonc previously approved these changes Aug 14, 2024
View reviewed changes
Copy link
Collaborator

@brandonc brandonc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright nice

@glennsarti
Add support for Org. Token types
b9a6e7e 
HCP Terraform organizations now support different types of tokens. This
commit updates the org. auth. token client to support CRUD operations with
a token type URL attribute.

Note that the integration tests require an organization that supports
audit-logging
@glennsarti glennsarti force-pushed the gs/add-audit-tokens branch from a818252 to b9a6e7e Compare August 15, 2024 02:26
@glennsarti
Copy link
Contributor Author

Rebased due to changelog merge conflict

Maed223
Maed223 approved these changes Aug 15, 2024
View reviewed changes
Copy link
Contributor

@Maed223 Maed223 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@glennsarti glennsarti merged commit 6ad8729 into main Aug 16, 2024
7 checks passed
@glennsarti glennsarti deleted the gs/add-audit-tokens branch August 16, 2024 01:18
@github-actions GitHub Actions
Copy link

Reminder to the contributor that merged this PR: if your changes have added important functionality or fixed a relevant bug, open a follow-up PR to update CHANGELOG.md with a note on your changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maed223 Maed223 Maed223 approved these changes

@mrinalirao mrinalirao mrinalirao left review comments

@brandonc brandonc brandonc left review comments

Assignees

@glennsarti glennsarti

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@glennsarti @brandonc @mrinalirao @Maed223