resource account: fix --stacks target

Now we don't reuse the Stack when we match on a target to avoid losing
information like the Workspace or Role when a target is matched

resource/account.go

@@ -148,49 +148,34 @@ func (a Account) FilterBaselineStacks(stackNames string) ([]Stack, error) {
 		return nil, err
 	}
 
-	for _, stack := range baselineStacks {
+	for i, stack := range baselineStacks {
 		acctStackNames := strings.Split(stack.Name, ",")
-		var matchingStackNames []string
 		for _, name := range acctStackNames {
 			for _, targetName := range targetStackNames {
 				if strings.TrimSpace(name) == strings.TrimSpace(targetName) {
-					matchingStackNames = append(matchingStackNames, name)
+					matchingStacks = append(matchingStacks, baselineStacks[i])
 					break
 				}
 			}
 		}
-		if len(matchingStackNames) > 0 {
-			matchingStacks = append(matchingStacks, Stack{
-				Path: stack.Path,
-				Type: stack.Type,
-				Name: strings.Join(matchingStackNames, ","),
-			})
-		}
 	}
 	return matchingStacks, nil
 }
 
 func (a Account) FilterServiceControlPolicies(stackNames string) []Stack {
 	var matchingStacks []Stack
 	targetStackNames := strings.Split(stackNames, ",")
-	for _, stack := range a.ServiceControlPolicies {
+	for i, stack := range a.ServiceControlPolicies {
 		acctStackNames := strings.Split(stack.Name, ",")
-		var matchingStackNames []string
 		for _, name := range acctStackNames {
 			for _, targetName := range targetStackNames {
 				if strings.TrimSpace(name) == strings.TrimSpace(targetName) {
-					matchingStackNames = append(matchingStackNames, name)
+					matchingStacks = append(matchingStacks, a.ServiceControlPolicies[i])
 					break
 				}
 			}
 		}
-		if len(matchingStackNames) > 0 {
-			matchingStacks = append(matchingStacks, Stack{
-				Path: stack.Path,
-				Type: stack.Type,
-				Name: strings.Join(matchingStackNames, ","),
-			})
-		}
 	}
+
 	return matchingStacks
 }