Skip to content

Commit 5dc91f9

Browse files
committed
fix integration tests
1 parent 76a3c48 commit 5dc91f9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

pkg/actions/addon/tasks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ type deleteAddonIAMTask struct {
119119
func (t *deleteAddonIAMTask) Describe() string { return t.info }
120120

121121
func (t *deleteAddonIAMTask) Do(errorCh chan error) error {
122-
defer close(errorCh)
123-
124122
errMsg := fmt.Sprintf("deleting addon IAM %q", *t.stack.StackName)
125123
if t.wait {
126124
if err := t.stackManager.DeleteStackBySpecSync(t.ctx, t.stack, errorCh); err != nil {
127125
return fmt.Errorf("%s: %w", errMsg, err)
128126
}
129127
return nil
130128
}
129+
130+
defer close(errorCh)
131131
if _, err := t.stackManager.DeleteStackBySpec(t.ctx, t.stack); err != nil {
132132
return fmt.Errorf("%s: %w", errMsg, err)
133133
}

pkg/actions/irsa/create.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ func NewCreator(
4242
oidcManager *iamoidc.OpenIDConnectManager,
4343
stackManager StackManager) *Creator {
4444
return &Creator{
45+
clusterName: clusterName,
46+
region: region,
4547
clientSetGetter: clientSetGetter,
4648
oidcManager: oidcManager,
4749
stackManager: stackManager,

pkg/actions/irsa/tasks.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ type createIAMRoleForServiceAccountTask struct {
5757

5858
func (t *createIAMRoleForServiceAccountTask) Describe() string { return t.info }
5959
func (t *createIAMRoleForServiceAccountTask) Do(errs chan error) error {
60-
defer close(errs)
61-
6260
name := makeIAMServiceAccountStackName(t.clusterName, t.sa.Namespace, t.sa.Name)
6361
logger.Info("building iamserviceaccount stack %q", name)
6462
stack := builder.NewIAMRoleResourceSetForServiceAccount(t.sa, t.oidc)
@@ -115,15 +113,15 @@ type deleteIAMRoleForServiceAccountTask struct {
115113
func (t *deleteIAMRoleForServiceAccountTask) Describe() string { return t.info }
116114

117115
func (t *deleteIAMRoleForServiceAccountTask) Do(errorCh chan error) error {
118-
defer close(errorCh)
119-
120116
errMsg := fmt.Sprintf("deleting IAM role for serviceaccount %q", *t.stack.StackName)
121117
if t.wait {
122118
if err := t.stackManager.DeleteStackBySpecSync(t.ctx, t.stack, errorCh); err != nil {
123119
return fmt.Errorf("%s: %w", errMsg, err)
124120
}
125121
return nil
126122
}
123+
124+
defer close(errorCh)
127125
if _, err := t.stackManager.DeleteStackBySpec(t.ctx, t.stack); err != nil {
128126
return fmt.Errorf("%s: %w", errMsg, err)
129127
}

0 commit comments

Comments
 (0)