diff --git a/src/ADP.Portal.Api/ADP.Portal.Api.csproj b/src/ADP.Portal.Api/ADP.Portal.Api.csproj index e867ce7..c6089b8 100644 --- a/src/ADP.Portal.Api/ADP.Portal.Api.csproj +++ b/src/ADP.Portal.Api/ADP.Portal.Api.csproj @@ -2,7 +2,7 @@ net8.0 - 0.2.20 + 0.2.21 enable enable true diff --git a/src/ADP.Portal.Core/Git/Services/GroupsConfigService.cs b/src/ADP.Portal.Core/Git/Services/GroupsConfigService.cs index a92c024..9c1e902 100644 --- a/src/ADP.Portal.Core/Git/Services/GroupsConfigService.cs +++ b/src/ADP.Portal.Core/Git/Services/GroupsConfigService.cs @@ -157,6 +157,20 @@ private GroupsRoot BuildTeamGroups(string tenantName, string teamName, IEnumerab }); }); + root.Groups.Add(new Group + { + DisplayName = $"AAG-Azure-ADP-{teamName.ToUpper()}-Resources-Contributor", + Description = "AD group to grant contributor access to team resources. For e.g. Contributor to Team resource group, DataOwner to team queues and topic.", + Type = GroupType.AccessGroup + }); + + root.Groups.Add(new Group + { + DisplayName = $"AAG-Azure-ADP-{teamName.ToUpper()}-Resources-Reader", + Description = "AD group to grant reader access to team resources.", + Type = GroupType.AccessGroup + }); + return root; } diff --git a/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defra.yml b/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defra.yml index 2febde4..fb9b514 100644 --- a/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defra.yml +++ b/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defra.yml @@ -5,10 +5,12 @@ techUser: - AAG-Azure-ADP-{teamName}-SND4-PostgresDB_Writer - AAG-Azure-ADP-{teamName}-DEV1-PostgresDB_Reader - AAG-Azure-ADP-{teamName}-TST1-PostgresDB_Reader + - AAG-Azure-ADP-{teamName}-Resources-Contributor nontechUser: - AAG-Azure-ADP-GlobalRead admin: - AAG-Azure-ADP-SND4-AKS-Cluster-Custom-Resources-Reader - AAG-Azure-ADP-{teamName}-SND4-PostgresDB_Writer - AAG-Azure-ADP-{teamName}-DEV1-PostgresDB_Reader - - AAG-Azure-ADP-{teamName}-TST1-PostgresDB_Reader \ No newline at end of file + - AAG-Azure-ADP-{teamName}-TST1-PostgresDB_Reader + - AAG-Azure-ADP-{teamName}-Resources-Contributor \ No newline at end of file diff --git a/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defradev.yml b/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defradev.yml index 93199df..8fe63ac 100644 --- a/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defradev.yml +++ b/src/ADP.Portal.Core/Git/template/UserGroupMemberShip.defradev.yml @@ -3,8 +3,10 @@ techUser: - AAG-Azure-ADP-GlobalRead - AAG-Azure-ADP-SND3-AKS-Cluster-Custom-Resources-Reader - AAG-Azure-ADP-{teamName}-SND3-PostgresDB_Writer + - AAG-Azure-ADP-{teamName}-Resources-Contributor nontechUser: - AAG-Azure-ADP-GlobalRead admin: - AAG-Azure-ADP-SND3-AKS-Cluster-Custom-Resources-Reader - - AAG-Azure-ADP-{teamName}-SND3-PostgresDB_Writer \ No newline at end of file + - AAG-Azure-ADP-{teamName}-SND3-PostgresDB_Writer + - AAG-Azure-ADP-{teamName}-Resources-Contributor \ No newline at end of file