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.

Sign up for GitHub

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

Jump to bottom

add node for aws #7616

Merged
merged 12 commits into from
Jan 6, 2023
Merged

add node for aws #7616

merged 12 commits into from
Jan 6, 2023

Conversation

vivekshankar1
Copy link
Collaborator

@vivekshankar1 vivekshankar1 commented Dec 14, 2022 •
edited
Loading

Signed-off-by: Vivek Shankar vshankar@progress.com

🔩 Description: What code changed, and why?

  • HA add node command for automate in aws deployment ( with Managed AWS )
  • HA add node command for Chef-Server in AWS Deployment (with Managed AWS)
  • HA add node command for OpenSearch in AWS Deployment (should not work With Managed AWS)
  • HA add node command for postgresql in AWS Deployment (should not work With Managed AWS)

⛓️ Related Resources

https://chefio.atlassian.net/browse/SHIELD-175
https://chefio.atlassian.net/browse/SHIELD-184
https://chefio.atlassian.net/browse/SHIELD-186

👍 Definition of Done

👟 How to Build and Test the Change

  • Do a Aws deployment
  • add automate/chef-server/opensearch/postgresql nodes
  • opensearch and postgresql addition should not work if managed services is on.

✅ 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.sharepoint.com/:i:/s/ChefCoreC/ESOgzDc-CwBNg9AoM6PWl4oBKbQ62g_ayVWU60A1ahtMDg?e=FbSy3d

https://progresssoftware.sharepoint.com/:i:/s/ChefCoreC/EWFi8XsGtLJFqsll6HpTTk4BBVWmL7aj9rjfWIHektV_4g?e=jeqMKt

@netlify
Copy link

netlify bot commented Dec 14, 2022 •
edited
Loading

👷 Deploy Preview for chef-automate processing.

Name Link
🔨 Latest commit 7b41e32
🔍 Latest deploy log https://app.netlify.com/sites/chef-automate/deploys/63b7bad8cf85370009a8c4ba

@vivekshankar1 vivekshankar1 force-pushed the ha_add_node_for_aws branch 2 times, most recently from 8bc7ba4 to c5da0c6 Compare December 21, 2022 07:56
semgrep-app[bot]
semgrep-app bot reviewed Dec 21, 2022
View reviewed changes
components/automate-cli/cmd/chef-automate/ha_node_operations_utils.go Outdated

func (nu *NodeUtilsImpl) modifyTfArchFile(terraformPath string) error {
tfArchPath := filepath.Join(terraformPath, TF_ARCH_FILE)
data, err := ioutil.ReadFile(tfArchPath)
Copy link
Contributor

@semgrep-app semgrep-app bot Dec 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

ioutil.ReadFile is deprecated

Created by deprecated-ioutil-readfile.

@vivekshankar1 vivekshankar1 requested a review from a team as a code owner December 23, 2022 06:35
@github-actions github-actions bot added the documentation Anything related to the Automate docs. label Dec 23, 2022
semgrep-app[bot]
semgrep-app bot reviewed Dec 23, 2022
View reviewed changes
components/automate-cli/cmd/chef-automate/automateClusterCtlUtil.go Outdated
if err != nil {
return err
x, err := c.Process.Wait()
logString, err := ioutil.ReadFile(logFilePath)
Copy link
Contributor

@semgrep-app semgrep-app bot Dec 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

ioutil.ReadFile is deprecated

Created by deprecated-ioutil-readfile.

@vivekshankar1 vivekshankar1 changed the title add and delete node for aws add node for aws Dec 23, 2022
@atultherajput
Copy link
Member

There are some merge conflicts.

shaik80
shaik80 approved these changes Jan 5, 2023
View reviewed changes
Copy link
Member

@shaik80 shaik80 left a comment

Choose a reason for hiding this comment

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

Tested adding node in aws Deployment, working as expected

vivekshankar1 and others added 10 commits January 5, 2023 18:01
@vivekshankar1
first draft
616241f 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
commented pull and generate config
96b9552 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
refactoring some code
6c7354f 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@shaik80 @vivekshankar1
init test case for aws, move and modify files related to aws
150ec47 
Signed-off-by: shaik80 <sh.mudassir98@gmail.com>
@shaik80 @vivekshankar1
added test case to all func in(aws add node)
4980a18 
Signed-off-by: shaik80 <sh.mudassir98@gmail.com>
@vivekshankar1
fix aws strings
c30f448 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
all changes tested working code
a865b2d 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
changed ioutil to fileutils
e104026 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
reading deployertype from tf_arch
ca64c00 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
removed ioutils readfile
7c57f6a 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
removed ioutils readfile
21cad07 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@vivekshankar1
refactored code
7b41e32 
Signed-off-by: Vivek Shankar <vshankar@progress.com>
@sonarcloud
Copy link

sonarcloud bot commented Jan 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 6 Code Smells

82.6% 82.6% Coverage
39.9% 39.9% Duplication

@vivekshankar1 vivekshankar1 merged commit 31990e0 into main Jan 6, 2023
@vivekshankar1 vivekshankar1 deleted the ha_add_node_for_aws branch January 6, 2023 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atultherajput atultherajput atultherajput left review comments

@semgrep-app semgrep-app[bot] semgrep-app left review comments

@vivek-yadav vivek-yadav vivek-yadav approved these changes

@shaik80 shaik80 shaik80 approved these changes

@prasad927 prasad927 prasad927 approved these changes

@Dmaddu Dmaddu Awaiting requested review from Dmaddu

@punitmundra punitmundra Awaiting requested review from punitmundra

@jayvikramsharma1 jayvikramsharma1 Awaiting requested review from jayvikramsharma1

Assignees
No one assigned
Labels
acceptance: verified documentation Anything related to the Automate docs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@vivekshankar1 @atultherajput @vivek-yadav @shaik80 @prasad927