sync sec comp with master #148
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
commit 46052ed Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Fri Aug 25 09:54:31 2023 -0500 remove duplicate env var and set default features to load in bundle sync in our deployments (RedHatInsights#146) commit e23b27e Merge: 5291616 9197173 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Fri Aug 25 10:11:20 2023 +0200 Merge pull request RedHatInsights#145 from lpichler/fix_bundles Set current bundles commit 9197173 Author: Libor Pichler <lpichler@redhat.com> Date: Fri Aug 25 10:01:45 2023 +0200 Fix current bundles commit 5291616 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Thu Aug 24 11:15:13 2023 -0500 fix typo in clowdapp deployment (RedHatInsights#144) commit df3d225 Merge: 3b42c1f 846a7f4 Author: Libor Pichler <lpichler@redhat.com> Date: Thu Aug 24 13:18:46 2023 +0200 Merge pull request RedHatInsights#95 from Ellen-Yi-Dong/configure-bundles [RHCLOUD-23693] Configurable default bundles commit 3b42c1f Merge: 96b2f8b 5a340c9 Author: Libor Pichler <lpichler@redhat.com> Date: Thu Aug 24 13:18:29 2023 +0200 Merge pull request RedHatInsights#141 from dagbay-rh/local_devopment_improvements local development improvements commit 5a340c9 Author: Daniel Agbay <dagbay@redhat.com> Date: Wed Aug 23 18:35:15 2023 -0500 readme updates, use config keys, cleanup compiler warnings commit 06d2e77 Author: Daniel Agbay <dagbay@redhat.com> Date: Wed Aug 23 12:25:09 2023 -0500 add release bit to readme commit b5f564e Author: Daniel Agbay <dagbay@redhat.com> Date: Wed Aug 23 12:11:15 2023 -0500 add to readme commit 09c3445 Author: Daniel Agbay <dagbay@redhat.com> Date: Wed Aug 23 12:07:05 2023 -0500 use config keys in bundle sync commit 96b2f8b Author: Chris Mitchell <cmitchel@redhat.com> Date: Wed Aug 23 11:48:12 2023 -0400 Add include and exclude filters for bundles (RedHatInsights#91) * Add include and exclude filters for bundles Signed-off-by: Chris Mitchell <cmitchel@redhat.com> * Update spect with filters Signed-off-by: Chris Mitchell <cmitchel@redhat.com> * DRY up code and note priority of filters Signed-off-by: Chris Mitchell <cmitchel@redhat.com> * Fix filter preference flow Signed-off-by: Chris Mitchell <cmitchel@redhat.com> * Trying to fix the Travis CLI issue by moving around the different functions and adding the appropriate closing parentheses and brackets * Deleting ginkgo v1 to see if that will help with travis CLI build --------- Signed-off-by: Chris Mitchell <cmitchel@redhat.com> Co-authored-by: Ellen Yi Dong <ellen.dong92@gmail.com> commit c9f43c8 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 18:03:55 2023 -0500 readme updates and remove usage of modd commit 4166586 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:49:01 2023 -0500 never mind we need these junit test results commit 1fe8b5c Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:46:04 2023 -0500 remove dummy test results commit e8311b1 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:40:42 2023 -0500 remove travis config and copy test results to artifacts in pr check commit 0025eb5 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:37:26 2023 -0500 post dummy result for pr checks commit e3bea97 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:26:44 2023 -0500 updates to see if pr check passes commit 829c10b Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:20:41 2023 -0500 remove setting commit eda820b Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:18:29 2023 -0500 run unit tests in separate file commit 9c8ebdf Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 17:12:32 2023 -0500 update pr check to run unit tests in jenkins builds commit 78d7dd4 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 16:56:20 2023 -0500 fix config to get root of project commit e371042 Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 16:39:49 2023 -0500 rename bop test suite commit 7e2fb2e Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 16:16:23 2023 -0500 added exe to makefile to run the built executable commit 11eabfa Author: Daniel Agbay <dagbay@redhat.com> Date: Tue Aug 22 16:00:31 2023 -0500 update config to set default certs so we dont have to in makefile commit 846a7f4 Author: Ellen-Yi-Dong <ellen.dong92@gmail.com> Date: Tue Aug 22 13:03:59 2023 -0700 Update deployment/clowdapp.yml with new bundles_skus_allow_list variable commit 103bb99 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Thu Aug 17 12:04:17 2023 -0500 add first name and last name to get seats response (RedHatInsights#138) commit 0213b58 Author: Michal Findra <miskofindra@gmail.com> Date: Thu Aug 17 15:39:45 2023 +0200 NO-STORY fix typos (RedHatInsights#137) commit 80500be Author: Ellen-Yi-Dong <ellen.dong92@gmail.com> Date: Tue Aug 1 12:00:53 2023 -0700 Add seeding and migration into deployment/clowdapp.yml commit da5abb2 Merge: 10e5efc e78371b Author: Ellen-Yi-Dong <ellen.dong92@gmail.com> Date: Tue Aug 1 11:54:36 2023 -0700 Merge remote-tracking branch 'origin/configure-bundles' into configure-bundles commit e78371b Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Wed Jul 19 20:06:54 2023 +0200 readme formatting updated (RedHatInsights#135) commit d0972eb Author: casey-williams-rh <caswilli@redhat.com> Date: Tue Jul 18 16:29:18 2023 -0400 Update Dockerfile to use registry.access.redhat.com (RedHatInsights#136) commit cd46d4a Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Tue Jul 18 16:05:02 2023 +0200 adding platform security github workflow (RedHatInsights#134) commit 0e2ca83 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Wed Jun 28 10:02:03 2023 +0200 apispec update - set contact email (RedHatInsights#131) commit bdee3c8 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Wed Jun 21 21:21:12 2023 +0200 updated SUBS_HOST value in deploy files (RedHatInsights#133) commit 7ae5e33 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Mon Jun 5 16:35:03 2023 -0500 make subscriptions cache settings configurable (RedHatInsights#132) commit 7301302 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Thu May 25 14:51:24 2023 +0200 set cpu and memory limits and request for initContainer in deploy.yml (RedHatInsights#130) commit 2ac7440 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Mon May 15 16:04:43 2023 +0200 add exception for DVO min three replicas for entitlements Deployment (RedHatInsights#129) commit 6904012 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Mon May 8 12:57:20 2023 -0500 added feature flag to expose seat manager apis, and features env (RedHatInsights#128) commit 0cd6f0d Author: Vinicius Belchior <vbelchio@redhat.com> Date: Thu May 4 18:26:05 2023 -0300 Update api.spec.json (RedHatInsights#126) Updating the invalid default value for ExcludeStatus parameter commit 34fce22 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Wed May 3 12:45:15 2023 -0500 add acs bundle to feature bundles (RedHatInsights#123) commit 7d835e8 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Wed May 3 08:05:07 2023 -0500 successful bop user querying, successful delete user from seat (RedHatInsights#122) * added root ca to resources to be able to talk to BOP. added required header to request to bop * error handling around delete seats * show status of sub in get seats to make it clear what seats are active * add status to response from post seats * remove status from post seats, its empty * implement converting ams org id to org id for delete seat * add ability to exclude seats with a certain status from get seats * fixed broken tests * added tests for filtering on get seats * moved ams test client to its own file and added vars to represent each function * renamed function vars commit 7fc9ce4 Author: Keith Walsh <kwalsh@redhat.com> Date: Fri Apr 21 14:40:33 2023 -0400 Fixes for clowdapp (RedHatInsights#121) * Fixes for clowdapp - resolve indentation issues - update probe ports - add `ENV_NAME` for clowder - update `envFrom` to `valueFrom` (was having issues in deploying) - setup `default-entitlements-config` volume - `API_REPLICAS` to `REPLICAS` * Point to correct app selector for service pods commit d28a006 Author: Alec Cohan <44471274+aleccohan@users.noreply.github.com> Date: Fri Apr 21 13:24:22 2023 -0400 Add additional env vars to clowder.yml file (RedHatInsights#120) * Add additional env vars to clowder.yml file * remove formating error * update formating commit 715946c Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Fri Apr 21 11:59:25 2023 -0500 return error if ams org id is not found (RedHatInsights#117) * return error if ams org id is not found * changed log message * handle ams client errors in controller * switch logs back to debug commit 46b1c6a Author: Alec Cohan <44471274+aleccohan@users.noreply.github.com> Date: Thu Apr 20 10:58:37 2023 -0400 Add Clowdapp.yml file for Entitlements (RedHatInsights#112) * Push clowdapp.yml file for Entitlements Clowderization * Update Cloudwatch to pull from clowder acgConfig * remove optional dependencies from clowdapp.yaml * Get app-common-go package * Remove secret pulls that we don't need anymore commit 14089f7 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Wed Apr 19 14:12:58 2023 -0500 * changing log levels to info temporarily (RedHatInsights#116) * added context around error logs in ams controller * add debug log around org id conversion * add debug log around getting ams org id from cache * changing log levels to info temporarily commit 5bd532d Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Wed Apr 19 12:56:34 2023 -0500 adding logging around seat management (RedHatInsights#114) * added context around error logs in ams controller * add debug log around org id conversion * add debug log around getting ams org id from cache commit 561d549 Author: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Date: Wed Apr 19 10:00:42 2023 -0500 renamed deploy vars to match (RedHatInsights#113) commit 7739fc1 Author: Jesse Jaggars <jjaggars@redhat.com> Date: Wed Apr 19 09:31:19 2023 -0400 Seat management (RedHatInsights#103) * pulling in ocm client wrapper * adding some types and errors * generating seats with oapi generator * using server generation for seats * generate into api dir * moving to a Makefile * adding in error handling * wiring in more client operations * wiring tests to makefile * fixing generator version and adding more tests * checking limits on list * filling in links data * go 1.19 is required for our deps, using official builder as a result * adding default token url * updating travis to use 1.19 * adding some metrics * update to go1.19 for seat management (RedHatInsights#107) * [RHCLOUD-23259] Update sentry-dsn to glitchtip-dsn (RedHatInsights#101) * Update sentry-dsn to glitchtip-dsn * add default value * fix line * Make sure log messages are clear that we are using glitchtip dsn * Initialize the dsn (RedHatInsights#102) * [RHCLOUD-25196] Golang upgrade into 1.19 (RedHatInsights#106) * goland upgrade into 1.19 and sentry-go package update into v0.20.0 --------- Co-authored-by: Daniel Agbay <dagbay@redhat.com> * changed name of config file to be aligned with other steps in readme file (RedHatInsights#105) --------- Co-authored-by: Ashley Aiken <aaiken@redhat.com> Co-authored-by: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> * need to request a count * stubbing out back office proxy client * adding in bop client and org id check * fixing up some of the ams calls * filling out bop client code * fixed a couple bugs with assigning and listing seats * post doesn't return the username, so just use the one we sent * adding more tests * added log in ams when a 500 happens, and validated bop settings when creating client * error context (RedHatInsights#110) * added context to errors around calls to BOP * must return here to properly bail out * adding new config to deployment manifest * updated entitlements secret ref name * handling the case where the request is denied * wrap seat request json decode error * some error handling around call to bop, add log level to deploy template (RedHatInsights#111) * added info to bop error * added error context to GetUser in bop client * factored out log level to an env variable * renamed method * added ability to set custom mock bop getuser response * added error handling around get user request to bop * removed http test server * unwrap QuotaAuthorizationResponse in ams client quota authorization --------- Co-authored-by: Daniel Agbay <101584191+dagbay-rh@users.noreply.github.com> Co-authored-by: Ashley Aiken <aaiken@redhat.com> Co-authored-by: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Co-authored-by: Daniel Agbay <dagbay@redhat.com> commit 1cec2d1 Author: Ashley Aiken <aaiken@redhat.com> Date: Tue Apr 11 15:14:18 2023 -0400 Revert "force a sentry error (RedHatInsights#108)" (RedHatInsights#109) This reverts commit e6dea91. commit e6dea91 Author: Ashley Aiken <aaiken@redhat.com> Date: Tue Apr 11 15:10:38 2023 -0400 force a sentry error (RedHatInsights#108) commit f9746e3 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Tue Apr 11 16:52:08 2023 +0200 changed name of config file to be aligned with other steps in readme file (RedHatInsights#105) commit 89d7247 Author: Petra Cihalova <89980168+petracihalova@users.noreply.github.com> Date: Tue Apr 11 16:32:03 2023 +0200 [RHCLOUD-25196] Golang upgrade into 1.19 (RedHatInsights#106) * goland upgrade into 1.19 and sentry-go package update into v0.20.0 --------- Co-authored-by: Daniel Agbay <dagbay@redhat.com> commit 99709c8 Author: Ashley Aiken <aaiken@redhat.com> Date: Wed Apr 5 14:25:44 2023 -0400 Initialize the dsn (RedHatInsights#102) commit 4e7168c Author: Ashley Aiken <aaiken@redhat.com> Date: Tue Apr 4 16:18:20 2023 -0400 [RHCLOUD-23259] Update sentry-dsn to glitchtip-dsn (RedHatInsights#101) * Update sentry-dsn to glitchtip-dsn * add default value * fix line * Make sure log messages are clear that we are using glitchtip dsn commit 10e5efc Merge: dcae4f4 c3375de Author: Ellen Yi Dong <ellen.dong92@gmail.com> Date: Wed Jan 25 12:18:10 2023 -0800 Merge branch 'master' into configure-bundles commit dcae4f4 Author: Ellen-Yi-Dong <ellen.dong92@gmail.com> Date: Wed Jan 25 12:13:24 2023 -0800 Add spaces in between the name of the bundles on line 197 within the deploy.yml commit f3059f5 Author: Ellen-Yi-Dong <ellen.dong92@gmail.com> Date: Tue Jan 17 20:08:34 2023 -0800 Within deployment/deploy.yml, added new parameter: BUNDLES_SKUS_ALLOW_LIST to add a new SKU bundle configurable Updated config/main.go to reflect the changes made in deploy.yml
lindgrenj6
approved these changes
Aug 30, 2023
dagbay-rh
merged commit 9ac855e
into
RedHatInsights:security-compliance
2 checks passed
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.
Platform Security
Secure Coding Practices Checklist Link
Secure Coding Checklist