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 Machine ID enterprise license enforcement #13914

Merged
merged 4 commits into from
Jun 29, 2022

Conversation

timothyb89
Copy link
Contributor

@timothyb89 timothyb89 commented Jun 27, 2022

This adds two checks to Machine ID for license enforcement: one on initial bot create, and another on join.

Fixes #12915

@timothyb89
Copy link
Contributor Author

Mild caveat that I've so far opted to not include a license check on bot renewals (only create and onboard). I figure that'll cover the 90% case without necessarily breaking people's infrastructure and am a bit wary of adding license checks in generateUserCerts(). It's easy enough to do if desired, though.

Tested with OSS (always enabled) and Enterprise (with + without the flag).

@timothyb89 timothyb89 changed the title Add Mahcine ID enterprise license enforcement Add Machine ID enterprise license enforcement Jun 27, 2022
This adds two checks to Machine ID for license enforcement: one on
initial bot create, and another on join.
@timothyb89 timothyb89 force-pushed the timothyb89/machine-id-license-enforcement branch from 4b59286 to 356407b Compare June 27, 2022 23:34
Copy link
Contributor

@GavinFrazar GavinFrazar left a comment

Choose a reason for hiding this comment

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

LGTM

lib/auth/bot_test.go Outdated Show resolved Hide resolved
lib/auth/bot_test.go Outdated Show resolved Hide resolved
@timothyb89 timothyb89 enabled auto-merge (squash) June 28, 2022 22:47
@timothyb89 timothyb89 merged commit 207332d into master Jun 29, 2022
@github-actions
Copy link

@timothyb89 See the table below for backport results.

Branch Result
branch/v10 Create PR

@timothyb89 timothyb89 deleted the timothyb89/machine-id-license-enforcement branch June 29, 2022 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Machine ID: Enterprise license enforcement
3 participants