ROX-11101: Remove deprecated resources from central by rhybrillou · Pull Request #3115 · stackrox/stackrox

rhybrillou · 2022-09-16T15:25:08Z

Description

The set resources used for access control is being simplified. A number of resources has been deprecated.

The goal here is to get rid of the deprecated resources, both in the database and in the codebase (UI, QA, central, DB). This PR focuses on the central codebase removal. Full PR chain:
#3036
#3115
#3116
#3428

Checklist

Investigated and inspected CI test results
Unit test and regression tests added
Evaluated and added CHANGELOG entry if required
~~- [ ] Determined and documented upgrade steps~~
~~- [ ] Documented user facing changes (create PR based on openshift/openshift-docs and merge into rhacs-docs)~~

If any of these don't apply, please comment below.

Testing Performed

CI should be sufficient

openshift-ci · 2022-09-16T15:25:13Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

rhybrillou · 2022-09-16T15:28:14Z

/test all

openshift-ci · 2022-09-16T15:28:17Z

@rhybrillou: No presubmit jobs available for stackrox/stackrox@yann/ROX-11101-qa_remove_old_resource

Details

In response to this:

/test all

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

rukletsov · 2022-09-20T21:52:53Z

tools/generate-helpers/pg-table-bindings/list.go

 func init() {
 	for s, r := range map[proto.Message]permissions.ResourceHandle{
 		&storage.ActiveComponent{}:                              resources.Deployment,
+		&storage.AuthProvider{}:                                 resources.Access,


I was only expecting removals in this file but not additions. Why adding new entries here is part of the deprecation removal?

This list is the Proto -> scoping resource mapping. In order to simplify things, the default is to map &storage.ObjType{} to resources.ObjType.
The additions in this map are actually equivalent to:

- &storage.SomeType{}: resources.SomeType, + &storage.SomeType{}: resources.NewScopingType,

The additions being done here should only have Protos matching the deprecated resource type names, and now map to the replacing resource types.

rukletsov · 2022-09-20T21:58:29Z

central/role/resources/list.go

 	// To-be-deprecated resources. For now, the resources should still be used in favor of the newly
 	// introduced ones.


Ditch this comment as well.

It does make sense, despite the fact that there still is a deprecated resource: the ClusterCVE one, which should be removed in 3.74.

rukletsov · 2022-09-20T21:59:53Z

central/role/default.go

 	resourceToAccess := resources.AllResourcesViewPermissions()
 	for i, resourceWithAccess := range resourceToAccess {
-		if resourceWithAccess.Resource.GetResource() == resources.DebugLogs.GetResource() {
+		if resourceWithAccess.Resource.GetResource() == resources.Administration.GetResource() {


Let's call this out in changelog. Specifically, which permissions Analyst will loose.

Good point.

Suggested changelog entry:

### Technical Changes - ROX-11101: The Analyst permission set which used to have read access on all permissions except the now deprecated `DebugLogs` permission now has read access to all permissions except `Administration`.

Now, the deprecation of DebugLogs for Administration is only announced in #3036 (was unfortunately missed in 3.71) which means this is a sample to be used in the 3.75 pass on deprecated resources.

central/role/datastore/singleton.go

rukletsov · 2022-09-20T22:08:53Z

central/integrationhealth/datastore/datastore_impl.go

-	imageSAC    = sac.ForResource(resources.ImageIntegration)
-	notifierSAC = sac.ForResource(resources.Notifier)
-	backupSAC   = sac.ForResource(resources.BackupPlugins)
+	imageSAC    = sac.ForResource(resources.Integration)
+	notifierSAC = sac.ForResource(resources.Integration)
+	backupSAC   = sac.ForResource(resources.Integration)


I think we can now have a single var and simplify readAllowed() and writeAllowed().

rukletsov · 2022-09-20T22:10:52Z

central/graphql/resolvers/resolver.go

 	readSecrets                          = readAuth(resources.Secret)
 	readServiceAccounts                  = readAuth(resources.ServiceAccount)
-	readBaselines                        = readAuth(resources.ProcessWhitelist)
+	readBaselines                        = readAuth(resources.DeploymentExtension)


Please de-dupe the list.

dhaus67

Feel like we should rename the variables we create for datastores such as

signatureSAC = sac.ForResource(resources.Integration)

as well to match the resource its checking. I find it a bit confusing seeing a different resource there than what the name of the variable indicates (signature != integration)

central/clusterinit/backend/backend_test.go

md2119

Changes LGTM.

Do SREs need (read-only/read-write) Administration access?

md2119 · 2022-10-31T17:30:56Z

tools/generate-helpers/pg-table-bindings/list.go

-		&storage.NamespaceMetadata{}:                            resources.Namespace,
-		&storage.NetworkEntity{}:                                resources.NetworkGraph,
-		&storage.NetworkFlow{}:                                  resources.NetworkGraph,
+		&storage.ActiveComponent{}:                      resources.Deployment,


Maybe a comment on the top to keep this list sorted?

ghost · 2022-11-06T19:28:44Z

Images are ready for the commit at 27821cc.

To use with deploy scripts, first export MAIN_IMAGE_TAG=3.72.x-549-g27821cce33.

…e permission groups

…ons as the deprecation notice is not published yet.

…OX-12750

…dministration and Compliance group permissions

7ffc6be ROX-13368: Skip failing nongroovy tests on PG (#3721) bbdd7a0 Bump github.com/gofrs/uuid from 4.3.0+incompatible to 4.3.1+incompatible (#3642) 1f253f2 Bump github.com/google/certificate-transparency-go from 1.1.3 to 1.1.4 (#3543) d434c8d [ROX-13030] : Add delete collection API endpoint and service implementation (#3648) f062c21 Dashrews/ROX-13253 wait for central-db to come back after bounce and allow FATAL connection lost error (#3537) edc1174 CI: Fill the gaps for https://testgrid.k8s.io/ (#3715) 86d7c54 ROX-13231: use passed context when non-postgres (#3540) 9093195 Add less specific type for BE collection response string (#3728) 5abb652 Only enable ROX_OBJECT_COLLECTIONS feature flag during gke-postgres-ui-e2e job (#3727) 4f64cd1 Add centralDBOnly mode in render (#3707) d67bbe5 Dashrews/ROX-13082 UUID searcher and common updates to set allow use of postgres UUID PR 1 of 4 (#3679) 6f829d5 ROX-13259: graphInit called during init time (#3705) f3bc50d ROX-13380: Conditional rendering edges for deployments and namespaces (#3641) 3764476 ROX-12319: implement smoke test step with groovy test filter (#3220) f202fd4 ROX-11826: Disable kernel support package uploads for managed central (#3661) 61f03dc ROX-11101: Remove deprecated resources from central (#3115) e6aa6d7 ROX-11101: Restore Role permission in UI (#3428) 3203e04 ROX-11101: Remove deprecated resources (#3036) a35f41e Bump golang.org/x/sys from 0.1.0 to 0.2.0 (#3733) 4120524 Bump snakeyaml from 1.29 to 1.33 in /qa-tests-backend (#3732) e1785c0 Bump github.com/coreos/go-systemd/v22 from 22.4.0 to 22.5.0 (#3724) 870df4a Bump google.golang.org/api from 0.101.0 to 0.102.0 (#3723) 721454c Generalize User-Agent setup (#3672) 6a11bf0 Bumps collector version to 3.11.x-145-gc345f72f5e (#3736) ec5d343 [ROX-12923] Walk retries - remainder work (#3729) 40f3d43 ROX-13440: Replace ambiguous central with sensor in networkGraph integration test (#3730) 281ed22 Bump groovy-xml from 2.5.18 to 2.5.19 in /qa-tests-backend (#3741) 49d1651 Bump github.com/prometheus/client_golang from 1.13.1 to 1.14.0 (#3742) b5544aa Bump cloud.google.com/go/storage from 1.27.0 to 1.28.0 (#3743) 9c61e53 ensure CVSS is present for istio vulns (#3706) ae29d52 ROX-13452: don't always clobber scoped ctx when non-postgres (#3748) 517bf05 ROX-13261: DryRunUpdate on collection datastore (#3687) baf7654 ROX-13378: Group new resources with deprecated in UI (#3690) 569922f ROX-13421: Enable roxctl netpol generate and add tech-preview messages (#3740) 2465fc5 Dashrews/ROX-13082 UUID generator templates PR 2 of 4 (#3681) c093c68 Bump slack-api-client from 1.20.2 to 1.27.0 in /qa-tests-backend (#3752) 2c860bb Bump ubi8-micro from 8.6 to 8.7 in /operator (#3751) 80eb04c Make deploy.sh and deploy-local.sh pass shellcheck (#3582) 2182b43 Dashrews/ROX-13082 UUID test updates PR 3 of 4 (#3694) 6dc6ca5 [ROX-13403] : Fix node -> topVuln sub resolver bug when node cves is empty (#3689) 1b21361 Move integration tests for page title from general to specific containers (#3675) e1a9f31 Bump google.golang.org/api from 0.102.0 to 0.103.0 (#3773) a05ea31 Bump golang.org/x/crypto from 0.1.0 to 0.2.0 (#3772) 65ddf4f ROX-12824: Add roxctl commands to generate Central DB bundle (#3602) c3f1e2f Remove obsolete authProviders request for Integrations page (#3759) 7ccd54d Dashrews/ROX-13082 UUID protos generated PR 4 of 4 (#3698) 9ab5c8f cleanup image digest utilities (#3764) 187ed44 ROX-11931: Convert junit failure artifacts to Slack attachments (#3438) b5d8790 ROX-13432: leaning up unused code copied/pasted from topology demo (#3750) ab05bfc Refactor collection form page for better composition (#3744) c5562f7 Remove babel devDependencies in ui-components (#3761) 2b90b3a Extract collection form from drawer wrapper layout (#3745) a779fc9 [ROX-12625 + ROX-13032] : Add GetCollectionCount and UpdateCollection endpoints and services (#3749) e77f0da Upgrade cypress 11.0.0 devDependencies in ui (#3760) a3fba94 ROX-13068: Use real data for deployment details (#3688) 4c7d90e ROX-12617: Collection to search query converter (#3683) 3e98aec ROX-13067: fill out port configurations section of deployment details (#3714) a48de36 ROX-12835: Add support for NodeScanV2 to Sensor (#3533) 30c5dc7 ROX-13466: Fix deletion of groups with empty properties (#3756) 5cb2470 Add autocomplete for name selector dropdowns (#3676) b9a75ad ROX-13464 adding flows dropdown in NG (#3763) 3217a67 [ROX-13500] Perform type check for V1 CronJob (#3787) af3790d Remove bulk delete from collections table (#3776) dda123b Add more info in migration log (#3788) 179f0c9 ROX-13502: Remove the circular dependency between cluster datastore init and cscc notifier init (#3790) 029d584 Update SCANNER_VERSION (#3774) cbca57c Bump github.com/ckaznocha/protoc-gen-lint from 0.2.4 to 0.3.0 (#3783) 3613b56 Bump golang.org/x/tools from 0.2.0 to 0.3.0 (#3782) 5fc0a6a Bump github.com/google/go-containerregistry from 0.12.0 to 0.12.1 (#3781) 1d1c687 Bump controller-gen version to 0.10.0 (#3754) c3a5290 Untie documentation link from the product version (#3799) ed822aa use correct package for migration (#3784) 397a0b4 Validate that label keys are valid k8s labels and ensure correct key splitting (#3777) edd1050 Rename variable ScannerGRPCEndpoint to ScannerSlimGRPCEndpoint (#3657) 6662c9f ROX-13378: Access Control page permissions (#3720) b0e73c5 fix Operator reconciliation for external Central DB (#3796) b83bc1f ROX-13505: Fix error log scanning the postgres stat collection (#3795) ca660cb Prevent the collection being edited from displaying in its own embedded list (#3778) 3f7b3fc [ROX-13441][POSTGRES] Propagate context correctly in retries (#3793) e0cbc6f ROX-12839: Update changelog to announce removal of in-product docs (#3805) 696e8bc [ROX-12358] Follow up on vulnerability request proto change (#2851) c4b46d8 Change getCollectionCount endpoint and updateCollection request type 5f2efbc remove make proto-fmt (#3804) 0c75540 Remove os.Std* from roxctl/central (#3758) 25a90de Add ability to view embedded collections in a pop up modal (#3747) 5c1bf81 ROX-13240: fix scanner-slim updates when WebSockets are used (#3704) 1d98577 Add more context to jira notifier logging (#3812) da2fd28 ROX-13031: DryRun Collection API (#3766) 1c418d5 Test data migration code in postgres tests (#3803) ed95b37 Update UI Collection requests for BE compatibiltiy (#3762) 09cc188 ROX-11931: Fix junit-parse install in CI (#3811) d2b01e3 ROX-12814: Disable PolicyFieldsTest on openshift. (#3797) d10ce27 ROX-13345: disable 'missing required registry' aspect on openshift (#3798) 3d22396 Update collector to 3.12 (#3809) 1eb33fb ROX-13347: Modify scope queries to included quoted cluster and nameace names, to allow exact matches instead of erroneous and unintended prefix matches. (#3767) 3811a69 ROX-12621: list collection selectors api (#3806) f6d3f9d Add migration for groups with invalid values (#3789) cc21125 Bugfixes for collection autocomplete (#3816) 7623dec ROX-9350 Use fine-grained host paths for compliance mounts (#2479) b4bf5c2 Fix collector volumeMounts (#3826) 0e9be05 ROX-12953: figure out last 4 versions of sensor automatically (#3611) 459c7ae ROX-12814: Add proper todo for reenabling the test (#3817) 9ee40ff ROX-13523: add isEnabled enum to central db spec (#3815) 535bc72 Replace requestConfig with routeMatcherMap in helper functions for integration tests (#3686) 2b75b61 `gosec` G104: Add `ShouldErr(err)` that returns `err` (#3830) fb1b82f WIP: Introduce nodescan call 35f8a8f WIP: Prepare converter 716144b Moved and renamed fake nodescan tests 4748de7 Introduce real node scanner with conversion functions 5e6d9a8 wip: real scanner 0169868 wip: log results 1438d2c wip: Debug Analyze call b09894c wip: Debug Analyze call 3ceed72 wip: Update and improve debug logs d1669fd Remove copied lib, bump scanner version, add debug 14a3f73 Merge branch 'master' into mm/ROX-12967-real-nodescan fbd0450 Fix style issues 17ccb31 Debug: let both scans finish to see what they return

openshift-ci bot added the do-not-merge/work-in-progress label Sep 16, 2022

github-actions bot added area/central area/postgres area/ui ci-postgres-tests labels Sep 16, 2022

rhybrillou changed the base branch from master to yann/ROX-11101-qa_remove_old_resource September 16, 2022 15:27

rhybrillou requested review from a team and rukletsov September 19, 2022 15:55

rhybrillou force-pushed the yann/ROX-11101-qa_remove_old_resource branch from 0c5e706 to 9eee493 Compare September 19, 2022 16:11

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from fb9878d to 0d8d436 Compare September 19, 2022 16:12

rukletsov requested changes Sep 20, 2022

View reviewed changes

rukletsov requested a review from dhaus67 September 20, 2022 22:14

dhaus67 reviewed Sep 21, 2022

View reviewed changes

central/clusterinit/backend/backend_test.go Show resolved Hide resolved

rhybrillou force-pushed the yann/ROX-11101-qa_remove_old_resource branch 2 times, most recently from 9309005 to dd62b13 Compare September 21, 2022 19:29

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from 0d8d436 to 112d72b Compare September 22, 2022 19:34

rhybrillou force-pushed the yann/ROX-11101-qa_remove_old_resource branch from dd62b13 to 50cc118 Compare September 23, 2022 07:44

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from b4a3b5c to a0b5ce3 Compare September 23, 2022 07:48

rhybrillou marked this pull request as ready for review September 23, 2022 13:56

rhybrillou requested a review from a team as a code owner September 23, 2022 13:57

openshift-ci bot removed the do-not-merge/work-in-progress label Sep 23, 2022

rhybrillou force-pushed the yann/ROX-11101-qa_remove_old_resource branch from 50cc118 to 5df5b1c Compare September 23, 2022 21:09

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch 2 times, most recently from eccd21b to 05a3c86 Compare September 23, 2022 21:15

rhybrillou force-pushed the yann/ROX-11101-qa_remove_old_resource branch from 15126f3 to 1c95c7d Compare October 17, 2022 08:59

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch 2 times, most recently from d0fa078 to 9575a6c Compare October 17, 2022 10:14

This was referenced Oct 27, 2022

ROX-11101: Remove deprecated resources #3036

Merged

ROX-11101: Remove deprecated resources from QA tests #3116

Merged

ROX-11101: Restore Role permission in UI #3428

Merged

rukletsov approved these changes Oct 27, 2022

View reviewed changes

md2119 approved these changes Oct 31, 2022

View reviewed changes

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from 5ca8289 to 7d53e9c Compare November 4, 2022 16:53

rhybrillou changed the base branch from yann/ROX-11101-qa_remove_old_resource to C November 4, 2022 16:53

rhybrillou requested a review from a team November 4, 2022 16:53

rhybrillou requested a review from a team as a code owner November 4, 2022 16:53

rhybrillou changed the base branch from C to master November 4, 2022 16:56

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from 3925234 to 9b88539 Compare November 6, 2022 18:55

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from ba5d46e to 1301bc9 Compare November 7, 2022 14:24

rhybrillou added 11 commits November 8, 2022 09:28

ROX-11101: Remove deprecated resource types from central

fc0611c

Address review comments

760c100

Changelog entry for analyst permission set upgrade

ff7c324

Remove deprecated permissions replaced by Administration or Complianc…

043274c

…e permission groups

Revert deprecations related to Administration and Compliance permissi…

3d2d843

…ons as the deprecation notice is not published yet.

Start splitting Role back out of Access + start marking locations for R…

ad92bf6

…OX-12750

Split Role permission back out of Access + Prepare cleanup work for A…

2d0cc19

…dministration and Compliance group permissions

re-align qa and ui post rebase

d015ad0

Add comment requested in review

8992fd9

Remove dupe test entry

b002d94

Fix test following resource grouping

55102b7

rhybrillou force-pushed the yann/ROX-11101-central_remove_old_resources branch from d11a866 to 55102b7 Compare November 8, 2022 08:30

Style fix

27821cc

dhaus67 approved these changes Nov 8, 2022

View reviewed changes

rhybrillou merged commit 61f03dc into master Nov 8, 2022

rhybrillou deleted the yann/ROX-11101-central_remove_old_resources branch September 17, 2025 07:35

		// To-be-deprecated resources. For now, the resources should still be used in favor of the newly
		// introduced ones.

Conversation

rhybrillou commented Sep 16, 2022 • edited by rukletsov Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Testing Performed

Uh oh!

openshift-ci bot commented Sep 16, 2022

Uh oh!

rhybrillou commented Sep 16, 2022

Uh oh!

openshift-ci bot commented Sep 16, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dhaus67 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

md2119 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Nov 6, 2022 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rhybrillou commented Sep 16, 2022 •

edited by rukletsov

Loading

ghost commented Nov 6, 2022 •

edited by ghost

Loading