-
Notifications
You must be signed in to change notification settings - Fork 212
[CHEF-29745] local license check, default off #4152
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f60eebe
Minor updates to keep dev vm working
marcparadise b2856ca
add new kvpairs table for system state
marcparadise 5f9d5ec
implement default-off local license check
marcparadise f6c0ac8
Update omnibus submodule to latest main (939f4c9)
jashaik 0144e7c
Fix license worker: replace io:format with lager, add error handling …
jashaik 286c155
Update omnibus submodule to latest main (5a5bd01)
jashaik b472097
Update omnibus submodule to latest main (d051ed8)
jashaik dd1d7e7
Updated debugs + omnibus latest commit
jashaik 6e51f65
Updated omnibus
jashaik 270008d
Merge branch 'main' into CHEF-29745
jashaik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Something weird happened with the unit tests in one of my internal rebases, so I have excluded them. I willl get them pushed up tomorrow. |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| %% -*- mode: erlang -*- | ||
| %% ex: ts=4 sw=4 ft=erlang | ||
|
|
||
| %% Include erl_opts {d, OC_LICENSE_PATH, X} where X is determined based on the OC_LICENSE_PATH environment variable for compile-time resolution of the path. | ||
| %% Special value 'cli' means to use the automate CLI | ||
| %% to obtain license information intead. This is the default. | ||
| LicensePath = os:getenv("OC_LICENSE_PATH", cli), | ||
| ErlOpts = proplists:get_value(erl_opts, CONFIG, []), | ||
| UpdatedErlOpts = lists:keystore(d, 99, ErlOpts, | ||
| {d, 'OC_LICENSE_PATH', LicensePath}), | ||
| Config1 = lists:keydelete(erl_opts, 1, CONFIG), | ||
| [{erl_opts, UpdatedErlOpts} | Config1]. |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just formatting changes.. but check_license is otherwise unchanged.