Merge main into issue146-oidc-plan-april and resolve OIDC provider conflict

Author: Benettonkkb

terraform/aws-groups.tf

@@ -10,14 +10,3 @@ module "iam_read_only_group" {
   }
 }
 
-// Create iam services admin group
-module "iam_services_supervisor_group" {
-  source = "./modules/aws-groups"
-
-  group_name = "iam-services-supervisor-group"
-  policy_arn = {
-    "IAMServicesSupervisor" = module.aws_custom_policies.policy_arns["IAMServicesSupervisor"],
-    "EnforceMFAForUsers"    = module.aws_custom_policies.policy_arns["EnforceMFAForUsers"]
-  }
-}
-

terraform/aws-users.tf

@@ -29,7 +29,7 @@ module "iam_user_chelseyb" {
     "Project"      = "devops-security"
     "Access Level" = "1"
   }
-  user_groups = ["read-only-group", "iam-services-supervisor-group"]
+  user_groups = ["read-only-group"]
 }
 
 
@@ -135,7 +135,7 @@ module "iam_user_raibarra" {
 module "iam_user_ezesalvatore4" {
   source = "./modules/aws-users"
 
-  user_name = "ezesalvatore" 
+  user_name = "ezesalvatore"
   user_tags = {
     "Project"      = "devops-security"
     "Access Level" = "1"