switch to using bool

Azure · Jul 20, 2020 · 7a297e0 · 7a297e0
1 parent 96a6617
commit 7a297e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/test/e2e/framework/azure/vm_manager.go b/test/e2e/framework/azure/vm_manager.go
@@ -87,7 +87,7 @@ func (m *vmManager) UnassignUserAssignedIdentity(vmName, identityToUnassign stri
 		return nil
 	}
 
-	var existingIdentitiesCount int
+	var hasOtherIdentitiesAssigned bool
 	for identity := range vm.Identity.UserAssignedIdentities {
 		if s := strings.Split(identity, "/"); strings.EqualFold(s[len(s)-1], identityToUnassign) {
 			By(fmt.Sprintf("Un-assigning \"%s\" from \"%s\"", identityToUnassign, vmName))
@@ -96,9 +96,10 @@ func (m *vmManager) UnassignUserAssignedIdentity(vmName, identityToUnassign stri
 			vm.Identity.UserAssignedIdentities[identity] = nil
 			break
 		}
+		hasOtherIdentitiesAssigned = true
 	}
 
-	if existingIdentitiesCount == 0 {
+	if !hasOtherIdentitiesAssigned {
 		vm.Identity.UserAssignedIdentities = nil
 		switch vm.Identity.Type {
 		case compute.ResourceIdentityTypeSystemAssignedUserAssigned:

diff --git a/test/e2e/framework/azure/vmss_manager.go b/test/e2e/framework/azure/vmss_manager.go
@@ -87,7 +87,7 @@ func (m *vmssManager) UnassignUserAssignedIdentity(vmssName, identityToUnassign
 		return nil
 	}
 
-	var existingIdentitiesCount int
+	var hasOtherIdentitiesAssigned bool
 	for identity := range vmss.Identity.UserAssignedIdentities {
 		if s := strings.Split(identity, "/"); strings.EqualFold(s[len(s)-1], identityToUnassign) {
 			By(fmt.Sprintf("Un-assigning \"%s\" from \"%s\"", identityToUnassign, vmssName))
@@ -96,10 +96,10 @@ func (m *vmssManager) UnassignUserAssignedIdentity(vmssName, identityToUnassign
 			vmss.Identity.UserAssignedIdentities[identity] = nil
 			continue
 		}
-		existingIdentitiesCount++
+		hasOtherIdentitiesAssigned = true
 	}
 
-	if existingIdentitiesCount == 0 {
+	if !hasOtherIdentitiesAssigned {
 		vmss.Identity.UserAssignedIdentities = nil
 		switch vmss.Identity.Type {
 		case compute.ResourceIdentityTypeSystemAssignedUserAssigned: