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.

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

jobspec: fixup vault_grace deprecation #7310

Merged
merged 1 commit into from
Mar 11, 2020
Merged

jobspec: fixup vault_grace deprecation #7310

merged 1 commit into from
Mar 11, 2020

Conversation

schmichael
Copy link
Member

Followup to #7170

  • Moved canonicalization of VaultGrace back into api/ package.
  • Fixed tests.
  • Made docs styling consistent.

Followup to #7170

- Moved canonicalization of VaultGrace back into `api/` package.
- Fixed tests.
- Made docs styling consistent.
//COMPAT(0.12) VaultGrace is deprecated and unused as of Vault 0.5
if tmpl.VaultGrace == nil {
tmpl.VaultGrace = timeToPtr(0)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This removes the implicit parsing (sets VaultGrace to 0 whether it is set or unset) that the original contributer had added. Given the error message in structs.go, this seems correct just checking.

Copy link
Member Author

Choose a reason for hiding this comment

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

Great catch! This is intentional. We need to canonicalize it here because jobspec parsing is skipped when submitting JSON jobs directly to the api.

Copy link
Contributor

@langmartin langmartin left a comment

Choose a reason for hiding this comment

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

This lgtm

@schmichael
Copy link
Member Author

Failed tests are known flaky and unrelated (although the stream limits is one I need to fix today!)

@schmichael schmichael merged commit 51b077b into master Mar 11, 2020
@schmichael schmichael deleted the b-vault-grace branch March 11, 2020 16:14
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants