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

[GT-145] Fixing, Refreshing and Enriching the Service Group Sample Data #470

Merged
merged 10 commits into from
Sep 14, 2023
Merged

[GT-145] Fixing, Refreshing and Enriching the Service Group Sample Data #470

merged 10 commits into from
Sep 14, 2023

Commits on Sep 14, 2023

  1. Removing the old service group sample data 

    - removing the old, outdated sample data from ServiceGroups.xml and ServiceGroupRoles.xml
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    2bf7033 View commit details
    Browse the repository at this point in the history

  2. Allow Services to be added to Service Groups when sample data is depl… 

    …oyed

- reorders when the service groups are deployed in the DeploySampleDataRunner.php file to be after the service endpoints
- adds new code when service groups are created to actually add their services to them
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    dc479d2 View commit details
    Browse the repository at this point in the history

  3. Adding 2 more services to the sample data 

    - adding 2 more services to the sample data
- this brings the total to 40, which is a nicer total than 38
- also does some fixes to some incorrect site sample data
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    678958d View commit details
    Browse the repository at this point in the history

  4. Adds 7 new service groups, populated with services 

    - adds 7 service groups, all named SERVICE_GROUP_x
- the groups have 5-8 services in each
- SERVICE_GROUP_1 has 6 services from different sites
- SERVICE_GROUP_2 has 5 services all from the same site
- SERVICE_GROUP 4 and 5 both have all their services from sites in the same NGI
- SERVICE_GROUP_7 has both EGI and Local scope - the rest have one or the other
- each service is used in at least one service group
- some services are used in 2 different service groups. one service is in 3 groups
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    b22bfdb View commit details
    Browse the repository at this point in the history

  5. Allow Service Group level roles to be created 

    - creates new file to allow the creation of service group level roles
- adds new file to DeploySampleDataRunner
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    7c65974 View commit details
    Browse the repository at this point in the history

  6. Add service group roles to users 

    - each group has a service group administrator
- so 7 users have the service group administrator role
- old file that added service group roles deleted
- as roles added in UsersAndRoles
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    405d4c8 View commit details
    Browse the repository at this point in the history

  7. Update INSTALL.md with service group sample data info

    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    66259ee View commit details
    Browse the repository at this point in the history

  8. Allow service groups to have multiple scopes, and not just the local … 

    …scope by default

- before each service group was given just the local scope by default
- this allows egi scopes to be added
- and allows multiple scopes to be added for each service group
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    d44f31d View commit details
    Browse the repository at this point in the history

  9. Code formatting fixes 

    - as suggested by codeclimate and codacy
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    ae6a90d View commit details
    Browse the repository at this point in the history

  10. Rework code to remove confusing foreach loop when setting variable to… 

    … array item

- the array only ever has one data item in it
- the foreach loop was taking each item from the array, which was just the one item, and setting it to a different variable
- the new code sets the variable to the first and only item in the array instead, without the need for a loop
    @rowan04 @gregcorbett
    rowan04 authored and gregcorbett committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    9dea011 View commit details
    Browse the repository at this point in the history