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

Add key expiration to tailscale_tailnet_key #175

Merged
merged 4 commits into from
Nov 3, 2022
Merged

Add key expiration to tailscale_tailnet_key #175

merged 4 commits into from
Nov 3, 2022

Conversation

dizzzan
Copy link
Contributor

@dizzzan dizzzan commented Nov 3, 2022

What this PR does / why we need it:
Adds key expiration option to the tailscale_tailnet_key resource

Which issue this PR fixes
N/A

Special notes for your reviewer:
See tailscale/tailscale-client-go#34 for associated client change

@dizzzan
Copy link
Contributor Author

dizzzan commented Nov 3, 2022

@DentonGentry Haven't looked too closely at your CI setup, but does this depend on the published client pkg?

@DentonGentry
Copy link
Contributor

I created a v1.7.0 release in tailscale-client-go. You should be able to update to that version of the module and try again:

go get tailscale/tailscale-client-go@v1.7.0
git add go.mod go.sum
git commit --amend -S
git push -f

@DentonGentry
Copy link
Contributor

dependabot sent a PR to update this repo to 1.7. You'll need to rebase your PR to pull that change in:

git rebase main
git push -f

@dizzzan
Copy link
Contributor Author

dizzzan commented Nov 3, 2022

Didn't realize the docs were generated - should I remove my manual edits?

@DentonGentry
Copy link
Contributor

Didn't realize the docs were generated - should I remove my manual edits?

Yes, please remove the docs changes. If we want to update the docstring we'd go back to the source document.

@davidsbond
Copy link
Contributor

davidsbond commented Nov 3, 2022

You'll need to install the tfplugindocs tool and then run go generate ./... which will update the documentation based on the code changes, which you can then commit. Might need to be added to the README

@@ -2,4 +2,5 @@ resource "tailscale_tailnet_key" "sample_key" {
reusable = true
ephemeral = false
preauthorized = true
expiry = 3600
Copy link
Contributor

Choose a reason for hiding this comment

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

Please run terraform fmt on this example just so the indentation is correct.

@DentonGentry
Copy link
Contributor

Great! This looks good, and the CI is happy.

@DentonGentry DentonGentry merged commit a14869b into tailscale:main Nov 3, 2022
@dizzzan
Copy link
Contributor Author

dizzzan commented Nov 3, 2022

@DentonGentry @davidsbond thank you both for the guidance, and for a great service! :)

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