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

Backport of Replace all remaining time.ParseDurations with parseutil.ParseDurationSeconds into release/1.13.x #21363

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #21357 to be assessed for backporting due to the inclusion of the label backport/1.13.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@VioletHynes
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Vault's duration string format supports a strict superset of options compared to Go's duration string format: https://developer.hashicorp.com/vault/docs/concepts/duration-format

In particular, we support days, e.g. 5d, whereas time.ParseDuration does not.

We use parseutil.ParseDurationSeconds everywhere in the code we can, to support our advertised duration format and to be consistent with ourselves. The majority of our code already uses parseutil.ParseDurationSeconds, but there were a few places I found that time.ParseDuration was still being used as part of poking around, so I thought I'd fix them all at once.

I'm not worried about the fact this change changes a lot of files. ParseDurationSeconds is battle-tested, and there's no valid duration that time.ParseDuration supports that we don't also support.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/violethynes/change-all-parse-duration-to-parse-duration-seconds/logically-trusting-sawfish branch 2 times, most recently from 53d11e5 to a212330 Compare June 20, 2023 18:45
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@VioletHynes
Copy link
Contributor

Closing, as merge failed. I don't know that the effort-to-value ratio is big enough to do this one manually. I'll backport it to 1.14, though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants