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

modified automate_config.go #8341

Merged
merged 5 commits into from Jan 29, 2024
Merged

modified automate_config.go #8341

merged 5 commits into from Jan 29, 2024

Conversation

swatiganesh
Copy link
Collaborator

@swatiganesh swatiganesh commented Jan 8, 2024

🔩 Description: What code changed, and why?

Changed syntax of backup script and added code in PatchAutomateConfig of automate_config.go and added core/curl pkg in plan.sh of backup-gateway
I've tested in Amazon Linux, Ubuntu, Red Hat Enterprise Linux, SUSE Linux Enterprise Server machines

⛓️ Related Resources

https://chefio.atlassian.net/jira/software/c/projects/CHEF/boards/482?assignee=712020%3Ad2c1e267-ff0f-4938-9184-e58d1eb78a2d&assignee=60746df1115da6006f1580da&selectedIssue=CHEF-3394

👍 Definition of Done

Changed syntax of backup script and added code in PatchAutomateConfig of automate_config.go and added core/curl pkg in plan.sh of backup-gateway

👟 How to Build and Test the Change

rebuild/components/backup-gateway/
rebuild/components/automate-gateway/
rebuild/components/automate-cli/
rebuild/components/automate-deployment/

✅ Checklist

All PRs must tick these:

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

https://progresssoftware-my.sharepoint.com/:v:/g/personal/swatign_progress_com/EcLgs7TV9OhEpq3MKbsk5TEBBPYVCp1sFzlGlZU_4_q-6A?e=RLONEu
https://progresssoftware-my.sharepoint.com/:v:/g/personal/swatign_progress_com/ERU-Ki1uCKNPgaP108axKloBEue8c-CoPssjFH0VCNPyjg?e=Mf8StL
https://progresssoftware-my.sharepoint.com/:v:/g/personal/swatign_progress_com/EQmQEMCzU79JrF-PN-smVwkBa9cjzgU9Nn8ZcCQk3bVGOQ?e=eac8fN
image
Screenshot 2024-01-23 at 6 08 57 PM
Screenshot 2024-01-23 at 6 09 16 PM
Screenshot 2024-01-23 at 6 13 47 PM
Screenshot 2024-01-23 at 6 15 44 PM
Screenshot 2024-01-23 at 6 16 29 PM
Screenshot 2024-01-25 at 10 13 10 AM
Screenshot 2024-01-25 at 10 13 17 AM
Screenshot 2024-01-25 at 10 13 21 AM
Screenshot 2024-01-25 at 1 48 27 PM
Screenshot 2024-01-25 at 1 49 20 PM

Copy link

netlify bot commented Jan 8, 2024

👷 Deploy Preview for chef-automate processing.

Name Link
🔨 Latest commit 6db54a5
🔍 Latest deploy log https://app.netlify.com/sites/chef-automate/deploys/65b1077c6efaa300084beb30

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
@swatiganesh swatiganesh self-assigned this Jan 23, 2024
@swatiganesh swatiganesh requested a review from a team January 23, 2024 12:34
@swatiganesh swatiganesh marked this pull request as ready for review January 23, 2024 13:04
@@ -107,10 +108,29 @@ func PatchAutomateConfig(timeout int64, config *dc.AutomateConfig, writer cli.Fo
if config.Global.V1.Backups.Filesystem.Path.Value != "" && !isOSEnabled {
fmt.Println("Waiting till all the services comes in healthy state...")
backupScript := fmt.Sprintf(backupPathFix, strings.TrimSuffix(config.Global.V1.Backups.Filesystem.Path.Value, "/"))
_, err := exec.Command("/bin/sh", "-c", backupScript).Output()
if err != nil {
//fmt.Printf("backupScript: %v\n", backupScript)
Copy link
Collaborator

Choose a reason for hiding this comment

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

please remove commented lines of code

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

@Dmaddu Dmaddu merged commit 9dfff34 into main Jan 29, 2024
5 of 8 checks passed
@Dmaddu Dmaddu deleted the swatign/CHEF-3394 branch January 29, 2024 05:45
swatiganesh added a commit that referenced this pull request Apr 16, 2024
* modified automate_config.go

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

* checking backup gateway

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

* modified backup-gateway plan.sh

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

* modified backup-gateway

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

* removed commented lines

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

---------

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants