Updated to add resource_types and resource_type_realms #1006
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
- Updated acl-config so that it knows when it's being installed on a system that has the `XSEDE` module. This has been added so that we can select the correct db schema for `updateResourceTypeRealms`. - Needed to make sure that the `resource-types` table exists before inserting the Unknown resource type.
We can't be sure that `acl-config` will have been run before this code is called so instead we've ported our `enabledRealms` code from `acl-config` here.
- Added a new property `supported_realms` to `permitted_modules` items. This, along with the accompanying change in `acl-config`, allows for filtering a `permitted_module` entry if none of the `supported_realms` are installed / enabled. - Also fixed a problem with the `DatawarehouseInitializer::getEnabledRealms` function that caused an error if the `$item` in `$resourceTypes['resource_types'][$item]` did not exist. - Small update to allow the `testFilterIdLookup` function to create its own artifacts if they are not found.
plessbd
previously approved these changes
Aug 15, 2019
|
approved with the caveat that proccessresults removes true |
6 tasks
plessbd
reviewed
Aug 16, 2019
Co-Authored-By: Ben Plessinger <[email protected]>
plessbd
approved these changes
Aug 16, 2019
This was referenced Oct 10, 2019
jpwhite4
added a commit
to jpwhite4/xdmod
that referenced
this pull request
Oct 10, 2019
- Revert the change to the primary key value for the 'UNK' resource type. This is now the same value (0) as previous s/w versions. - Ensure the 'UNK' resource is added to the various resource type tables in the jobs_staging pipeline. - Revert the addition of the ingest-resource-types pipeline when shredding jobs. This was added in ubccr#1006 possibly as a work around for the fact that the staging pipeline had not been modfied appropriately. - Add a test to make sure this does not happen again.
jpwhite4
added a commit
to jpwhite4/xdmod
that referenced
this pull request
Oct 15, 2019
- Revert the change to the primary key value for the 'UNK' resource type. This is now the same value (0) as previous s/w versions. - Ensure the 'UNK' resource is added to the various resource type tables in the jobs_staging pipeline. - Enuse that the 'UNK' rows are added on upgrade path too. - Revert the addition of the ingest-resource-types pipeline when shredding jobs. This was added in ubccr#1006 possibly as a work around for the fact that the staging pipeline had not been modified appropriately. - Add a test to make sure this does not happen again.
plessbd
added
Category:ACL
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
Added Resource Types -> Supported Realms relations that we then use to filter what data
acl-configprocesses.Motivation and Context
We wanted to be able to only process, in
acl-configthe realms that are currently enabled. To accomplish this we associated resource_types w/ the appropriate realms. Then we select all currently installed resources and their types and retrieve a distinct list of the realms for those types.There was also a few changes made to support Trevor's realm separation work ( Making it so that XDMoD doesn't need to have the Jobs realm installed to function properly. ).
Tests performed
Types of changes
Checklist: