-
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
Resolve PR review comments for CHEF-1493 #8059
Merged
ayush-billore
merged 3 commits into
chef-1493/supermarket-and-chef-manage-integration-with-automate-HA
from
1493/PR-Review-Comments
Jul 17, 2023
Merged
Resolve PR review comments for CHEF-1493 #8059
ayush-billore
merged 3 commits into
chef-1493/supermarket-and-chef-manage-integration-with-automate-HA
from
1493/PR-Review-Comments
Jul 17, 2023
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
ayush-billore
changed the title
Resolves PR review comments for CHEF-1493
Resolve PR review comments for CHEF-1493
Jul 12, 2023
9 tasks
RajeshPaul38
approved these changes
Jul 13, 2023
Signed-off-by: ayush-billore <ayush.billore@progress.com>
Signed-off-by: ayush-billore <ayush.billore@progress.com>
Signed-off-by: ayush-billore <ayush.billore@progress.com>
ayush-billore
force-pushed
the
1493/PR-Review-Comments
branch
from
July 17, 2023 05:56
528629d
to
275df99
Compare
ayush-billore
merged commit Jul 17, 2023
eee3fdf
into
chef-1493/supermarket-and-chef-manage-integration-with-automate-HA
3 checks passed
SonarQube Quality Gate |
vivek-yadav
pushed a commit
that referenced
this pull request
Jul 20, 2023
* update port of ocid from 9090 to 10114 Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix indentation with gofmt Signed-off-by: ayush-billore <ayush.billore@progress.com> * generate bldr.toml dynamically by running bldr-config-gen/main.go Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com>
vivek-yadav
pushed a commit
that referenced
this pull request
Jul 20, 2023
* update port of ocid from 9090 to 10114 Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix indentation with gofmt Signed-off-by: ayush-billore <ayush.billore@progress.com> * generate bldr.toml dynamically by running bldr-config-gen/main.go Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com>
kalroy
pushed a commit
that referenced
this pull request
Jul 21, 2023
* Chef 2588/add OCID component in automate (#7861) * add ocid to .bldr.toml Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid component Signed-off-by: ayush-billore <ayush.billore@progress.com> * add configuration related changes related to ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid api config Signed-off-by: ayush-billore <ayush.billore@progress.com> * update deployment api config Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid config details to automate-deployment component Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid in the pg_ident.conf Signed-off-by: ayush-billore <ayush.billore@progress.com> * add config for ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid specific nginx config Signed-off-by: ayush-billore <ayush.billore@progress.com> * add config files in ocid component Signed-off-by: ayush-billore <ayush.billore@progress.com> * refactored run hook Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove unwanted code from plan.sh of ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove unwanted files Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove ocid related changes from ctl.go Signed-off-by: ayush-billore <ayush.billore@progress.com> * - move database url variable to default.toml - move database related task from plan.sh to run hook Signed-off-by: ayush-billore <ayush.billore@progress.com> * - remove unnecessary code from package.meta - updated permission for schema.rb and /tmp as these files will be u from run hook - add autogenerated gen.go Signed-off-by: ayush-billore <ayush.billore@progress.com> * add a comment for tmp folder and make them into a single line Signed-off-by: ayush-billore <ayush.billore@progress.com> * Fix health check for oc-id component (#7869) Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * Dynamically set webui key from erchef to ocid (#7878) Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * update value for WriteMetadata to false in spec.go Signed-off-by: ayush-billore <ayush.billore@progress.com> * Configure environment variables for ocid component (#7889) * setting environment configuration from the run hook of ocid component Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * added configuration for chef-server for ocid Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * reading values from environment instead of arguments for setting webui key Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * added check of presence of webui_key in erchef before setting the value in ocid Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * fixed default.toml for automate-cs-ocid component for chef_server_config Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * Chef 2424/configure nginx and unicorn (#7899) * remove thin and add unicorn in ocid runhook Signed-off-by: ayush-billore <ayush.billore@progress.com> * nginx configuration for ocid in cs-nginx * automate-load-balancer configuration for ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * unexpose port 9090 Signed-off-by: ayush-billore <ayush.billore@progress.com> * pick port from toml file Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix nesting in default.toml of ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix health check of automate cs ocid use http instead of https Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * Register applications with OCID: chef-server-ctl reconfigure alternative (#7912) * Implemented register OCID application and show registered OCID applications Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> registered oauth application details file generation code improvement Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> registering ocid applications in a transaction Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> register multiple ocid application (#7911) * register multiple OCID application in one shot * temp implementation of multiple ocid app registration Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * review feedback Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> made app update statement conditional if there is a change in the redirect uri Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> code cleanup Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> code review changes Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * added dev comments Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * Fix the run hook for null values (#7952) Signed-off-by: saghoshprogress <saghosh@progress.com> * Chef 2426 - Add Integration tests for OCID integration (#7924) * fix rewrite vlnerability to reach ocid from automate load balancer Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix gen.go after running deployment_generate Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove extra space Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix route in nginx Signed-off-by: ayush-billore <ayush.billore@progress.com> * add ocid block in pipeline Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix ocid test cases path Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix permission issue in oc-id verify pipeline Signed-off-by: ayush-billore <ayush.billore@progress.com> * - move config logic from plan.sh to run hook - run run-hook as root - Signed-off-by: ayush-billore <ayush.billore@progress.com> * temporary commenting for testing build Signed-off-by: ayush-billore <ayush.billore@progress.com> * add test case for checking webui key Signed-off-by: ayush-billore <ayush.billore@progress.com> * move testing_ocid file from expeditor to integration tests Signed-off-by: ayush-billore <ayush.billore@progress.com> * removing hardcoded url and using template for pg url setup Signed-off-by: ayush-billore <ayush.billore@progress.com> * add more pg_helper in run hook Signed-off-by: ayush-billore <ayush.billore@progress.com> * add test case to check env configurations Signed-off-by: ayush-billore <ayush.billore@progress.com> * remote erlang code and DATABASE_URL hard coded string Signed-off-by: ayush-billore <ayush.billore@progress.com> * add a todo for removal for further verificatgion of build_line block and remove chmod as the file will be run as Root user Signed-off-by: ayush-billore <ayush.billore@progress.com> * Revert "temporary commenting for testing build" This reverts commit d855558. * update test case - test_if_env_vars_are_configured Signed-off-by: ayush-billore <ayush.billore@progress.com> * use os instead of deprecated ioutil Signed-off-by: ayush-billore <ayush.billore@progress.com> * add test function in testing_ocid.sh Signed-off-by: ayush-billore <ayush.billore@progress.com> * rearrange run hook code Signed-off-by: ayush-billore <ayush.billore@progress.com> * dump logs in pipeline Temporarily Signed-off-by: ayush-billore <ayush.billore@progress.com> * added default attribute for ocid app registration in default.toml file Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * update value of package scaffolding for ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove temporarily added logging function Signed-off-by: ayush-billore <ayush.billore@progress.com> * added support for oc-id-show-app command in automate HA bastion node Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * add user login test cases and fix other config test cases in chef-server-collection Signed-off-by: ayush-billore <ayush.billore@progress.com> * update chef-server-collection test cases for ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * add install_if_missing method Signed-off-by: ayush-billore <ayush.billore@progress.com> * trying to make test case lean Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove root user creation logic from run hook of ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * create data before doing the login call Signed-off-by: ayush-billore <ayush.billore@progress.com> * resolve review comments Signed-off-by: ayush-billore <ayush.billore@progress.com> * Set studio env for testing ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * move logic from do_install.sh to run hook of ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * update error messages in ocid test functions Signed-off-by: ayush-billore <ayush.billore@progress.com> * uncomment install_if_missing method in testing-ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove source logic from verify_private pipeline Signed-off-by: ayush-billore <ayush.billore@progress.com> * linting fix Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> Co-authored-by: RajeshPaul38 <rajesh.paul@progress.com> * Chef 3749 - Add additional Integration tests (#7988) * add ocid integration tests for checking config patch Signed-off-by: ayush-billore <ayush.billore@progress.com> # Conflicts: # .studio/chef-server-collection * add oauth app registration test case Signed-off-by: ayush-billore <ayush.billore@progress.com> # Conflicts: # .studio/chef-server-collection * fix the typo Signed-off-by: ayush-billore <ayush.billore@progress.com> * uncomment testing_ocid block Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix ocid test file name Signed-off-by: ayush-billore <ayush.billore@progress.com> * move config patch to a seperate block Signed-off-by: ayush-billore <ayush.billore@progress.com> * Chef 1493 - PR Review Suggestions (#7999) * update config_request values by taking reference from erchef component Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove unwanted variables from api config of ocid Signed-off-by: ayush-billore <ayush.billore@progress.com> * removed redundant toml file Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> Co-authored-by: RajeshPaul38 <rajesh.paul@progress.com> * Generate secret_key_base for OCID rails app (#7932) * Generate secret_key_base for OCID rails app Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> file renamed Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> added provision for user to provide the secret_key_base for OCID rails application Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> doing a tidy up of the generated secret_key_base to remove all invalid characters Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * code review changes Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * Add validation logic for OCID redirect uri (#8029) * add validation logic for ocid redirect uri Signed-off-by: ayush-billore <ayush.billore@progress.com> * add confition to check presence of name and redirect uri Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * Removed unnecessary flags from oc-id-show-app for automate HA (#8060) * removed unnecessary flags from oc-id-show-app for automate HA Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * linting Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * Resolve PR review comments for CHEF-1493 (#8059) * update port of ocid from 9090 to 10114 Signed-off-by: ayush-billore <ayush.billore@progress.com> * fix indentation with gofmt Signed-off-by: ayush-billore <ayush.billore@progress.com> * generate bldr.toml dynamically by running bldr-config-gen/main.go Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * OCID Integration fix pipeline (#8065) * auto generate bldr.toml Signed-off-by: ayush-billore <ayush.billore@progress.com> * add quotes to fix repo health pipeline Signed-off-by: ayush-billore <ayush.billore@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> * remove stale depsolver changes from default.toml of ocid component Signed-off-by: ayush-billore <ayush.billore@progress.com> * Added docs for oc-id-show-app command (#8069) Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> * Backup configuration created for OCID (#8068) Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> --------- Signed-off-by: ayush-billore <ayush.billore@progress.com> Signed-off-by: RajeshPaul38 <rajesh.paul@progress.com> Signed-off-by: saghoshprogress <saghosh@progress.com> Co-authored-by: RajeshPaul38 <85236476+RajeshPaul38@users.noreply.github.com> Co-authored-by: RajeshPaul38 <rajesh.paul@progress.com> Co-authored-by: saghoshprogress <85228280+saghoshprogress@users.noreply.github.com>
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.
π© 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