-
Notifications
You must be signed in to change notification settings - Fork 113
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 license interceptor in automate gateway (#8439) #8452
Merged
Merged
Conversation
This file contains 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-automate processing.
|
YashviJain01
force-pushed
the
feature/CHEF-11824
branch
from
May 20, 2024 06:23
93c7936
to
31d1da9
Compare
YashviJain01
force-pushed
the
feature/CHEF-11824
branch
from
June 5, 2024 06:38
ec698b0
to
28bee42
Compare
daveaugustus
force-pushed
the
feature/CHEF-11824
branch
2 times, most recently
from
July 17, 2024 11:51
9f69330
to
7a57dfd
Compare
* Adding the intercerptors with error only for license Signed-off-by: Yashvi Jain <[email protected]> * Removing the function, will create another PR for this Signed-off-by: Yashvi Jain <[email protected]> * Removing interface, will create another PR for this Signed-off-by: Yashvi Jain <[email protected]> * Adding the function for interceptor Signed-off-by: Yashvi Jain <[email protected]> * Adding interceptor layer for license Signed-off-by: Yashvi Jain <[email protected]> * Adding allow api list if the license needs to be applied from backend Signed-off-by: Yashvi Jain <[email protected]> * Adding license apply Signed-off-by: Yashvi Jain <[email protected]> * Adding license function in default deploy Signed-off-by: Yashvi Jain <[email protected]> * Removing unwanted loggers Signed-off-by: Yashvi Jain <[email protected]> * Adding license apply command in pipelines, and adding create token api in api allow list Signed-off-by: Yashvi Jain <[email protected]> * Applying license at various location to unblock the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding changes Signed-off-by: Yashvi Jain <[email protected]> * Adding Applying license in do_dploy for chef server Signed-off-by: Yashvi Jain <[email protected]> * updating the temp license Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> * Adding A2_license as a variable from vault Signed-off-by: Yashvi Jain <[email protected]> * Adding A2_license as a environment variable Signed-off-by: Yashvi Jain <[email protected]> * Adding A2 license in the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding license in studio pipelines Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license Signed-off-by: Yashvi Jain <[email protected]> * Adding licrnse in dev from command Signed-off-by: Yashvi Jain <[email protected]> * Adding license from vault and applying it Signed-off-by: Yashvi Jain <[email protected]> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <[email protected]> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <[email protected]> * Adding license key in the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding license after upgrade Signed-off-by: Yashvi Jain <[email protected]> * commenting jq line for print Signed-off-by: Yashvi Jain <[email protected]> --------- Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: dmaddu <[email protected]>
* Infrastructure node cli license changes Signed-off-by: Yashvi Jain <[email protected]> * Adding test cases for pre functions Signed-off-by: Yashvi Jain <[email protected]> * Adding correct message in case of failure Signed-off-by: Yashvi Jain <[email protected]> --------- Signed-off-by: Yashvi Jain <[email protected]> Co-authored-by: Yashvi Jain <[email protected]>
* adding grace period to the license status1 Signed-off-by: swatign <[email protected]> * checking for grace period value in status responce Signed-off-by: swatign <[email protected]> * adding grace period in gateway file Signed-off-by: swatign <[email protected]> * added grace period in gateway Signed-off-by: swatign <[email protected]> * Adding correct pb.go files Signed-off-by: Yashvi Jain <[email protected]> * removed log statements Signed-off-by: swatign <[email protected]> * Helper.go file for warning message (#8464) * Helper.go function added Signed-off-by: karan parmar <[email protected]> * hook added for airgap file Signed-off-by: karan parmar <[email protected]> * seperate function added Signed-off-by: karan parmar <[email protected]> * Adding helper functions correctly Signed-off-by: Yashvi Jain <[email protected]> * cli changes Signed-off-by: Aishwarya Aishwarya <[email protected]> * cli changes 2 Signed-off-by: swatign <[email protected]> * Prefetch commands added Signed-off-by: karan parmar <[email protected]> * Adding new statements for cli Signed-off-by: Yashvi Jain <[email protected]> * Adding the license itercepter valid grace period of 60 Signed-off-by: Yashvi Jain <[email protected]> * latest changes done Signed-off-by: karan parmar <[email protected]> * final changes 1 Signed-off-by: karan parmar <[email protected]> * final changes 2 Signed-off-by: karan parmar <[email protected]> * final changes 3 Signed-off-by: karan parmar <[email protected]> * final changes 4 Signed-off-by: karan parmar <[email protected]> --------- Signed-off-by: karan parmar <[email protected]> Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Signed-off-by: swatign <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: swatign <[email protected]> * added license type in api responce and corrected license control service file Signed-off-by: swatign <[email protected]> --------- Signed-off-by: swatign <[email protected]> Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: karan parmar <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: kparmar2000 <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]>
Signed-off-by: swatign <[email protected]>
* Chaged the func to tempfile Signed-off-by: daveaugustus <[email protected]> * Adding check for automate node for HA Signed-off-by: daveaugustus <[email protected]> * Adding check for automate node for HA Signed-off-by: daveaugustus <[email protected]> * added remote command * cat file Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Removed json output Signed-off-by: daveaugustus <[email protected]> * changed pipeline commands Signed-off-by: daveaugustus <[email protected]> * removed func call for deploy cmds Signed-off-by: Aishwarya Aishwarya <[email protected]> * new code changes Signed-off-by: Aishwarya Aishwarya <[email protected]> * Added warning case function Signed-off-by: daveaugustus <[email protected]> * refactored Signed-off-by: daveaugustus <[email protected]> * reverted Signed-off-by: daveaugustus <[email protected]> * error corretcions Signed-off-by: daveaugustus <[email protected]> --------- Signed-off-by: daveaugustus <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: daveaugustus <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: “SanjuPal01” <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
YashviJain01
force-pushed
the
feature/CHEF-11824
branch
from
July 18, 2024 11:10
d247f97
to
826c2e2
Compare
Signed-off-by: Yashvi Jain <[email protected]>
kalroy
requested changes
Jul 19, 2024
Signed-off-by: daveaugustus <[email protected]>
Dmaddu
requested changes
Jul 19, 2024
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
anees-progress
force-pushed
the
feature/CHEF-11824
branch
from
July 19, 2024 09:06
c9d9cd5
to
28bee42
Compare
daveaugustus
force-pushed
the
feature/CHEF-11824
branch
from
July 19, 2024 09:24
28bee42
to
c9d9cd5
Compare
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Quality Gate failedFailed conditions See analysis details on SonarQube Catch issues before they fail your Quality Gate with our IDE extension SonarLint |
Dmaddu
approved these changes
Jul 19, 2024
kalroy
pushed a commit
that referenced
this pull request
Oct 8, 2024
* Add license interceptor in automate gateway (#8439) * Adding the intercerptors with error only for license Signed-off-by: Yashvi Jain <[email protected]> * Removing the function, will create another PR for this Signed-off-by: Yashvi Jain <[email protected]> * Removing interface, will create another PR for this Signed-off-by: Yashvi Jain <[email protected]> * Adding the function for interceptor Signed-off-by: Yashvi Jain <[email protected]> * Adding interceptor layer for license Signed-off-by: Yashvi Jain <[email protected]> * Adding allow api list if the license needs to be applied from backend Signed-off-by: Yashvi Jain <[email protected]> * Adding license apply Signed-off-by: Yashvi Jain <[email protected]> * Adding license function in default deploy Signed-off-by: Yashvi Jain <[email protected]> * Removing unwanted loggers Signed-off-by: Yashvi Jain <[email protected]> * Adding license apply command in pipelines, and adding create token api in api allow list Signed-off-by: Yashvi Jain <[email protected]> * Applying license at various location to unblock the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding changes Signed-off-by: Yashvi Jain <[email protected]> * Adding Applying license in do_dploy for chef server Signed-off-by: Yashvi Jain <[email protected]> * updating the temp license Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> * Adding A2_license as a variable from vault Signed-off-by: Yashvi Jain <[email protected]> * Adding A2_license as a environment variable Signed-off-by: Yashvi Jain <[email protected]> * Adding A2 license in the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding license in studio pipelines Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license data Signed-off-by: Yashvi Jain <[email protected]> * Adding license Signed-off-by: Yashvi Jain <[email protected]> * Adding licrnse in dev from command Signed-off-by: Yashvi Jain <[email protected]> * Adding license from vault and applying it Signed-off-by: Yashvi Jain <[email protected]> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <[email protected]> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <[email protected]> * Adding license key in the pipeline Signed-off-by: Yashvi Jain <[email protected]> * Adding license after upgrade Signed-off-by: Yashvi Jain <[email protected]> * commenting jq line for print Signed-off-by: Yashvi Jain <[email protected]> --------- Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: dmaddu <[email protected]> * Infrastructure node cli license changes (#8449) * Infrastructure node cli license changes Signed-off-by: Yashvi Jain <[email protected]> * Adding test cases for pre functions Signed-off-by: Yashvi Jain <[email protected]> * Adding correct message in case of failure Signed-off-by: Yashvi Jain <[email protected]> --------- Signed-off-by: Yashvi Jain <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> * Adding Grace Period to the license status (#8460) * adding grace period to the license status1 Signed-off-by: swatign <[email protected]> * checking for grace period value in status responce Signed-off-by: swatign <[email protected]> * adding grace period in gateway file Signed-off-by: swatign <[email protected]> * added grace period in gateway Signed-off-by: swatign <[email protected]> * Adding correct pb.go files Signed-off-by: Yashvi Jain <[email protected]> * removed log statements Signed-off-by: swatign <[email protected]> * Helper.go file for warning message (#8464) * Helper.go function added Signed-off-by: karan parmar <[email protected]> * hook added for airgap file Signed-off-by: karan parmar <[email protected]> * seperate function added Signed-off-by: karan parmar <[email protected]> * Adding helper functions correctly Signed-off-by: Yashvi Jain <[email protected]> * cli changes Signed-off-by: Aishwarya Aishwarya <[email protected]> * cli changes 2 Signed-off-by: swatign <[email protected]> * Prefetch commands added Signed-off-by: karan parmar <[email protected]> * Adding new statements for cli Signed-off-by: Yashvi Jain <[email protected]> * Adding the license itercepter valid grace period of 60 Signed-off-by: Yashvi Jain <[email protected]> * latest changes done Signed-off-by: karan parmar <[email protected]> * final changes 1 Signed-off-by: karan parmar <[email protected]> * final changes 2 Signed-off-by: karan parmar <[email protected]> * final changes 3 Signed-off-by: karan parmar <[email protected]> * final changes 4 Signed-off-by: karan parmar <[email protected]> --------- Signed-off-by: karan parmar <[email protected]> Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Signed-off-by: swatign <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: swatign <[email protected]> * added license type in api responce and corrected license control service file Signed-off-by: swatign <[email protected]> --------- Signed-off-by: swatign <[email protected]> Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: karan parmar <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: kparmar2000 <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]> * new changes as per docs Signed-off-by: swatign <[email protected]> * Check for automate node in HA (#8480) * Chaged the func to tempfile Signed-off-by: daveaugustus <[email protected]> * Adding check for automate node for HA Signed-off-by: daveaugustus <[email protected]> * Adding check for automate node for HA Signed-off-by: daveaugustus <[email protected]> * added remote command * cat file Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Added license status for HA Signed-off-by: daveaugustus <[email protected]> * Removed json output Signed-off-by: daveaugustus <[email protected]> * changed pipeline commands Signed-off-by: daveaugustus <[email protected]> * removed func call for deploy cmds Signed-off-by: Aishwarya Aishwarya <[email protected]> * new code changes Signed-off-by: Aishwarya Aishwarya <[email protected]> * Added warning case function Signed-off-by: daveaugustus <[email protected]> * refactored Signed-off-by: daveaugustus <[email protected]> * reverted Signed-off-by: daveaugustus <[email protected]> * error corretcions Signed-off-by: daveaugustus <[email protected]> --------- Signed-off-by: daveaugustus <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: daveaugustus <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]> * Pipeline check Signed-off-by: daveaugustus <[email protected]> * airgap upgrade pipeline * Pipeline Fix Signed-off-by: “SanjuPal01” <[email protected]> * Adding the test cases correction Signed-off-by: Yashvi Jain <[email protected]> * upgrade scenarios * Pipeline check Signed-off-by: daveaugustus <[email protected]> * Pipeline check Signed-off-by: daveaugustus <[email protected]> * changed into iam v1 to v2 force upgrade * printing license * integeration tests * test license * Pipeline check Signed-off-by: daveaugustus <[email protected]> * Pipeline check Signed-off-by: daveaugustus <[email protected]> * Pipeline check Signed-off-by: daveaugustus <[email protected]> * added print command Signed-off-by: daveaugustus <[email protected]> * added license for upgrade * upgrade status removed license * added license to bash scripts Signed-off-by: daveaugustus <[email protected]> * print license status * removed license pre run Signed-off-by: daveaugustus <[email protected]> * Adding license before restoring backup Signed-off-by: Yashvi Jain <[email protected]> * removing applying license from restore command Signed-off-by: Yashvi Jain <[email protected]> * Adding gateway start stop in two pipelines Signed-off-by: Yashvi Jain <[email protected]> * removed echo statement from script file Signed-off-by: daveaugustus <[email protected]> * code review changes Signed-off-by: daveaugustus <[email protected]> * typos Signed-off-by: daveaugustus <[email protected]> * Adding pipeline changes Signed-off-by: Yashvi Jain <[email protected]> * Adding license in ocid package Signed-off-by: Yashvi Jain <[email protected]> * updated comments Signed-off-by: daveaugustus <[email protected]> * UTC Signed-off-by: daveaugustus <[email protected]> * pipeline Signed-off-by: daveaugustus <[email protected]> * Skipping the license check for Automate Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> * updated error commnet Signed-off-by: daveaugustus <[email protected]> * modified error comment for license not applied Signed-off-by: daveaugustus <[email protected]> --------- Signed-off-by: Yashvi Jain <[email protected]> Signed-off-by: Durga Sarat Chandra Maddu <[email protected]> Signed-off-by: swatign <[email protected]> Signed-off-by: karan parmar <[email protected]> Signed-off-by: Aishwarya Aishwarya <[email protected]> Signed-off-by: daveaugustus <[email protected]> Signed-off-by: “SanjuPal01” <[email protected]> Co-authored-by: Yashvi Jain <[email protected]> Co-authored-by: dmaddu <[email protected]> Co-authored-by: swatiganesh <[email protected]> Co-authored-by: kparmar2000 <[email protected]> Co-authored-by: Aishwarya Aishwarya <[email protected]> Co-authored-by: swatign <[email protected]> Co-authored-by: Dave Augustus <[email protected]> Co-authored-by: daveaugustus <[email protected]> Co-authored-by: “SanjuPal01” <[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.
Adding the intercerptors with error only for license
Removing the function, will create another PR for this
Removing interface, will create another PR for this
Adding the function for interceptor
Adding interceptor layer for license
Adding allow api list if the license needs to be applied from backend
Adding license apply
Adding license function in default deploy
Removing unwanted loggers
Adding license apply command in pipelines, and adding create token api in api allow list
Applying license at various location to unblock the pipeline
Adding changes
Adding Applying license in do_dploy for chef server
updating the temp license
Adding A2_license as a variable from vault
Adding A2_license as a environment variable
Adding A2 license in the pipeline
Adding license in studio pipelines
Adding license data
Adding license data
Adding license data
Adding license
Adding licrnse in dev from command
Adding license from vault and applying it
Adding license in gateway intergation
Adding license in gateway intergation
Adding license key in the pipeline
Adding license after upgrade
commenting jq line for print
🔩 Description: What code changed, and why?
⛓️ Related Resources
👍 Definition of Done
👟 How to Build and Test the Change
✅ Checklist
All PRs must tick these:
With occasional exceptions, all PRs from Progress employees must tick these:
make spell
in any component directory)All PRs from Progress employees should tick these if appropriate:
Please add a note next to any checkbox above if you are NOT ticking it.
📷 Screenshots, if applicable