From 0d870a914670fecf57ca01d30fc4d80eb674d54b Mon Sep 17 00:00:00 2001 From: Mikhail Berezovskiy Date: Thu, 23 Nov 2023 12:17:45 -0800 Subject: [PATCH] move controllers into pkg --- Makefile | 2 +- cmd/aws-application-networking-k8s/main.go | 2 +- {controllers => pkg/controllers}/accesslogpolicy_controller.go | 0 {controllers => pkg/controllers}/errors.go | 0 {controllers => pkg/controllers}/eventhandlers/gateway.go | 0 {controllers => pkg/controllers}/eventhandlers/gatewayclass.go | 0 {controllers => pkg/controllers}/eventhandlers/mapper.go | 0 {controllers => pkg/controllers}/eventhandlers/mapper_test.go | 0 {controllers => pkg/controllers}/eventhandlers/policy.go | 0 {controllers => pkg/controllers}/eventhandlers/policy_test.go | 0 {controllers => pkg/controllers}/eventhandlers/service.go | 0 {controllers => pkg/controllers}/eventhandlers/service_test.go | 0 {controllers => pkg/controllers}/eventhandlers/serviceimport.go | 0 .../controllers}/eventhandlers/serviceimport_test.go | 0 .../controllers}/eventhandlers/vpc_association_policy.go | 0 {controllers => pkg/controllers}/gateway_controller.go | 2 +- {controllers => pkg/controllers}/gatewayclass_controller.go | 0 {controllers => pkg/controllers}/iamauthpolicy_controller.go | 0 .../controllers}/iamauthpolicy_controller_test.go | 0 {controllers => pkg/controllers}/pod_controller.go | 0 {controllers => pkg/controllers}/route_controller.go | 2 +- {controllers => pkg/controllers}/route_controller_test.go | 0 {controllers => pkg/controllers}/service_controller.go | 0 {controllers => pkg/controllers}/serviceexport_controller.go | 2 +- {controllers => pkg/controllers}/serviceimport_controller.go | 0 {controllers => pkg/controllers}/suite_test.go | 0 .../controllers}/targetgrouppolicy_controller.go | 0 .../controllers}/vpcassociationpolicy_controller.go | 2 +- test/pkg/test/framework.go | 2 +- test/suites/integration/iamauthpolicy_test.go | 2 +- 30 files changed, 8 insertions(+), 8 deletions(-) rename {controllers => pkg/controllers}/accesslogpolicy_controller.go (100%) rename {controllers => pkg/controllers}/errors.go (100%) rename {controllers => pkg/controllers}/eventhandlers/gateway.go (100%) rename {controllers => pkg/controllers}/eventhandlers/gatewayclass.go (100%) rename {controllers => pkg/controllers}/eventhandlers/mapper.go (100%) rename {controllers => pkg/controllers}/eventhandlers/mapper_test.go (100%) rename {controllers => pkg/controllers}/eventhandlers/policy.go (100%) rename {controllers => pkg/controllers}/eventhandlers/policy_test.go (100%) rename {controllers => pkg/controllers}/eventhandlers/service.go (100%) rename {controllers => pkg/controllers}/eventhandlers/service_test.go (100%) rename {controllers => pkg/controllers}/eventhandlers/serviceimport.go (100%) rename {controllers => pkg/controllers}/eventhandlers/serviceimport_test.go (100%) rename {controllers => pkg/controllers}/eventhandlers/vpc_association_policy.go (100%) rename {controllers => pkg/controllers}/gateway_controller.go (99%) rename {controllers => pkg/controllers}/gatewayclass_controller.go (100%) rename {controllers => pkg/controllers}/iamauthpolicy_controller.go (100%) rename {controllers => pkg/controllers}/iamauthpolicy_controller_test.go (100%) rename {controllers => pkg/controllers}/pod_controller.go (100%) rename {controllers => pkg/controllers}/route_controller.go (99%) rename {controllers => pkg/controllers}/route_controller_test.go (100%) rename {controllers => pkg/controllers}/service_controller.go (100%) rename {controllers => pkg/controllers}/serviceexport_controller.go (98%) rename {controllers => pkg/controllers}/serviceimport_controller.go (100%) rename {controllers => pkg/controllers}/suite_test.go (100%) rename {controllers => pkg/controllers}/targetgrouppolicy_controller.go (100%) rename {controllers => pkg/controllers}/vpcassociationpolicy_controller.go (98%) diff --git a/Makefile b/Makefile index 41e98970..1356d7a4 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ vet: ## Vet the code and dependencies .PHONY: test test: ## Run tests. - go test ./pkg/... ./controllers/... -coverprofile coverage.out + go test ./pkg/... -coverprofile coverage.out .PHONY: toolchain toolchain: ## Install developer toolchain diff --git a/cmd/aws-application-networking-k8s/main.go b/cmd/aws-application-networking-k8s/main.go index 01abd1b6..cac8000d 100644 --- a/cmd/aws-application-networking-k8s/main.go +++ b/cmd/aws-application-networking-k8s/main.go @@ -42,7 +42,7 @@ import ( gateway_api_v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gateway_api_v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/aws/aws-application-networking-k8s/controllers" + "github.com/aws/aws-application-networking-k8s/pkg/controllers" //+kubebuilder:scaffold:imports anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" diff --git a/controllers/accesslogpolicy_controller.go b/pkg/controllers/accesslogpolicy_controller.go similarity index 100% rename from controllers/accesslogpolicy_controller.go rename to pkg/controllers/accesslogpolicy_controller.go diff --git a/controllers/errors.go b/pkg/controllers/errors.go similarity index 100% rename from controllers/errors.go rename to pkg/controllers/errors.go diff --git a/controllers/eventhandlers/gateway.go b/pkg/controllers/eventhandlers/gateway.go similarity index 100% rename from controllers/eventhandlers/gateway.go rename to pkg/controllers/eventhandlers/gateway.go diff --git a/controllers/eventhandlers/gatewayclass.go b/pkg/controllers/eventhandlers/gatewayclass.go similarity index 100% rename from controllers/eventhandlers/gatewayclass.go rename to pkg/controllers/eventhandlers/gatewayclass.go diff --git a/controllers/eventhandlers/mapper.go b/pkg/controllers/eventhandlers/mapper.go similarity index 100% rename from controllers/eventhandlers/mapper.go rename to pkg/controllers/eventhandlers/mapper.go diff --git a/controllers/eventhandlers/mapper_test.go b/pkg/controllers/eventhandlers/mapper_test.go similarity index 100% rename from controllers/eventhandlers/mapper_test.go rename to pkg/controllers/eventhandlers/mapper_test.go diff --git a/controllers/eventhandlers/policy.go b/pkg/controllers/eventhandlers/policy.go similarity index 100% rename from controllers/eventhandlers/policy.go rename to pkg/controllers/eventhandlers/policy.go diff --git a/controllers/eventhandlers/policy_test.go b/pkg/controllers/eventhandlers/policy_test.go similarity index 100% rename from controllers/eventhandlers/policy_test.go rename to pkg/controllers/eventhandlers/policy_test.go diff --git a/controllers/eventhandlers/service.go b/pkg/controllers/eventhandlers/service.go similarity index 100% rename from controllers/eventhandlers/service.go rename to pkg/controllers/eventhandlers/service.go diff --git a/controllers/eventhandlers/service_test.go b/pkg/controllers/eventhandlers/service_test.go similarity index 100% rename from controllers/eventhandlers/service_test.go rename to pkg/controllers/eventhandlers/service_test.go diff --git a/controllers/eventhandlers/serviceimport.go b/pkg/controllers/eventhandlers/serviceimport.go similarity index 100% rename from controllers/eventhandlers/serviceimport.go rename to pkg/controllers/eventhandlers/serviceimport.go diff --git a/controllers/eventhandlers/serviceimport_test.go b/pkg/controllers/eventhandlers/serviceimport_test.go similarity index 100% rename from controllers/eventhandlers/serviceimport_test.go rename to pkg/controllers/eventhandlers/serviceimport_test.go diff --git a/controllers/eventhandlers/vpc_association_policy.go b/pkg/controllers/eventhandlers/vpc_association_policy.go similarity index 100% rename from controllers/eventhandlers/vpc_association_policy.go rename to pkg/controllers/eventhandlers/vpc_association_policy.go diff --git a/controllers/gateway_controller.go b/pkg/controllers/gateway_controller.go similarity index 99% rename from controllers/gateway_controller.go rename to pkg/controllers/gateway_controller.go index a0176da3..505d5e3e 100644 --- a/controllers/gateway_controller.go +++ b/pkg/controllers/gateway_controller.go @@ -21,6 +21,7 @@ import ( "fmt" anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" + "github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers" "github.com/aws/aws-application-networking-k8s/pkg/aws" "github.com/aws/aws-application-networking-k8s/pkg/config" @@ -40,7 +41,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/aws/aws-application-networking-k8s/controllers/eventhandlers" "github.com/aws/aws-application-networking-k8s/pkg/aws/services" deploy "github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice" model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice" diff --git a/controllers/gatewayclass_controller.go b/pkg/controllers/gatewayclass_controller.go similarity index 100% rename from controllers/gatewayclass_controller.go rename to pkg/controllers/gatewayclass_controller.go diff --git a/controllers/iamauthpolicy_controller.go b/pkg/controllers/iamauthpolicy_controller.go similarity index 100% rename from controllers/iamauthpolicy_controller.go rename to pkg/controllers/iamauthpolicy_controller.go diff --git a/controllers/iamauthpolicy_controller_test.go b/pkg/controllers/iamauthpolicy_controller_test.go similarity index 100% rename from controllers/iamauthpolicy_controller_test.go rename to pkg/controllers/iamauthpolicy_controller_test.go diff --git a/controllers/pod_controller.go b/pkg/controllers/pod_controller.go similarity index 100% rename from controllers/pod_controller.go rename to pkg/controllers/pod_controller.go diff --git a/controllers/route_controller.go b/pkg/controllers/route_controller.go similarity index 99% rename from controllers/route_controller.go rename to pkg/controllers/route_controller.go index 64bf0cfe..4be95766 100644 --- a/controllers/route_controller.go +++ b/pkg/controllers/route_controller.go @@ -38,10 +38,10 @@ import ( "sigs.k8s.io/external-dns/endpoint" - "github.com/aws/aws-application-networking-k8s/controllers/eventhandlers" anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" "github.com/aws/aws-application-networking-k8s/pkg/aws" "github.com/aws/aws-application-networking-k8s/pkg/config" + "github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers" "github.com/aws/aws-application-networking-k8s/pkg/deploy" "github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice" "github.com/aws/aws-application-networking-k8s/pkg/gateway" diff --git a/controllers/route_controller_test.go b/pkg/controllers/route_controller_test.go similarity index 100% rename from controllers/route_controller_test.go rename to pkg/controllers/route_controller_test.go diff --git a/controllers/service_controller.go b/pkg/controllers/service_controller.go similarity index 100% rename from controllers/service_controller.go rename to pkg/controllers/service_controller.go diff --git a/controllers/serviceexport_controller.go b/pkg/controllers/serviceexport_controller.go similarity index 98% rename from controllers/serviceexport_controller.go rename to pkg/controllers/serviceexport_controller.go index eeb65daa..1fd241c5 100644 --- a/controllers/serviceexport_controller.go +++ b/pkg/controllers/serviceexport_controller.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/aws/aws-application-networking-k8s/controllers/eventhandlers" + "github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" diff --git a/controllers/serviceimport_controller.go b/pkg/controllers/serviceimport_controller.go similarity index 100% rename from controllers/serviceimport_controller.go rename to pkg/controllers/serviceimport_controller.go diff --git a/controllers/suite_test.go b/pkg/controllers/suite_test.go similarity index 100% rename from controllers/suite_test.go rename to pkg/controllers/suite_test.go diff --git a/controllers/targetgrouppolicy_controller.go b/pkg/controllers/targetgrouppolicy_controller.go similarity index 100% rename from controllers/targetgrouppolicy_controller.go rename to pkg/controllers/targetgrouppolicy_controller.go diff --git a/controllers/vpcassociationpolicy_controller.go b/pkg/controllers/vpcassociationpolicy_controller.go similarity index 98% rename from controllers/vpcassociationpolicy_controller.go rename to pkg/controllers/vpcassociationpolicy_controller.go index c05ea17f..7bf47607 100644 --- a/controllers/vpcassociationpolicy_controller.go +++ b/pkg/controllers/vpcassociationpolicy_controller.go @@ -10,7 +10,7 @@ import ( deploy "github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice" "github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog" - "github.com/aws/aws-application-networking-k8s/controllers/eventhandlers" + "github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers" "github.com/aws/aws-application-networking-k8s/pkg/k8s" "github.com/aws/aws-application-networking-k8s/pkg/utils" "k8s.io/apimachinery/pkg/api/meta" diff --git a/test/pkg/test/framework.go b/test/pkg/test/framework.go index dfb3f44c..bfc19cb1 100644 --- a/test/pkg/test/framework.go +++ b/test/pkg/test/framework.go @@ -39,9 +39,9 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/aws/aws-application-networking-k8s/controllers" anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" "github.com/aws/aws-application-networking-k8s/pkg/config" + "github.com/aws/aws-application-networking-k8s/pkg/controllers" "github.com/aws/aws-application-networking-k8s/pkg/model/core" model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice" "github.com/aws/aws-application-networking-k8s/pkg/utils" diff --git a/test/suites/integration/iamauthpolicy_test.go b/test/suites/integration/iamauthpolicy_test.go index 13e96f4e..8ccb6f7e 100644 --- a/test/suites/integration/iamauthpolicy_test.go +++ b/test/suites/integration/iamauthpolicy_test.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/aws/aws-application-networking-k8s/controllers" anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" + "github.com/aws/aws-application-networking-k8s/pkg/controllers" model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice" "github.com/aws/aws-application-networking-k8s/test/pkg/test" "github.com/aws/aws-sdk-go/aws"