Skip to content

demo aws-sdk-go-v2 #4820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aclevername wants to merge 2 commits into from
Closed

demo aws-sdk-go-v2 #4820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40c429f
add aws-sdk-go-v2 interface and fakes generator
Feb 21, 2022
bcfd002
use v2 sdk in create addon
Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/aws/amazon-ec2-instance-selector/v2 v2.0.4-0.20220124212200-2aee60ac608e
github.com/aws/aws-sdk-go v1.42.44
github.com/aws/aws-sdk-go-v2/service/eks v1.18.0
github.com/benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
github.com/blang/semver v3.5.1+incompatible
github.com/bxcodec/faker v2.0.1+incompatible
Expand Down Expand Up @@ -115,18 +116,18 @@ require (
github.com/ashanbrown/forbidigo v1.3.0 // indirect
github.com/ashanbrown/makezero v1.1.0 // indirect
github.com/atc0005/go-teams-notify/v2 v2.6.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2 v1.13.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.2.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.11.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
github.com/aws/smithy-go v1.9.0 // indirect
github.com/aws/smithy-go v1.10.0 // indirect
github.com/awslabs/goformation/v4 v4.15.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
Expand Down
14 changes: 10 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,9 @@ github.com/aws/aws-sdk-go v1.42.44 h1:vPlF4cUsdN5ETfvb7ewZFbFZyB6Rsfndt3kS2XqLXK
github.com/aws/aws-sdk-go v1.42.44/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/aws/aws-sdk-go-v2 v1.9.0/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
github.com/aws/aws-sdk-go-v2 v1.11.2 h1:SDiCYqxdIYi6HgQfAWRhgdZrdnOuGyLDJVRSWLeHWvs=
github.com/aws/aws-sdk-go-v2 v1.11.2/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ=
github.com/aws/aws-sdk-go-v2 v1.13.0 h1:1XIXAfxsEmbhbj5ry3D3vX+6ZcUYvIqSm4CWWEuGZCA=
github.com/aws/aws-sdk-go-v2 v1.13.0/go.mod h1:L6+ZpqHaLbAaxsqV0L4cvxZY7QupWJB4fhkf8LXvC7w=
github.com/aws/aws-sdk-go-v2/config v1.7.0/go.mod h1:w9+nMZ7soXCe5nT46Ri354SNhXDQ6v+V5wqDjnZE+GY=
github.com/aws/aws-sdk-go-v2/config v1.11.0 h1:Czlld5zBB61A3/aoegA9/buZulwL9mHHfizh/Oq+Kqs=
github.com/aws/aws-sdk-go-v2/config v1.11.0/go.mod h1:VrQDJGFBM5yZe+IOeenNZ/DWoErdny+k2MHEIpwDsEY=
Expand All @@ -397,13 +398,17 @@ github.com/aws/aws-sdk-go-v2/credentials v1.6.4/go.mod h1:tTrhvBPHyPde4pdIPSba4N
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.0/go.mod h1:CpNzHK9VEFUCknu50kkB8z58AH2B5DvPP7ea1LHve/Y=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 h1:KiN5TPOLrEjbGCvdTQR4t0U4T87vVwALZ5Bg3jpMqPY=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2/go.mod h1:dF2F6tXEOgmW5X1ZFO/EPtWrcm7XkW07KNcJUGNtt4s=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2 h1:XJLnluKuUxQG255zPNe+04izXl7GSyUVafIsgfv9aw4=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2/go.mod h1:SgKKNBIoDC/E1ZCDhhMW3yalWjwuLjMcpLzsM/QQnWo=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2 h1:EauRoYZVNPlidZSZJDscjJBQ22JhVF2+tdteatax2Ak=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.4 h1:CRiQJ4E2RhfDdqbie1ZYDo8QtIo75Mk7oTdJSfwJTMQ=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.4/go.mod h1:XHgQ7Hz2WY2GAn//UXHofLfPXWh+s62MbMOijrg12Lw=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2/go.mod h1:xT4XX6w5Sa3dhg50JrYyy3e4WPYo/+WjY/BXtqXVunU=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.2.0 h1:3ADoioDMOtF4uiK59vCpplpCwugEU+v4ZFD29jDL3RQ=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.2.0/go.mod h1:BsCSJHx5DnDXIrOcqB8KN1/B+hXLG/bi4Y6Vjcx/x9E=
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2/go.mod h1:BQV0agm+JEhqR+2RT5e1XTFIDcAAV0eW6z2trp+iduw=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 h1:IQup8Q6lorXeiA/rK72PeToWoWK8h7VAPgHNWdSrtgE=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2/go.mod h1:VITe/MdW6EMXPb0o0txu/fsonXbMHUU2OC2Qp7ivU4o=
github.com/aws/aws-sdk-go-v2/service/eks v1.18.0 h1:FyVLY3I21tqUjvd2ngS83F9xnNh3B3SmhZJ2Zq0DS1s=
github.com/aws/aws-sdk-go-v2/service/eks v1.18.0/go.mod h1:4KcWMx7AdgysbHrjnd2ssJJXkrdHQV1P/vXtmbFsok4=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.0/go.mod h1:R1KK+vY8AfalhG1AOu5e35pOD2SdoPKQCFLTvnxiohk=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 h1:CKdUNKmuilw/KNmO2Q53Av8u+ZyXMC2M9aX8Z+c/gzg=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2/go.mod h1:FgR1tCsn8C6+Hf+N5qkfrE4IXvUL1RgW87sunJ+5J4I=
Expand All @@ -419,8 +424,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.7.0/go.mod h1:0qcSMCyASQPN2sk/1KQLQ2
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 h1:QKR7wy5e650q70PFKMfGF9sTo0rZgUevSSJ4wxmyWXk=
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1/go.mod h1:UV2N5HaPfdbDpkgkz4sRzWCvQswZjdO1FfqCWl0t7RA=
github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.9.0 h1:c7FUdEqrQA1/UVKKCNDFQPNKGp4FQg3YW4Ck5SLTG58=
github.com/aws/smithy-go v1.9.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.10.0 h1:gsoZQMNHnX+PaghNw4ynPsyGP7aUCqx5sY2dlPQsZ0w=
github.com/aws/smithy-go v1.10.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/awslabs/goformation/v4 v4.15.5 h1:q3lm7oj4yqqJ76ZcaFThUACT3MQLD6yBcJRKuZ6g87w=
github.com/awslabs/goformation/v4 v4.15.5/go.mod h1:wB5lKZf1J0MYH1Lt4B9w3opqz0uIjP7MMCAcib3QkwA=
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
Expand Down
27 changes: 23 additions & 4 deletions pkg/actions/addon/addon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ import (
"strings"
"time"

awseks "github.com/aws/aws-sdk-go/service/eks"
awseks "github.com/aws/aws-sdk-go-v2/service/eks"
"github.com/aws/aws-sdk-go-v2/service/eks/types"
"github.com/aws/aws-sdk-go/service/eks/eksiface"
"github.com/hashicorp/go-version"
"github.com/kris-nova/logger"
"github.com/pkg/errors"

"github.com/weaveworks/eksctl/pkg/aws"
"github.com/weaveworks/eksctl/pkg/cfn/waiter"
kubeclient "k8s.io/client-go/kubernetes"

Expand All @@ -28,13 +30,30 @@ import (
type Manager struct {
clusterConfig *api.ClusterConfig
eksAPI eksiface.EKSAPI
eksAPIv2 aws.EKS
withOIDC bool
oidcManager *iamoidc.OpenIDConnectManager
stackManager manager.StackManager
clientSet kubeclient.Interface
timeout time.Duration
}

func NewV2(clusterConfig *api.ClusterConfig, eksAPI aws.EKS, stackManager manager.StackManager, withOIDC bool, oidcManager *iamoidc.OpenIDConnectManager, clientSet kubeclient.Interface, timeout time.Duration) (*Manager, error) {
if err := supportedVersion(clusterConfig.Metadata.Version); err != nil {
return nil, err
}

return &Manager{
clusterConfig: clusterConfig,
eksAPIv2: eksAPI,
withOIDC: withOIDC,
oidcManager: oidcManager,
stackManager: stackManager,
clientSet: clientSet,
timeout: timeout,
}, nil
}

func New(clusterConfig *api.ClusterConfig, eksAPI eksiface.EKSAPI, stackManager manager.StackManager, withOIDC bool, oidcManager *iamoidc.OpenIDConnectManager, clientSet kubeclient.Interface, timeout time.Duration) (*Manager, error) {
if err := supportedVersion(clusterConfig.Metadata.Version); err != nil {
return nil, err
Expand All @@ -55,14 +74,14 @@ func (a *Manager) waitForAddonToBeActive(addon *api.Addon) error {
var out *awseks.DescribeAddonOutput
operation := func() (bool, error) {
var err error
out, err = a.eksAPI.DescribeAddon(&awseks.DescribeAddonInput{
out, err = a.eksAPIv2.DescribeAddon(context.TODO(), &awseks.DescribeAddonInput{
ClusterName: &a.clusterConfig.Metadata.Name,
AddonName: &addon.Name,
})
if err != nil {
return false, err
}
if *out.Addon.Status == awseks.AddonStatusActive {
if string(out.Addon.Status) == string(types.AddonStatusActive) {
return true, nil
}
return false, nil
Expand All @@ -78,7 +97,7 @@ func (a *Manager) waitForAddonToBeActive(addon *api.Addon) error {
err := w.WaitWithTimeout(a.timeout)
if err != nil {
if err == context.DeadlineExceeded {
return errors.Errorf("timed out waiting for addon %q to become active, status: %q", addon.Name, *out.Addon.Status)
return errors.Errorf("timed out waiting for addon %q to become active, status: %q", addon.Name, string(out.Addon.Status))
}
return err
}
Expand Down
15 changes: 7 additions & 8 deletions pkg/actions/addon/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ import (
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"

"github.com/aws/aws-sdk-go/aws"

"github.com/aws/aws-sdk-go/service/eks"
"github.com/aws/aws-sdk-go-v2/service/eks"
"github.com/kris-nova/logger"

"k8s.io/apimachinery/pkg/types"
ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"

api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
"github.com/weaveworks/eksctl/pkg/cfn/builder"
Expand Down Expand Up @@ -44,7 +43,7 @@ func (a *Manager) Create(addon *api.Addon, wait bool) error {
}

if addon.Force {
createAddonInput.ResolveConflicts = aws.String("overwrite")
createAddonInput.ResolveConflicts = ekstypes.ResolveConflicts("overwrite")
logger.Debug("setting resolve conflicts to overwrite")
} else {
addonName := strings.ToLower(addon.Name)
Expand All @@ -57,7 +56,7 @@ func (a *Manager) Create(addon *api.Addon, wait bool) error {
namespace, serviceAccount := a.getKnownServiceAccountLocation(addon)

if len(addon.Tags) > 0 {
createAddonInput.Tags = aws.StringMap(addon.Tags)
createAddonInput.Tags = addon.Tags
}
if a.withOIDC {
if addon.ServiceAccountRoleARN != "" {
Expand Down Expand Up @@ -117,13 +116,13 @@ func (a *Manager) Create(addon *api.Addon, wait bool) error {
}

logger.Info("creating addon")
output, err := a.eksAPI.CreateAddon(createAddonInput)
output, err := a.eksAPIv2.CreateAddon(context.TODO(), createAddonInput)
if err != nil {
return errors.Wrapf(err, "failed to create addon %q", addon.Name)
}

if output != nil {
logger.Debug("EKS Create Addon output: %s", output.String())
logger.Debug("EKS Create Addon output: %v", output.Addon)
}

if wait {
Expand Down
71 changes: 36 additions & 35 deletions pkg/actions/addon/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,30 @@ import (

"github.com/stretchr/testify/mock"

awseks "github.com/aws/aws-sdk-go-v2/service/eks"
"github.com/aws/aws-sdk-go-v2/service/eks/types"
"github.com/aws/aws-sdk-go/aws"
awseks "github.com/aws/aws-sdk-go/service/eks"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/weaveworks/eksctl/pkg/actions/addon"
api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
"github.com/weaveworks/eksctl/pkg/cfn/manager/fakes"
awsfakes "github.com/weaveworks/eksctl/pkg/fakes"
iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc"
"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
)

var _ = Describe("Create", func() {
var _ = FDescribe("Create", func() {
var (
manager *addon.Manager
withOIDC bool
oidc *iamoidc.OpenIDConnectManager
fakeStackManager *fakes.FakeStackManager
mockProvider *mockprovider.MockProvider
createAddonInput *awseks.CreateAddonInput
returnedErr error
createStackReturnValue error
rawClient *testutils.FakeRawClient
clusterConfig *api.ClusterConfig
fakeEKS awsfakes.EKS
)

BeforeEach(func() {
Expand All @@ -43,7 +44,6 @@ var _ = Describe("Create", func() {
withOIDC = true
returnedErr = nil
fakeStackManager = new(fakes.FakeStackManager)
mockProvider = mockprovider.NewMockProvider()
createStackReturnValue = nil

fakeStackManager.CreateStackStub = func(_ string, rs builder.ResourceSet, _ map[string]string, _ map[string]string, errs chan error) error {
Expand Down Expand Up @@ -80,25 +80,25 @@ var _ = Describe("Create", func() {
Expect(err).NotTo(HaveOccurred())
oidc.ProviderARN = "arn:aws:iam::456123987123:oidc-provider/oidc.eks.us-west-2.amazonaws.com/id/A39A2842863C47208955D753DE205E6E"

mockProvider.MockEKS().On("CreateAddon", mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(1))
Expect(args[0]).To(BeAssignableToTypeOf(&awseks.CreateAddonInput{}))
createAddonInput = args[0].(*awseks.CreateAddonInput)
fakeEKS.On("CreateAddon", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(2))
Expect(args[1]).To(BeAssignableToTypeOf(&awseks.CreateAddonInput{}))
createAddonInput = args[1].(*awseks.CreateAddonInput)
}).Return(nil, returnedErr)

manager, err = addon.New(clusterConfig, mockProvider.EKS(), fakeStackManager, withOIDC, oidc, rawClient.ClientSet(), 5*time.Minute)
manager, err = addon.NewV2(clusterConfig, &fakeEKS, fakeStackManager, withOIDC, oidc, rawClient.ClientSet(), 5*time.Minute)
Expect(err).NotTo(HaveOccurred())
manager.SetTimeout(time.Second)

mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(1))
Expect(args[0]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
fakeEKS.On("DescribeAddonVersions", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(2))
Expect(args[1]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
}).Return(&awseks.DescribeAddonVersionsOutput{
Addons: []*awseks.AddonInfo{
Addons: []types.AddonInfo{
{
AddonName: aws.String("my-addon"),
Type: aws.String("type"),
AddonVersions: []*awseks.AddonVersionInfo{
AddonVersions: []types.AddonVersionInfo{
{
AddonVersion: aws.String("v1.0.0-eksbuild.1"),
},
Expand Down Expand Up @@ -139,7 +139,8 @@ var _ = Describe("Create", func() {
BeforeEach(func() {
withOIDC = false
})
It("creates the addons but not the policies", func() {

FIt("creates the addons but not the policies", func() {
err := manager.Create(&api.Addon{
Name: "my-addon",
Version: "v1.0.0-eksbuild.1",
Expand Down Expand Up @@ -229,15 +230,15 @@ var _ = Describe("Create", func() {
BeforeEach(func() {
withOIDC = false

mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(1))
Expect(args[0]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
fakeEKS.On("DescribeAddonVersions", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(2))
Expect(args[1]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
}).Return(&awseks.DescribeAddonVersionsOutput{
Addons: []*awseks.AddonInfo{
Addons: []types.AddonInfo{
{
AddonName: aws.String("my-addon"),
Type: aws.String("type"),
AddonVersions: []*awseks.AddonVersionInfo{
AddonVersions: []types.AddonVersionInfo{
{
AddonVersion: aws.String("v1.7.5-eksbuild.1"),
},
Expand Down Expand Up @@ -268,15 +269,15 @@ var _ = Describe("Create", func() {
BeforeEach(func() {
withOIDC = false

mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(1))
Expect(args[0]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
fakeEKS.On("DescribeAddonVersions", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
Expect(args).To(HaveLen(2))
Expect(args[1]).To(BeAssignableToTypeOf(&awseks.DescribeAddonVersionsInput{}))
}).Return(&awseks.DescribeAddonVersionsOutput{
Addons: []*awseks.AddonInfo{
Addons: []types.AddonInfo{
{
AddonName: aws.String("my-addon"),
Type: aws.String("type"),
AddonVersions: []*awseks.AddonVersionInfo{},
AddonVersions: []types.AddonVersionInfo{},
},
},
}, nil)
Expand Down Expand Up @@ -311,7 +312,7 @@ var _ = Describe("Create", func() {
Expect(*createAddonInput.ClusterName).To(Equal("my-cluster"))
Expect(*createAddonInput.AddonName).To(Equal("my-addon"))
Expect(*createAddonInput.AddonVersion).To(Equal("v1.0.0-eksbuild.1"))
Expect(*createAddonInput.ResolveConflicts).To(Equal("overwrite"))
Expect(createAddonInput.ResolveConflicts).To(Equal(types.ResolveConflicts("overwrite")))
Expect(createAddonInput.ServiceAccountRoleArn).To(BeNil())
})
})
Expand All @@ -320,11 +321,11 @@ var _ = Describe("Create", func() {
When("the addon creation succeeds", func() {
BeforeEach(func() {
withOIDC = false
mockProvider.MockEKS().On("DescribeAddon", mock.Anything).
fakeEKS.On("DescribeAddon", mock.Anything, mock.Anything).
Return(&awseks.DescribeAddonOutput{
Addon: &awseks.Addon{
Addon: &types.Addon{
AddonName: aws.String("my-addon"),
Status: aws.String("ACTIVE"),
Status: types.AddonStatus("ACTIVE"),
},
}, nil)
})
Expand All @@ -346,11 +347,11 @@ var _ = Describe("Create", func() {
When("the addon creation fails", func() {
BeforeEach(func() {
withOIDC = false
mockProvider.MockEKS().On("DescribeAddon", mock.Anything).
fakeEKS.On("DescribeAddon", mock.Anything, mock.Anything).
Return(&awseks.DescribeAddonOutput{
Addon: &awseks.Addon{
Addon: &types.Addon{
AddonName: aws.String("my-addon"),
Status: aws.String("DEGRADED"),
Status: types.AddonStatus("DEGRADED"),
},
}, nil)
})
Expand Down Expand Up @@ -579,8 +580,8 @@ var _ = Describe("Create", func() {
Expect(*createAddonInput.ClusterName).To(Equal("my-cluster"))
Expect(*createAddonInput.AddonName).To(Equal("my-addon"))
Expect(*createAddonInput.AddonVersion).To(Equal("v1.0.0-eksbuild.1"))
Expect(*createAddonInput.Tags["foo"]).To(Equal("bar"))
Expect(*createAddonInput.Tags["fox"]).To(Equal("brown"))
Expect(createAddonInput.Tags["foo"]).To(Equal("bar"))
Expect(createAddonInput.Tags["fox"]).To(Equal("brown"))
})
})
})
Loading