Update Run Tasks for global config and stages #865
Merged
Conversation
This file contains 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
glennsarti
force-pushed
the
gs/add-global-run-tasks
branch
5 times, most recently
from
fdff167
to
ae83584
Compare
glennsarti
force-pushed
the
gs/add-global-run-tasks
branch
4 times, most recently
from
7faf9e7
to
fe0b2e3
Compare
glennsarti
changed the title
glennsarti
force-pushed
the
gs/add-global-run-tasks
branch
3 times, most recently
from
d30fe15
to
54ab479
Compare
|
Add Compliance team for review. Not that it's required, but a nice to have |
glennsarti
force-pushed
the
gs/add-global-run-tasks
branch
3 times, most recently
from
23e371d
to
3e5eee6
Compare
mrinalirao
reviewed
Apr 3, 2024
mrinalirao
reviewed
Apr 3, 2024
| } | ||
| // DEPRECATED : Please use the newSubscriptionUpdater instead. | ||
| func upgradeOrganizationSubscription(t *testing.T, _ *Client, organization *Organization) { | ||
| newSubscriptionUpdater(organization).WithBusinessPlan().Update(t) |
mrinalirao
previously approved these changes
Apr 3, 2024
This commit also extracts the subscription update process and updated it as it fails in the local development. Specifically, there may be 2 or more tokens used to administer a TFC instance which have different admin scopes. This commit now encapsulates that logic inside a SubscriptionUpdater "service" class which can be used to build up the request to update a subscription.
This commit updates the entitlement set object to include the new global-run-tasks feature.
The global run tasks feature updates both the Organization and Workspace Run tasks with new attributes. Unfortunately these new attributes exposed an issue with the JSON API pacakge, that it doesn't support complex objects (Custom maps or non-standard types) [1]. Instead we need to unmarshall to a more simpler object and then we adapt the simpler object to our more correct struct. [1] google/jsonapi#74
glennsarti
force-pushed
the
gs/add-global-run-tasks
branch
from
59dee80
to
3cbccb0
Compare
brandonc
approved these changes
Apr 5, 2024
| Category string `jsonapi:"attr,category"` | ||
| HMACKey *string `jsonapi:"attr,hmac-key,omitempty"` | ||
| Enabled bool `jsonapi:"attr,enabled"` | ||
| RawGlobal map[string]interface{} `jsonapi:"attr,global-configuration,omitempty"` |
There was a problem hiding this comment.
TIL that jsonapi doesn't automatically decode json annotated attribute object types. It's certainly in spec to have an object within an attribute. I will take a closer look after I finish this review.
There was a problem hiding this comment.
Unfortunately, jsonapi is effectively a dead project :-( It had a "No Maintenance Intended" badge added 4 years ago and the PR/Issues list is wasteland. We'd have to fork it if we wanted to fix any issues with it.
DERP ME ... we are using a fork
|
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. |
2 tasks
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.
This PR needs the Global Run Tasks feature to be generally available, and deployed to the CI environment before CI will pass
Description
This commit also extracts the subscription update process and updated it as it
fails in the local development. Specifically, there may be 2 or more tokens
used to administer a TFC instance which have different admin scopes. This commit
now encapsulates that logic inside a SubscriptionUpdater "service" class which
can be used to build up the request to update a subscription.
This commit updates the entitlement set object to include the new
global-run-tasks feature.
The global run tasks feature updates both the Organization and Workspace
Run tasks with new attributes. Unfortunately these new attributes exposed
an issue with the JSON API pacakge, that it doesn't support complex objects
(Custom maps or non-standard types) [1]. Instead we need to unmarshall to
a more simpler object and then we adapt the simpler object to our more
correct struct.
[1] google/jsonapi#74
Testing plan
Updated integration tests exercise this behaviour.
External links
Output from tests
Including output from tests may require access to a TFE instance. Ignore this section if you have no environment to test against.