From ec916ba2fc42622441f8332f664c1961b459634a Mon Sep 17 00:00:00 2001 From: Jake Date: Mon, 25 Jan 2021 14:52:34 +0000 Subject: [PATCH] iam -> irsa package name --- pkg/actions/{iam => irsa}/create.go | 2 +- pkg/actions/{iam => irsa}/delete.go | 2 +- .../{iam => irsa}/fakes/fake_stack_manager.go | 4 ++-- pkg/actions/{iam => irsa}/get.go | 2 +- pkg/actions/{iam => irsa}/get_test.go | 18 +++++++++--------- pkg/actions/{iam/iam.go => irsa/irsa.go} | 2 +- .../irsa_suite_test.go} | 6 +++--- pkg/actions/{iam => irsa}/tasks.go | 2 +- pkg/actions/{iam => irsa}/update.go | 2 +- pkg/actions/{iam => irsa}/update_test.go | 14 +++++++------- pkg/addons/irsa_helper.go | 12 ++++++------ pkg/ctl/create/iamserviceaccount.go | 4 ++-- pkg/ctl/delete/iamserviceaccount.go | 6 +++--- pkg/ctl/get/iamserviceaccount.go | 6 +++--- pkg/ctl/update/iamserviceaccount.go | 4 ++-- pkg/eks/tasks.go | 6 +++--- 16 files changed, 46 insertions(+), 46 deletions(-) rename pkg/actions/{iam => irsa}/create.go (97%) rename pkg/actions/{iam => irsa}/delete.go (98%) rename pkg/actions/{iam => irsa}/fakes/fake_stack_manager.go (99%) rename pkg/actions/{iam => irsa}/get.go (98%) rename pkg/actions/{iam => irsa}/get_test.go (89%) rename pkg/actions/{iam/iam.go => irsa/irsa.go} (99%) rename pkg/actions/{iam/iam_suite_test.go => irsa/irsa_suite_test.go} (59%) rename pkg/actions/{iam => irsa}/tasks.go (99%) rename pkg/actions/{iam => irsa}/update.go (99%) rename pkg/actions/{iam => irsa}/update_test.go (88%) diff --git a/pkg/actions/iam/create.go b/pkg/actions/irsa/create.go similarity index 97% rename from pkg/actions/iam/create.go rename to pkg/actions/irsa/create.go index 8b80b93d80..19ca09cbe5 100644 --- a/pkg/actions/iam/create.go +++ b/pkg/actions/irsa/create.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" diff --git a/pkg/actions/iam/delete.go b/pkg/actions/irsa/delete.go similarity index 98% rename from pkg/actions/iam/delete.go rename to pkg/actions/irsa/delete.go index 4c823fb525..1e56f42965 100644 --- a/pkg/actions/iam/delete.go +++ b/pkg/actions/irsa/delete.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( "fmt" diff --git a/pkg/actions/iam/fakes/fake_stack_manager.go b/pkg/actions/irsa/fakes/fake_stack_manager.go similarity index 99% rename from pkg/actions/iam/fakes/fake_stack_manager.go rename to pkg/actions/irsa/fakes/fake_stack_manager.go index 73168f6208..363b62200c 100644 --- a/pkg/actions/iam/fakes/fake_stack_manager.go +++ b/pkg/actions/irsa/fakes/fake_stack_manager.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/manager" iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc" @@ -439,4 +439,4 @@ func (fake *FakeStackManager) recordInvocation(key string, args []interface{}) { fake.invocations[key] = append(fake.invocations[key], args) } -var _ iam.StackManager = new(FakeStackManager) +var _ irsa.StackManager = new(FakeStackManager) diff --git a/pkg/actions/iam/get.go b/pkg/actions/irsa/get.go similarity index 98% rename from pkg/actions/iam/get.go rename to pkg/actions/irsa/get.go index 9a6d996952..55c0c9b1a3 100644 --- a/pkg/actions/iam/get.go +++ b/pkg/actions/irsa/get.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( "github.com/pkg/errors" diff --git a/pkg/actions/iam/get_test.go b/pkg/actions/irsa/get_test.go similarity index 89% rename from pkg/actions/iam/get_test.go rename to pkg/actions/irsa/get_test.go index fcfe9d3808..97021d1eaa 100644 --- a/pkg/actions/iam/get_test.go +++ b/pkg/actions/irsa/get_test.go @@ -1,25 +1,25 @@ -package iam_test +package irsa_test import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/weaveworks/eksctl/pkg/actions/iam" - "github.com/weaveworks/eksctl/pkg/actions/iam/fakes" + "github.com/weaveworks/eksctl/pkg/actions/irsa" + "github.com/weaveworks/eksctl/pkg/actions/irsa/fakes" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" ) var _ = Describe("Get", func() { var ( - iamManager *iam.Manager + irsaManager *irsa.Manager fakeStackManager *fakes.FakeStackManager ) BeforeEach(func() { fakeStackManager = new(fakes.FakeStackManager) - iamManager = iam.New("my-cluster", fakeStackManager, nil, nil) + irsaManager = irsa.New("my-cluster", fakeStackManager, nil, nil) }) When("no options are specified", func() { @@ -41,7 +41,7 @@ var _ = Describe("Get", func() { }, }, nil) - serviceAccounts, err := iamManager.Get("", "") + serviceAccounts, err := irsaManager.Get("", "") Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1)) @@ -83,7 +83,7 @@ var _ = Describe("Get", func() { }, }, nil) - serviceAccounts, err := iamManager.Get("", "test-sa") + serviceAccounts, err := irsaManager.Get("", "test-sa") Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1)) @@ -118,7 +118,7 @@ var _ = Describe("Get", func() { }, }, nil) - serviceAccounts, err := iamManager.Get("not-default", "") + serviceAccounts, err := irsaManager.Get("not-default", "") Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1)) @@ -153,7 +153,7 @@ var _ = Describe("Get", func() { }, }, nil) - serviceAccounts, err := iamManager.Get("default", "test-sa") + serviceAccounts, err := irsaManager.Get("default", "test-sa") Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1)) diff --git a/pkg/actions/iam/iam.go b/pkg/actions/irsa/irsa.go similarity index 99% rename from pkg/actions/iam/iam.go rename to pkg/actions/irsa/irsa.go index 1df0b9f072..2f5f5737cf 100644 --- a/pkg/actions/iam/iam.go +++ b/pkg/actions/irsa/irsa.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( "fmt" diff --git a/pkg/actions/iam/iam_suite_test.go b/pkg/actions/irsa/irsa_suite_test.go similarity index 59% rename from pkg/actions/iam/iam_suite_test.go rename to pkg/actions/irsa/irsa_suite_test.go index b1a0bd6864..012ee11253 100644 --- a/pkg/actions/iam/iam_suite_test.go +++ b/pkg/actions/irsa/irsa_suite_test.go @@ -1,4 +1,4 @@ -package iam_test +package irsa_test import ( "testing" @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" ) -func TestIam(t *testing.T) { +func TestIRSA(t *testing.T) { RegisterFailHandler(Fail) - RunSpecs(t, "Iam Suite") + RunSpecs(t, "IRSA Suite") } diff --git a/pkg/actions/iam/tasks.go b/pkg/actions/irsa/tasks.go similarity index 99% rename from pkg/actions/iam/tasks.go rename to pkg/actions/irsa/tasks.go index ee771a36e4..64b30cf70a 100644 --- a/pkg/actions/iam/tasks.go +++ b/pkg/actions/irsa/tasks.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( "fmt" diff --git a/pkg/actions/iam/update.go b/pkg/actions/irsa/update.go similarity index 99% rename from pkg/actions/iam/update.go rename to pkg/actions/irsa/update.go index 73c93a3b0f..0df545b706 100644 --- a/pkg/actions/iam/update.go +++ b/pkg/actions/irsa/update.go @@ -1,4 +1,4 @@ -package iam +package irsa import ( "fmt" diff --git a/pkg/actions/iam/update_test.go b/pkg/actions/irsa/update_test.go similarity index 88% rename from pkg/actions/iam/update_test.go rename to pkg/actions/irsa/update_test.go index 97e7f5c192..dd3566c33c 100644 --- a/pkg/actions/iam/update_test.go +++ b/pkg/actions/irsa/update_test.go @@ -1,4 +1,4 @@ -package iam_test +package irsa_test import ( "github.com/aws/aws-sdk-go/aws" @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" "github.com/weaveworks/eksctl/pkg/cfn/manager" - "github.com/weaveworks/eksctl/pkg/actions/iam" - "github.com/weaveworks/eksctl/pkg/actions/iam/fakes" + "github.com/weaveworks/eksctl/pkg/actions/irsa" + "github.com/weaveworks/eksctl/pkg/actions/irsa/fakes" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" iamoidc "github.com/weaveworks/eksctl/pkg/iam/oidc" ) @@ -16,7 +16,7 @@ import ( var _ = Describe("Update", func() { var ( - iamManager *iam.Manager + irsaManager *irsa.Manager oidc *iamoidc.OpenIDConnectManager fakeStackManager *fakes.FakeStackManager serviceAccount []*api.ClusterIAMServiceAccount @@ -39,7 +39,7 @@ var _ = Describe("Update", func() { oidc, err = iamoidc.NewOpenIDConnectManager(nil, "456123987123", "https://oidc.eks.us-west-2.amazonaws.com/id/A39A2842863C47208955D753DE205E6E", "aws") Expect(err).ToNot(HaveOccurred()) oidc.ProviderARN = "arn:aws:iam::456123987123:oidc-provider/oidc.eks.us-west-2.amazonaws.com/id/A39A2842863C47208955D753DE205E6E" - iamManager = iam.New("my-cluster", fakeStackManager, oidc, nil) + irsaManager = irsa.New("my-cluster", fakeStackManager, oidc, nil) }) When("the IAMServiceAccount exists", func() { @@ -50,7 +50,7 @@ var _ = Describe("Update", func() { }, }, nil) - err := iamManager.UpdateIAMServiceAccounts(serviceAccount, false) + err := irsaManager.UpdateIAMServiceAccounts(serviceAccount, false) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.ListStacksMatchingCallCount()).To(Equal(1)) @@ -74,7 +74,7 @@ var _ = Describe("Update", func() { }, }, nil) - err := iamManager.UpdateIAMServiceAccounts(serviceAccount, true) + err := irsaManager.UpdateIAMServiceAccounts(serviceAccount, true) Expect(err).NotTo(HaveOccurred()) Expect(fakeStackManager.ListStacksMatchingCallCount()).To(Equal(1)) diff --git a/pkg/addons/irsa_helper.go b/pkg/addons/irsa_helper.go index e712742807..da3e71e54e 100644 --- a/pkg/addons/irsa_helper.go +++ b/pkg/addons/irsa_helper.go @@ -3,7 +3,7 @@ package addons import ( "fmt" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" "github.com/weaveworks/eksctl/pkg/cfn/manager" @@ -21,17 +21,17 @@ type IRSAHelper interface { // irsaHelper applies the annotations required for a ServiceAccount to work with IRSA type irsaHelper struct { oidc *iamoidc.OpenIDConnectManager - iamManager *iam.Manager + irsaManager *irsa.Manager stackManager *manager.StackCollection clusterName string } // NewIRSAHelper creates a new IRSAHelper -func NewIRSAHelper(oidc *iamoidc.OpenIDConnectManager, stackManager *manager.StackCollection, iamManager *iam.Manager, clusterName string) IRSAHelper { +func NewIRSAHelper(oidc *iamoidc.OpenIDConnectManager, stackManager *manager.StackCollection, irsaManager *irsa.Manager, clusterName string) IRSAHelper { return &irsaHelper{ oidc: oidc, stackManager: stackManager, - iamManager: iamManager, + irsaManager: irsaManager, clusterName: clusterName, } } @@ -53,9 +53,9 @@ func (h *irsaHelper) CreateOrUpdate(sa *api.ClusterIAMServiceAccount) error { return errors.Wrapf(err, "error checking if iamserviceaccount %s/%s exists", sa.Namespace, sa.Name) } if len(stacks) == 0 { - err = h.iamManager.CreateIAMServiceAccount(serviceAccounts, false) + err = h.irsaManager.CreateIAMServiceAccount(serviceAccounts, false) } else { - err = h.iamManager.UpdateIAMServiceAccounts(serviceAccounts, false) + err = h.irsaManager.UpdateIAMServiceAccounts(serviceAccounts, false) } return err } diff --git a/pkg/ctl/create/iamserviceaccount.go b/pkg/ctl/create/iamserviceaccount.go index 08e7e3c681..52813b56c6 100644 --- a/pkg/ctl/create/iamserviceaccount.go +++ b/pkg/ctl/create/iamserviceaccount.go @@ -3,7 +3,7 @@ package create import ( "errors" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" "github.com/kris-nova/logger" "github.com/spf13/cobra" @@ -124,5 +124,5 @@ func doCreateIAMServiceAccount(cmd *cmdutils.Cmd, overrideExistingServiceAccount return err } - return iam.New(cfg.Metadata.Name, stackManager, oidc, clientSet).CreateIAMServiceAccount(filteredServiceAccounts, cmd.Plan) + return irsa.New(cfg.Metadata.Name, stackManager, oidc, clientSet).CreateIAMServiceAccount(filteredServiceAccounts, cmd.Plan) } diff --git a/pkg/ctl/delete/iamserviceaccount.go b/pkg/ctl/delete/iamserviceaccount.go index a92cc4ab2d..b99161f0fc 100644 --- a/pkg/ctl/delete/iamserviceaccount.go +++ b/pkg/ctl/delete/iamserviceaccount.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils/filter" @@ -116,10 +116,10 @@ func doDeleteIAMServiceAccount(cmd *cmdutils.Cmd, serviceAccount *api.ClusterIAM saSubset, _ := saFilter.MatchAll(cfg.IAM.ServiceAccounts) - iamServiceAccountManager := iam.New(cfg.Metadata.Name, stackManager, oidc, clientSet) + irsaManager := irsa.New(cfg.Metadata.Name, stackManager, oidc, clientSet) if err := printer.LogObj(logger.Debug, "cfg.json = \\\n%s\n", cfg); err != nil { return err } - return iamServiceAccountManager.Delete(saSubset.Has, cmd.Plan, cmd.Wait) + return irsaManager.Delete(saSubset.Has, cmd.Plan, cmd.Wait) } diff --git a/pkg/ctl/get/iamserviceaccount.go b/pkg/ctl/get/iamserviceaccount.go index 9e53dd02c2..293466965c 100644 --- a/pkg/ctl/get/iamserviceaccount.go +++ b/pkg/ctl/get/iamserviceaccount.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/ctl/cmdutils" @@ -69,8 +69,8 @@ func doGetIAMServiceAccount(cmd *cmdutils.Cmd, namespace, name string, params *g } stackManager := ctl.NewStackManager(cfg) - iamServiceAccountManager := iam.New(cfg.Metadata.Name, stackManager, nil, nil) - serviceAccounts, err := iamServiceAccountManager.Get(namespace, name) + irsaManager := irsa.New(cfg.Metadata.Name, stackManager, nil, nil) + serviceAccounts, err := irsaManager.Get(namespace, name) if err != nil { return err diff --git a/pkg/ctl/update/iamserviceaccount.go b/pkg/ctl/update/iamserviceaccount.go index 139d861ab7..0e5632ae04 100644 --- a/pkg/ctl/update/iamserviceaccount.go +++ b/pkg/ctl/update/iamserviceaccount.go @@ -3,7 +3,7 @@ package update import ( "errors" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" "github.com/kris-nova/logger" "github.com/spf13/cobra" @@ -105,5 +105,5 @@ func doUpdateIAMServiceAccount(cmd *cmdutils.Cmd) error { return err } - return iam.New(cfg.Metadata.Name, stackManager, oidc, clientSet).UpdateIAMServiceAccounts(cfg.IAM.ServiceAccounts, cmd.Plan) + return irsa.New(cfg.Metadata.Name, stackManager, oidc, clientSet).UpdateIAMServiceAccounts(cfg.IAM.ServiceAccounts, cmd.Plan) } diff --git a/pkg/eks/tasks.go b/pkg/eks/tasks.go index 51d93cc773..5bbe507a10 100644 --- a/pkg/eks/tasks.go +++ b/pkg/eks/tasks.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/weaveworks/eksctl/pkg/actions/iam" + "github.com/weaveworks/eksctl/pkg/actions/irsa" "github.com/kris-nova/logger" "github.com/pkg/errors" @@ -68,8 +68,8 @@ func (v *VPCControllerTask) Do(errCh chan error) error { if err != nil { return err } - iamManager := iam.New(v.ClusterConfig.Metadata.Name, stackCollection, oidc, clientSet) - irsa := addons.NewIRSAHelper(oidc, stackCollection, iamManager, v.ClusterConfig.Metadata.Name) + irsaManager := irsa.New(v.ClusterConfig.Metadata.Name, stackCollection, oidc, clientSet) + irsa := addons.NewIRSAHelper(oidc, stackCollection, irsaManager, v.ClusterConfig.Metadata.Name) // TODO PlanMode doesn't work as intended vpcController := addons.NewVPCController(rawClient, irsa, v.ClusterConfig.Status, v.ClusterProvider.Provider.Region(), v.PlanMode)