Skip to content

Commit

Permalink
fix failing unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
aclevername committed Jan 18, 2021
1 parent 67e7fd4 commit 8fc8dcb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pkg/actions/iam/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ func (a *Manager) UpdateIAMServiceAccounts(iamServiceAccounts []*api.ClusterIAMS
var nonExistingSAs []string
updateTasks := &tasks.TaskTree{Parallel: true}

stacks, err := a.stackManager.ListStacksMatching("eksctl-.*-addon-iamserviceaccount")
existingIAMStacks, err := a.stackManager.ListStacksMatching("eksctl-.*-addon-iamserviceaccount")
if err != nil {
return err
}

existingStacksMap := listToSet(stacks)
existingIAMStacksMap := listToSet(existingIAMStacks)

for _, iamServiceAccount := range iamServiceAccounts {
stackName := makeIAMServiceAccountStackName(a.clusterName, iamServiceAccount.Namespace, iamServiceAccount.Name)

if _, ok := existingStacksMap[stackName]; !ok {
if _, ok := existingIAMStacksMap[stackName]; !ok {
logger.Info("Cannot update IAMServiceAccount %s/%s as it does not exist", iamServiceAccount.Namespace, iamServiceAccount.Name)
nonExistingSAs = append(nonExistingSAs, fmt.Sprintf("%s/%s", iamServiceAccount.Namespace, iamServiceAccount.Name))
continue
Expand Down
4 changes: 2 additions & 2 deletions pkg/actions/iam/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("Update", func() {
Expect(err).NotTo(HaveOccurred())

Expect(fakeStackManager.ListStacksMatchingCallCount()).To(Equal(1))
Expect(fakeStackManager.ListStacksMatchingArgsForCall(0)).To(Equal("eksctl-my-cluster-addon-iamserviceaccount-default-test-sa"))
Expect(fakeStackManager.ListStacksMatchingArgsForCall(0)).To(Equal("eksctl-.*-addon-iamserviceaccount"))
Expect(fakeStackManager.UpdateStackCallCount()).To(Equal(1))
fakeStackManager.UpdateStackArgsForCall(0)
stackName, changeSetName, description, templateData, _ := fakeStackManager.UpdateStackArgsForCall(0)
Expand All @@ -82,7 +82,7 @@ var _ = Describe("Update", func() {
Expect(err).NotTo(HaveOccurred())

Expect(fakeStackManager.ListStacksMatchingCallCount()).To(Equal(1))
Expect(fakeStackManager.ListStacksMatchingArgsForCall(0)).To(Equal("eksctl-my-cluster-addon-iamserviceaccount-default-test-sa"))
Expect(fakeStackManager.ListStacksMatchingArgsForCall(0)).To(Equal("eksctl-.*-addon-iamserviceaccount"))
Expect(fakeStackManager.UpdateStackCallCount()).To(Equal(0))
})
})
Expand Down

0 comments on commit 8fc8dcb

Please sign in to comment.