Move daemon reload after all service file manipulation

aws · Jan 29, 2025 · 134d2b7 · 134d2b7
1 parent c3111be
commit 134d2b7
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/test/assume_role/assume_role_unix.go b/test/assume_role/assume_role_unix.go
@@ -537,11 +537,6 @@ func (t *ConfusedDeputyAssumeRoleTestRunner) setupEnvironmentVariables() error {
 		if err := cmd.Run(); err != nil {
 			return fmt.Errorf("failed to replace AMZ_SOURCE_ACCOUNT value: %w", err)
 		}
-
-		err := t.daemonReload()
-		if err != nil {
-			return err
-		}
 	} else {
 		log.Println("Removing AMZ_SOURCE_ACCOUNT from service file")
 
@@ -550,11 +545,6 @@ func (t *ConfusedDeputyAssumeRoleTestRunner) setupEnvironmentVariables() error {
 		if err := cmd.Run(); err != nil {
 			return fmt.Errorf("failed remove PLACEHOLDER value: %w", err)
 		}
-
-		err := t.daemonReload()
-		if err != nil {
-			return err
-		}
 	}
 
 	if t.setSourceArnEnvVar {
@@ -571,10 +561,6 @@ func (t *ConfusedDeputyAssumeRoleTestRunner) setupEnvironmentVariables() error {
 			return fmt.Errorf("failed to replace AMZ_SOURCE_ARN value: %w", err)
 		}
 
-		err := t.daemonReload()
-		if err != nil {
-			return err
-		}
 	} else {
 		log.Println("Removing AMZ_SOURCE_ARN from service file")
 
@@ -583,11 +569,11 @@ func (t *ConfusedDeputyAssumeRoleTestRunner) setupEnvironmentVariables() error {
 		if err := cmd.Run(); err != nil {
 			return fmt.Errorf("failed to remove AMZ_SOURCE_ARN value: %w", err)
 		}
+	}
 
-		err := t.daemonReload()
-		if err != nil {
-			return err
-		}
+	err := t.daemonReload()
+	if err != nil {
+		return err
 	}
 
 	return nil