Adding Grace Period to the license status #8460

swatiganesh · 2024-06-06T11:00:40Z

🔩 Description: What code changed, and why?

Adding Grace Period to the license status response

⛓️ Related Resources

https://chefio.atlassian.net/browse/CHEF-12686

👍 Definition of Done

Adding Grace Period to the license status response

👟 How to Build and Test the Change

rebuild component/automate-deployment/
rebuild component/automate-gateway/
rebuild component/automate-cli/
rebuild component/license-control-service/

✅ Checklist

All PRs must tick these:

I have read the CONTRIBUTING document.
All commits signed-off for the Developer Certification of Origin.

With occasional exceptions, all PRs from Progress employees must tick these:

Is the code clear? (complicated code or lots of comments--subdivide and use well-named methods, meaningful variable names, etc.)
Consistency checked? (user notifications, user prompts, visual patterns, code patterns, variable names)
Repeated code blocks eliminated? (adapt and reuse existing components, blocks, functions, etc.)
Spelling, grammar, typos checked? (at a minimum use make spell in any component directory)
Code well-formatted? (indents, line breaks, etc. improve rather than hinder readability)

All PRs from Progress employees should tick these if appropriate:

Tests added/updated? (all new code needs new tests)
Docs added/updated? (all customer-facing changes)

Please add a note next to any checkbox above if you are NOT ticking it.

📷 Screenshots, if applicable

video link:
https://progresssoftware-my.sharepoint.com/:v:/g/personal/swatign_progress_com/ETvj1HPRIJxBmjYyl8n53HYBcHqlO1sqz7GnCSjD3fr9Nw?e=IE2FHn

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

Signed-off-by: Yashvi Jain <yashvi.jain@progress.com>

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

components/automate-cli/cmd/chef-automate/infrastructure.go

components/license-control-service/pkg/server/server.go

* Helper.go function added Signed-off-by: karan parmar <kparmar@progress.com> * hook added for airgap file Signed-off-by: karan parmar <kparmar@progress.com> * seperate function added Signed-off-by: karan parmar <kparmar@progress.com> * Adding helper functions correctly Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * cli changes Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> * cli changes 2 Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Prefetch commands added Signed-off-by: karan parmar <kparmar@progress.com> * Adding new statements for cli Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding the license itercepter valid grace period of 60 Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * latest changes done Signed-off-by: karan parmar <kparmar@progress.com> * final changes 1 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 2 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 3 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 4 Signed-off-by: karan parmar <kparmar@progress.com> --------- Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: swatign <SwatiGanesh.Naik@Progress.com>

components/license-control-service/pkg/server/server.go

…ice file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

sonarqube-for-infrastructure-prod · 2024-07-05T08:40:14Z

Quality Gate failed

Failed conditions
2 New issues
2.9% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

* adding grace period to the license status1 Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * checking for grace period value in status responce Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * adding grace period in gateway file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * added grace period in gateway Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Adding correct pb.go files Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * removed log statements Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Helper.go file for warning message (#8464) * Helper.go function added Signed-off-by: karan parmar <kparmar@progress.com> * hook added for airgap file Signed-off-by: karan parmar <kparmar@progress.com> * seperate function added Signed-off-by: karan parmar <kparmar@progress.com> * Adding helper functions correctly Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * cli changes Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> * cli changes 2 Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Prefetch commands added Signed-off-by: karan parmar <kparmar@progress.com> * Adding new statements for cli Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding the license itercepter valid grace period of 60 Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * latest changes done Signed-off-by: karan parmar <kparmar@progress.com> * final changes 1 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 2 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 3 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 4 Signed-off-by: karan parmar <kparmar@progress.com> --------- Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: swatign <SwatiGanesh.Naik@Progress.com> * added license type in api responce and corrected license control service file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> --------- Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: kparmar2000 <145539208+kparmar2000@users.noreply.github.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com>

* Add license interceptor in automate gateway (#8439) * Adding the intercerptors with error only for license Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Removing the function, will create another PR for this Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Removing interface, will create another PR for this Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding the function for interceptor Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding interceptor layer for license Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding allow api list if the license needs to be applied from backend Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license apply Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license function in default deploy Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Removing unwanted loggers Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license apply command in pipelines, and adding create token api in api allow list Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Applying license at various location to unblock the pipeline Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding changes Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding Applying license in do_dploy for chef server Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * updating the temp license Signed-off-by: Durga Sarat Chandra Maddu <dmaddu@progress.com> * Adding A2_license as a variable from vault Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding A2_license as a environment variable Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding A2 license in the pipeline Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license in studio pipelines Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license data Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license data Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license data Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding licrnse in dev from command Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license from vault and applying it Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license in gateway intergation Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license key in the pipeline Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license after upgrade Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * commenting jq line for print Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> --------- Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: Durga Sarat Chandra Maddu <dmaddu@progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: dmaddu <dmaddu@progress.com> * Infrastructure node cli license changes (#8449) * Infrastructure node cli license changes Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding test cases for pre functions Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding correct message in case of failure Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> --------- Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> * Adding Grace Period to the license status (#8460) * adding grace period to the license status1 Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * checking for grace period value in status responce Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * adding grace period in gateway file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * added grace period in gateway Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Adding correct pb.go files Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * removed log statements Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Helper.go file for warning message (#8464) * Helper.go function added Signed-off-by: karan parmar <kparmar@progress.com> * hook added for airgap file Signed-off-by: karan parmar <kparmar@progress.com> * seperate function added Signed-off-by: karan parmar <kparmar@progress.com> * Adding helper functions correctly Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * cli changes Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> * cli changes 2 Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Prefetch commands added Signed-off-by: karan parmar <kparmar@progress.com> * Adding new statements for cli Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding the license itercepter valid grace period of 60 Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * latest changes done Signed-off-by: karan parmar <kparmar@progress.com> * final changes 1 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 2 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 3 Signed-off-by: karan parmar <kparmar@progress.com> * final changes 4 Signed-off-by: karan parmar <kparmar@progress.com> --------- Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: swatign <SwatiGanesh.Naik@Progress.com> * added license type in api responce and corrected license control service file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> --------- Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: kparmar2000 <145539208+kparmar2000@users.noreply.github.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> * new changes as per docs Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> * Check for automate node in HA (#8480) * Chaged the func to tempfile Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Adding check for automate node for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Adding check for automate node for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * added remote command * cat file Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Added license status for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Added license status for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Added license status for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Added license status for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Added license status for HA Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Removed json output Signed-off-by: daveaugustus <pappu.kumar@progress.com> * changed pipeline commands Signed-off-by: daveaugustus <pappu.kumar@progress.com> * removed func call for deploy cmds Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> * new code changes Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> * Added warning case function Signed-off-by: daveaugustus <pappu.kumar@progress.com> * refactored Signed-off-by: daveaugustus <pappu.kumar@progress.com> * reverted Signed-off-by: daveaugustus <pappu.kumar@progress.com> * error corretcions Signed-off-by: daveaugustus <pappu.kumar@progress.com> --------- Signed-off-by: daveaugustus <pappu.kumar@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: daveaugustus <pappu.kumar@progress.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * airgap upgrade pipeline * Pipeline Fix Signed-off-by: “SanjuPal01” <sanju.sanju@progress.com> * Adding the test cases correction Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * upgrade scenarios * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * changed into iam v1 to v2 force upgrade * printing license * integeration tests * test license * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Pipeline check Signed-off-by: daveaugustus <pappu.kumar@progress.com> * added print command Signed-off-by: daveaugustus <pappu.kumar@progress.com> * added license for upgrade * upgrade status removed license * added license to bash scripts Signed-off-by: daveaugustus <pappu.kumar@progress.com> * print license status * removed license pre run Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Adding license before restoring backup Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * removing applying license from restore command Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding gateway start stop in two pipelines Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * removed echo statement from script file Signed-off-by: daveaugustus <pappu.kumar@progress.com> * code review changes Signed-off-by: daveaugustus <pappu.kumar@progress.com> * typos Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Adding pipeline changes Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * Adding license in ocid package Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> * updated comments Signed-off-by: daveaugustus <pappu.kumar@progress.com> * UTC Signed-off-by: daveaugustus <pappu.kumar@progress.com> * pipeline Signed-off-by: daveaugustus <pappu.kumar@progress.com> * Skipping the license check for Automate Signed-off-by: Durga Sarat Chandra Maddu <dmaddu@progress.com> * updated error commnet Signed-off-by: daveaugustus <pappu.kumar@progress.com> * modified error comment for license not applied Signed-off-by: daveaugustus <pappu.kumar@progress.com> --------- Signed-off-by: Yashvi Jain <yashvi.jain@progress.com> Signed-off-by: Durga Sarat Chandra Maddu <dmaddu@progress.com> Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com> Signed-off-by: karan parmar <kparmar@progress.com> Signed-off-by: Aishwarya Aishwarya <aaishwar@progress.com> Signed-off-by: daveaugustus <pappu.kumar@progress.com> Signed-off-by: “SanjuPal01” <sanju.sanju@progress.com> Co-authored-by: Yashvi Jain <yashvi.jain@progress.com> Co-authored-by: dmaddu <dmaddu@progress.com> Co-authored-by: swatiganesh <145528613+swatiganesh@users.noreply.github.com> Co-authored-by: kparmar2000 <145539208+kparmar2000@users.noreply.github.com> Co-authored-by: Aishwarya Aishwarya <aaishwar@progress.com> Co-authored-by: swatign <SwatiGanesh.Naik@Progress.com> Co-authored-by: Dave Augustus <36985548+daveaugustus@users.noreply.github.com> Co-authored-by: daveaugustus <pappu.kumar@progress.com> Co-authored-by: “SanjuPal01” <sanju.sanju@progress.com>

swatiganesh added 4 commits June 6, 2024 16:26

adding grace period to the license status1

713fca5

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

checking for grace period value in status responce

9746b8e

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

adding grace period in gateway file

60403b1

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

added grace period in gateway

1f26942

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

github-actions bot added the documentation Anything related to the Automate docs. label Jun 17, 2024

Yashvi Jain and others added 2 commits June 17, 2024 13:59

Adding correct pb.go files

5897360

Signed-off-by: Yashvi Jain <yashvi.jain@progress.com>

removed log statements

d25d01a

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

swatiganesh removed the documentation Anything related to the Automate docs. label Jun 17, 2024

swatiganesh self-assigned this Jun 17, 2024

swatiganesh requested review from YashviJain01, a team and Dmaddu June 17, 2024 11:10

swatiganesh marked this pull request as ready for review June 17, 2024 11:12

YashviJain01 reviewed Jun 18, 2024

View reviewed changes

components/automate-cli/cmd/chef-automate/infrastructure.go Show resolved Hide resolved

YashviJain01 reviewed Jun 18, 2024

View reviewed changes

components/license-control-service/pkg/server/server.go Show resolved Hide resolved

YashviJain01 self-requested a review June 18, 2024 07:55

swatiganesh requested review from Dmaddu and removed request for Dmaddu July 4, 2024 06:44

github-actions bot added the documentation Anything related to the Automate docs. label Jul 4, 2024

swatiganesh removed the documentation Anything related to the Automate docs. label Jul 4, 2024

YashviJain01 reviewed Jul 5, 2024

View reviewed changes

components/license-control-service/pkg/server/server.go Outdated Show resolved Hide resolved

added license type in api responce and corrected license control serv…

b31f1e1

…ice file Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>

github-actions bot added the documentation Anything related to the Automate docs. label Jul 5, 2024

YashviJain01 self-requested a review July 5, 2024 08:06

YashviJain01 approved these changes Jul 5, 2024

View reviewed changes

YashviJain01 merged commit c15a43a into feature/CHEF-11824 Jul 5, 2024
4 checks passed

YashviJain01 deleted the swatig/CHEF-12686 branch July 5, 2024 08:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding Grace Period to the license status #8460

Adding Grace Period to the license status #8460

swatiganesh commented Jun 6, 2024 •

edited

Loading

sonarqube-for-infrastructure-prod bot commented Jul 5, 2024

Adding Grace Period to the license status #8460

Adding Grace Period to the license status #8460

Conversation

swatiganesh commented Jun 6, 2024 • edited Loading

🔩 Description: What code changed, and why?

⛓️ Related Resources

👍 Definition of Done

👟 How to Build and Test the Change

✅ Checklist

📷 Screenshots, if applicable

sonarqube-for-infrastructure-prod bot commented Jul 5, 2024

Quality Gate failed

swatiganesh commented Jun 6, 2024 •

edited

Loading