Change for customer Name #3939
Merged
Change for customer Name #3939
Conversation
This file contains hidden or 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
👷 Deploy Preview for chef-server processing.
|
talktovikas
requested review from
jashaik,
kalroy,
lbakerchef,
marcparadise and
sreepuramsudheer
Member
Author
|
Adhoc Pipeline for this: https://buildkite.com/chef/chef-chef-server-main-omnibus-adhoc/builds/6790 |
Member
Author
talktovikas
force-pushed
the
vikas/telemetry_change
branch
from
17b1f31 to
0bc961f
Compare
Signed-off-by: talktovikas <[email protected]> removing trailing space. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing license test case. Signed-off-by: talktovikas <[email protected]> Fixing bug in condition statement Signed-off-by: talktovikas <[email protected]> debug statements Signed-off-by: talktovikas <[email protected]> adding the server url. Signed-off-by: talktovikas <[email protected]> assignment in case of standalone chef-server. Signed-off-by: talktovikas <[email protected]> adding licenseId in case of Automate-T data. Signed-off-by: talktovikas <[email protected]> fixing T-test cases. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]>
talktovikas
force-pushed
the
vikas/telemetry_change
branch
from
0bc961f to
df73626
Compare
Signed-off-by: talktovikas <[email protected]>
talktovikas
force-pushed
the
vikas/telemetry_change
branch
from
90babc5 to
29cb86c
Compare
|
jashaik
reviewed
Nov 14, 2024
| CN. | ||
|
|
||
| determine_license_id()-> | ||
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = gen_server:call(chef_license_worker, get_license), |
Contributor
There was a problem hiding this comment.
chef_license:get_license()
Suggested change
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = gen_server:call(chef_license_worker, get_license), | |
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = chef_license:get_license(), |
jashaik
reviewed
Nov 14, 2024
| nodes_count = 10 | ||
| }, | ||
| Expected = #expected{company_name = <<"testorg">>, | ||
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, CN,_} = gen_server:call(chef_license_worker, get_license), |
Contributor
There was a problem hiding this comment.
Suggested change
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, CN,_} = gen_server:call(chef_license_worker, get_license), | |
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, CN,_} = chef_license:get_license(), |
jashaik
reviewed
Nov 14, 2024
| end. | ||
|
|
||
| determine_license_id()-> | ||
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = gen_server:call(chef_license_worker, get_license), |
Contributor
There was a problem hiding this comment.
Suggested change
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = gen_server:call(chef_license_worker, get_license), | |
| {_Lic, _Type, _GracePeriod, _ExpDate, _Msg, _CN, LicenseID} = chef_license:get_license(), |
jashaik
approved these changes
Nov 14, 2024
Signed-off-by: talktovikas <[email protected]>
|
jashaik
pushed a commit
that referenced
this pull request
Nov 14, 2024
* adding company name and license-id from automate license. Signed-off-by: talktovikas <[email protected]> removing trailing space. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing license test case. Signed-off-by: talktovikas <[email protected]> Fixing bug in condition statement Signed-off-by: talktovikas <[email protected]> debug statements Signed-off-by: talktovikas <[email protected]> adding the server url. Signed-off-by: talktovikas <[email protected]> assignment in case of standalone chef-server. Signed-off-by: talktovikas <[email protected]> adding licenseId in case of Automate-T data. Signed-off-by: talktovikas <[email protected]> fixing T-test cases. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> * remove debug logs Signed-off-by: talktovikas <[email protected]> * code review changes. Signed-off-by: talktovikas <[email protected]> --------- Signed-off-by: talktovikas <[email protected]>
jashaik
added a commit
that referenced
this pull request
Nov 18, 2024
* Implementation of license enforcement application Signed-off-by: jan shahid shaik <[email protected]> * Fixing pipeline issues Signed-off-by: jan shahid shaik <[email protected]> * Fixing pipeline issues Signed-off-by: jan shahid shaik <[email protected]> * License Caching and Add license enforcement to all APIs (#3919) License Caching and Add license enforcement to all APIs. Signed-off-by: jan shahid shaik <[email protected]> * Modified error message for license expiry case (#3926) Signed-off-by: jan shahid shaik <[email protected]> * Updated chef-server-ctl to handle invalid license + Added grace perio… (#3936) * Update Gemfile.lock to fix adhoc pipeline instability Signed-off-by: Lincoln Baker <[email protected]> * Updated chef-server-ctl to handle invalid license + Added grace period in X-Ops-License Signed-off-by: jan shahid shaik <[email protected]> * Added customer name in get_license method and license cache Signed-off-by: jan shahid shaik <[email protected]> --------- Signed-off-by: Lincoln Baker <[email protected]> Signed-off-by: jan shahid shaik <[email protected]> Co-authored-by: Lincoln Baker <[email protected]> * Change for customer Name (#3939) * adding company name and license-id from automate license. Signed-off-by: talktovikas <[email protected]> removing trailing space. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing license test case. Signed-off-by: talktovikas <[email protected]> Fixing bug in condition statement Signed-off-by: talktovikas <[email protected]> debug statements Signed-off-by: talktovikas <[email protected]> adding the server url. Signed-off-by: talktovikas <[email protected]> assignment in case of standalone chef-server. Signed-off-by: talktovikas <[email protected]> adding licenseId in case of Automate-T data. Signed-off-by: talktovikas <[email protected]> fixing T-test cases. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> fixing tests. Signed-off-by: talktovikas <[email protected]> * remove debug logs Signed-off-by: talktovikas <[email protected]> * code review changes. Signed-off-by: talktovikas <[email protected]> --------- Signed-off-by: talktovikas <[email protected]> * Pedant test for the case if automate license is expired (#3941) * Updated chef-server-ctl to handle invalid license + Added grace period in X-Ops-License Signed-off-by: jan shahid shaik <[email protected]> * Added customer name in get_license method and license cache Signed-off-by: jan shahid shaik <[email protected]> * debug statements Signed-off-by: talktovikas <[email protected]> * case for expired license. Signed-off-by: talktovikas <[email protected]> making it 403 Signed-off-by: talktovikas <[email protected]> running cases only for automate. Signed-off-by: talktovikas <[email protected]> test for chef-zero Signed-off-by: talktovikas <[email protected]> test for /users Signed-off-by: talktovikas <[email protected]> adding env in docker Signed-off-by: talktovikas <[email protected]> fixing verify syntax. Signed-off-by: talktovikas <[email protected]> fixing placement of env variables. Signed-off-by: talktovikas <[email protected]> fixing placement of executor. Signed-off-by: talktovikas <[email protected]> test Signed-off-by: talktovikas <[email protected]> * adding config for expired license from vault. Signed-off-by: talktovikas <[email protected]> * Added few puts inside success licese case. Signed-off-by: sreepuramsudheer <[email protected]> * Added IS_AUTOMATE into environment variables. Signed-off-by: sreepuramsudheer <[email protected]> * Replaced hardcoded expired license with one received from vault. Signed-off-by: sreepuramsudheer <[email protected]> * Updated chef-server-ctl to handle invalid license + Added grace period in X-Ops-License Signed-off-by: jan shahid shaik <[email protected]> * Added customer name in get_license method and license cache Signed-off-by: jan shahid shaik <[email protected]> * removing debug logs Signed-off-by: talktovikas <[email protected]> * code review changes. Signed-off-by: talktovikas <[email protected]> * adding comment for the test case. Signed-off-by: talktovikas <[email protected]> --------- Signed-off-by: jan shahid shaik <[email protected]> Signed-off-by: talktovikas <[email protected]> Signed-off-by: sreepuramsudheer <[email protected]> Co-authored-by: jan shahid shaik <[email protected]> Co-authored-by: sreepuramsudheer <[email protected]> * fixing the sonarQube issue. Signed-off-by: talktovikas <[email protected]> --------- Signed-off-by: jan shahid shaik <[email protected]> Signed-off-by: Lincoln Baker <[email protected]> Signed-off-by: talktovikas <[email protected]> Signed-off-by: sreepuramsudheer <[email protected]> Co-authored-by: Lincoln Baker <[email protected]> Co-authored-by: Vikas Yadav <[email protected]> Co-authored-by: sreepuramsudheer <[email protected]> Co-authored-by: talktovikas <[email protected]>
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.
Description
This is for https://progresssoftware.atlassian.net/browse/CHEF-16635
[Please describe what this change achieves]
Issues Resolved
[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussions that are relevant]
Check List