chore : refactor tests

Author: ShivaniBanke

modules/permission_sets/main.tf

@@ -14,9 +14,6 @@ resource "aws_ssoadmin_permission_set_inline_policy" "this" {
   inline_policy      = each.value
   instance_arn       = local.sso_instance_arn
   permission_set_arn = aws_ssoadmin_permission_set.this[each.key].arn
-
-  #Ensures that this resource waits for the specified permission set to be created or updated before proceeding.
-  depends_on = [aws_ssoadmin_permission_set.this]
 }
 
 resource "aws_ssoadmin_managed_policy_attachment" "this" {
@@ -25,9 +22,6 @@ resource "aws_ssoadmin_managed_policy_attachment" "this" {
   instance_arn       = local.sso_instance_arn
   managed_policy_arn = each.value.policy_arn
   permission_set_arn = aws_ssoadmin_permission_set.this[each.value.ps_name].arn
-
-  #Ensures that this resource waits for the specified permission set to be created or updated before proceeding.
-  depends_on = [aws_ssoadmin_permission_set.this]
 }
 
 resource "aws_ssoadmin_customer_managed_policy_attachment" "this" {
@@ -38,7 +32,4 @@ resource "aws_ssoadmin_customer_managed_policy_attachment" "this" {
     name = each.value.policy_name
     path = each.value.policy_path
   }
-
-  #Ensures that this resource waits for the specified permission set to be created or updated before proceeding.
-  depends_on = [aws_ssoadmin_permission_set.this]
 }

tests/permission_sets_unit-tests.tftest.hcl

@@ -1,8 +1,7 @@
 # Attribute validations for permission_sets sub module
 run "validate_inline_policy" {
-  module {
-    source = "./modules/permission_sets"
-  }
+  command = plan
+
   variables {
     permission_sets = {
       "dummy_ps" = {
@@ -15,16 +14,18 @@ run "validate_inline_policy" {
     }
   }
 
-  command = plan
+  module {
+    source = "./modules/permission_sets"
+  }
+
   expect_failures = [
     var.permission_sets["dummy_ps"]
   ]
 }
 
 run "validate_inline_policy_json_content" {
-  module {
-    source = "./modules/permission_sets"
-  }
+  command = plan
+
   variables {
     permission_sets = {
       "dummy_ps" = {
@@ -37,17 +38,19 @@ run "validate_inline_policy_json_content" {
     }
   }
 
-  command = plan
+  module {
+    source = "./modules/permission_sets"
+  }
+
   expect_failures = [
     var.permission_sets["dummy_ps"]
   ]
 }
 
 
 run "validate_permission_set_name" {
-  module {
-    source = "./modules/permission_sets"
-  }
+  command = plan
+
   variables {
     permission_sets = {
       "dummy_ps" = {
@@ -59,7 +62,11 @@ run "validate_permission_set_name" {
       }
     }
   }
-  command = plan
+
+  module {
+    source = "./modules/permission_sets"
+  }
+
 
   assert {
     condition     = aws_ssoadmin_permission_set.this["dummy_ps"].name == var.permission_sets["dummy_ps"].name
@@ -68,9 +75,8 @@ run "validate_permission_set_name" {
 }
 
 run "validate_permission_set_description" {
-  module {
-    source = "./modules/permission_sets"
-  }
+  command = plan
+
   variables {
     permission_sets = {
       "dummy_ps" = {
@@ -82,7 +88,10 @@ run "validate_permission_set_description" {
       },
     }
   }
-  command = plan
+
+  module {
+    source = "./modules/permission_sets"
+  }
 
   assert {
     condition     = aws_ssoadmin_permission_set.this["dummy_ps"].description == var.permission_sets["dummy_ps"].description
@@ -91,9 +100,9 @@ run "validate_permission_set_description" {
 }
 
 run "check_permission_set_creation" {
-  module {
-    source = "./modules/permission_sets"
-  }
+
+  command = apply
+
   variables {
     permission_sets = {
       "dummy_ps" = {
@@ -105,7 +114,10 @@ run "check_permission_set_creation" {
       },
     }
   }
-  command = apply
+
+  module {
+    source = "./modules/permission_sets"
+  }
 
   assert {
     condition     = can(aws_ssoadmin_permission_set.this["dummy_ps"])