Merge pull request crossplane-contrib#26 from soorena776/remove_redun…

…dant_folders Removing redundant directories
namku · Sep 28, 2019 · 4d212d3 · 4d212d3
2 parents f7cadd6 + 214a2b5
commit 4d212d3
Show file tree

Hide file tree

Showing 141 changed files with 168 additions and 168 deletions.
diff --git a/Makefile b/Makefile
@@ -29,9 +29,9 @@ NPROCS ?= 1
 # to half the number of CPU cores.
 GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
 
-GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/crossplane
+GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/stack
 GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION)
-GO_SUBDIRS += cmd pkg aws
+GO_SUBDIRS += cmd pkg apis
 -include build/makelib/golang.mk
 
 # ====================================================================================

diff --git a/aws/apis/aws.go → apis/aws.go b/aws/apis/aws.go → apis/aws.go
@@ -15,21 +15,21 @@ limitations under the License.
 */
 
 // Generate deepcopy for apis
-//go:generate go run ../../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=../../hack/boilerplate.go.txt paths=./...
+//go:generate go run ../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=../hack/boilerplate.go.txt paths=./...
 
 // Package apis contains Kubernetes API groups for AWS cloud provider.
 package apis
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 
-	cachev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/cache/v1alpha2"
-	computev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/compute/v1alpha2"
-	databasev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/database/v1alpha2"
-	identityv1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/identity/v1alpha2"
-	networkv1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/network/v1alpha2"
-	storagev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/storage/v1alpha2"
-	awsv1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/v1alpha2"
+	cachev1alpha2 "github.com/crossplaneio/stack-aws/apis/cache/v1alpha2"
+	computev1alpha2 "github.com/crossplaneio/stack-aws/apis/compute/v1alpha2"
+	databasev1alpha2 "github.com/crossplaneio/stack-aws/apis/database/v1alpha2"
+	identityv1alpha2 "github.com/crossplaneio/stack-aws/apis/identity/v1alpha2"
+	networkv1alpha2 "github.com/crossplaneio/stack-aws/apis/network/v1alpha2"
+	storagev1alpha2 "github.com/crossplaneio/stack-aws/apis/storage/v1alpha2"
+	awsv1alpha2 "github.com/crossplaneio/stack-aws/apis/v1alpha2"
 )
 
 func init() {

diff --git a/aws/apis/aws_test.go → apis/aws_test.go b/aws/apis/aws_test.go → apis/aws_test.go
@@ -20,11 +20,11 @@ package apis
 import (
 	"testing"
 
-	cachev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/cache/v1alpha2"
-	computev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/compute/v1alpha2"
-	databasev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/database/v1alpha2"
-	storagev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/storage/v1alpha2"
-	awsv1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/v1alpha2"
+	cachev1alpha2 "github.com/crossplaneio/stack-aws/apis/cache/v1alpha2"
+	computev1alpha2 "github.com/crossplaneio/stack-aws/apis/compute/v1alpha2"
+	databasev1alpha2 "github.com/crossplaneio/stack-aws/apis/database/v1alpha2"
+	storagev1alpha2 "github.com/crossplaneio/stack-aws/apis/storage/v1alpha2"
+	awsv1alpha2 "github.com/crossplaneio/stack-aws/apis/v1alpha2"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/aws/apis/cache/cache.go → apis/cache/cache.go b/aws/apis/cache/cache.go → apis/cache/cache.go
diff --git a/aws/apis/cache/v1alpha2/doc.go → apis/cache/v1alpha2/doc.go b/aws/apis/cache/v1alpha2/doc.go → apis/cache/v1alpha2/doc.go
diff --git a/aws/apis/cache/v1alpha2/register.go → apis/cache/v1alpha2/register.go b/aws/apis/cache/v1alpha2/register.go → apis/cache/v1alpha2/register.go
diff --git a/...cache/v1alpha2/replication_group_types.go → ...cache/v1alpha2/replication_group_types.go b/...cache/v1alpha2/replication_group_types.go → ...cache/v1alpha2/replication_group_types.go
diff --git a/.../v1alpha2/replication_group_types_test.go → .../v1alpha2/replication_group_types_test.go b/.../v1alpha2/replication_group_types_test.go → .../v1alpha2/replication_group_types_test.go
diff --git a/...s/cache/v1alpha2/zz_generated.deepcopy.go → apis/cache/v1alpha2/zz_generated.deepcopy.go b/...s/cache/v1alpha2/zz_generated.deepcopy.go → apis/cache/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/compute/container.go → apis/compute/container.go b/aws/apis/compute/container.go → apis/compute/container.go
diff --git a/aws/apis/compute/v1alpha2/doc.go → apis/compute/v1alpha2/doc.go b/aws/apis/compute/v1alpha2/doc.go → apis/compute/v1alpha2/doc.go
diff --git a/aws/apis/compute/v1alpha2/register.go → apis/compute/v1alpha2/register.go b/aws/apis/compute/v1alpha2/register.go → apis/compute/v1alpha2/register.go
diff --git a/aws/apis/compute/v1alpha2/types.go → apis/compute/v1alpha2/types.go b/aws/apis/compute/v1alpha2/types.go → apis/compute/v1alpha2/types.go
diff --git a/aws/apis/compute/v1alpha2/types_test.go → apis/compute/v1alpha2/types_test.go b/aws/apis/compute/v1alpha2/types_test.go → apis/compute/v1alpha2/types_test.go
diff --git a/...compute/v1alpha2/zz_generated.deepcopy.go → ...compute/v1alpha2/zz_generated.deepcopy.go b/...compute/v1alpha2/zz_generated.deepcopy.go → ...compute/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/database/database.go → apis/database/database.go b/aws/apis/database/database.go → apis/database/database.go
diff --git a/aws/apis/database/v1alpha2/doc.go → apis/database/v1alpha2/doc.go b/aws/apis/database/v1alpha2/doc.go → apis/database/v1alpha2/doc.go
diff --git a/...is/database/v1alpha2/rdsinstance_types.go → apis/database/v1alpha2/rdsinstance_types.go b/...is/database/v1alpha2/rdsinstance_types.go → apis/database/v1alpha2/rdsinstance_types.go
diff --git a/...tabase/v1alpha2/rdsinstance_types_test.go → ...tabase/v1alpha2/rdsinstance_types_test.go b/...tabase/v1alpha2/rdsinstance_types_test.go → ...tabase/v1alpha2/rdsinstance_types_test.go
diff --git a/aws/apis/database/v1alpha2/register.go → apis/database/v1alpha2/register.go b/aws/apis/database/v1alpha2/register.go → apis/database/v1alpha2/register.go
diff --git a/...atabase/v1alpha2/zz_generated.deepcopy.go → ...atabase/v1alpha2/zz_generated.deepcopy.go b/...atabase/v1alpha2/zz_generated.deepcopy.go → ...atabase/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/identity/identity.go → apis/identity/identity.go b/aws/apis/identity/identity.go → apis/identity/identity.go
diff --git a/aws/apis/identity/v1alpha2/doc.go → apis/identity/v1alpha2/doc.go b/aws/apis/identity/v1alpha2/doc.go → apis/identity/v1alpha2/doc.go
diff --git a/...apis/identity/v1alpha2/iamrole_helpers.go → apis/identity/v1alpha2/iamrole_helpers.go b/...apis/identity/v1alpha2/iamrole_helpers.go → apis/identity/v1alpha2/iamrole_helpers.go
@@ -22,7 +22,7 @@ import (
 
 	runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 // SetBindingPhase of this IAMRole.

diff --git a/aws/apis/identity/v1alpha2/iamrole_types.go → apis/identity/v1alpha2/iamrole_types.go b/aws/apis/identity/v1alpha2/iamrole_types.go → apis/identity/v1alpha2/iamrole_types.go
diff --git a/...alpha2/iamrolepolicyattachment_helpers.go → ...alpha2/iamrolepolicyattachment_helpers.go b/...alpha2/iamrolepolicyattachment_helpers.go → ...alpha2/iamrolepolicyattachment_helpers.go
@@ -22,7 +22,7 @@ import (
 
 	runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 // SetBindingPhase of this IAMRolePolicyAttachment.

diff --git a/...v1alpha2/iamrolepolicyattachment_types.go → ...v1alpha2/iamrolepolicyattachment_types.go b/...v1alpha2/iamrolepolicyattachment_types.go → ...v1alpha2/iamrolepolicyattachment_types.go
diff --git a/aws/apis/identity/v1alpha2/identity_test.go → apis/identity/v1alpha2/identity_test.go b/aws/apis/identity/v1alpha2/identity_test.go → apis/identity/v1alpha2/identity_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	"github.com/onsi/gomega"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 func TestMain(m *testing.M) {

diff --git a/aws/apis/identity/v1alpha2/register.go → apis/identity/v1alpha2/register.go b/aws/apis/identity/v1alpha2/register.go → apis/identity/v1alpha2/register.go
diff --git a/...dentity/v1alpha2/zz_generated.deepcopy.go → ...dentity/v1alpha2/zz_generated.deepcopy.go b/...dentity/v1alpha2/zz_generated.deepcopy.go → ...dentity/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/network/network.go → apis/network/network.go b/aws/apis/network/network.go → apis/network/network.go
diff --git a/aws/apis/network/v1alpha2/common.go → apis/network/v1alpha2/common.go b/aws/apis/network/v1alpha2/common.go → apis/network/v1alpha2/common.go
diff --git a/aws/apis/network/v1alpha2/doc.go → apis/network/v1alpha2/doc.go b/aws/apis/network/v1alpha2/doc.go → apis/network/v1alpha2/doc.go
diff --git a/...twork/v1alpha2/internetgateway_helpers.go → ...twork/v1alpha2/internetgateway_helpers.go b/...twork/v1alpha2/internetgateway_helpers.go → ...twork/v1alpha2/internetgateway_helpers.go
diff --git a/...network/v1alpha2/internetgateway_types.go → ...network/v1alpha2/internetgateway_types.go b/...network/v1alpha2/internetgateway_types.go → ...network/v1alpha2/internetgateway_types.go
diff --git a/aws/apis/network/v1alpha2/network_test.go → apis/network/v1alpha2/network_test.go b/aws/apis/network/v1alpha2/network_test.go → apis/network/v1alpha2/network_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/onsi/gomega"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 func TestMain(m *testing.M) {

diff --git a/aws/apis/network/v1alpha2/register.go → apis/network/v1alpha2/register.go b/aws/apis/network/v1alpha2/register.go → apis/network/v1alpha2/register.go
diff --git a/...is/network/v1alpha2/routetable_helpers.go → apis/network/v1alpha2/routetable_helpers.go b/...is/network/v1alpha2/routetable_helpers.go → apis/network/v1alpha2/routetable_helpers.go
diff --git a/...apis/network/v1alpha2/routetable_types.go → apis/network/v1alpha2/routetable_types.go b/...apis/network/v1alpha2/routetable_types.go → apis/network/v1alpha2/routetable_types.go
diff --git a/...network/v1alpha2/securitygroup_helpers.go → ...network/v1alpha2/securitygroup_helpers.go b/...network/v1alpha2/securitygroup_helpers.go → ...network/v1alpha2/securitygroup_helpers.go
@@ -22,7 +22,7 @@ import (
 
 	runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 // SetBindingPhase of this SecurityGroup.

diff --git a/...s/network/v1alpha2/securitygroup_types.go → apis/network/v1alpha2/securitygroup_types.go b/...s/network/v1alpha2/securitygroup_types.go → apis/network/v1alpha2/securitygroup_types.go
diff --git a/aws/apis/network/v1alpha2/subnet_helpers.go → apis/network/v1alpha2/subnet_helpers.go b/aws/apis/network/v1alpha2/subnet_helpers.go → apis/network/v1alpha2/subnet_helpers.go
diff --git a/aws/apis/network/v1alpha2/subnet_types.go → apis/network/v1alpha2/subnet_types.go b/aws/apis/network/v1alpha2/subnet_types.go → apis/network/v1alpha2/subnet_types.go
diff --git a/aws/apis/network/v1alpha2/vpc_helpers.go → apis/network/v1alpha2/vpc_helpers.go b/aws/apis/network/v1alpha2/vpc_helpers.go → apis/network/v1alpha2/vpc_helpers.go
diff --git a/aws/apis/network/v1alpha2/vpc_types.go → apis/network/v1alpha2/vpc_types.go b/aws/apis/network/v1alpha2/vpc_types.go → apis/network/v1alpha2/vpc_types.go
diff --git a/...network/v1alpha2/zz_generated.deepcopy.go → ...network/v1alpha2/zz_generated.deepcopy.go b/...network/v1alpha2/zz_generated.deepcopy.go → ...network/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/storage/storage.go → apis/storage/storage.go b/aws/apis/storage/storage.go → apis/storage/storage.go
diff --git a/aws/apis/storage/v1alpha2/bucket_types.go → apis/storage/v1alpha2/bucket_types.go b/aws/apis/storage/v1alpha2/bucket_types.go → apis/storage/v1alpha2/bucket_types.go
diff --git a/...pis/storage/v1alpha2/bucket_types_test.go → apis/storage/v1alpha2/bucket_types_test.go b/...pis/storage/v1alpha2/bucket_types_test.go → apis/storage/v1alpha2/bucket_types_test.go
diff --git a/...storage/v1alpha2/dbsubnetgroup_helpers.go → ...storage/v1alpha2/dbsubnetgroup_helpers.go b/...storage/v1alpha2/dbsubnetgroup_helpers.go → ...storage/v1alpha2/dbsubnetgroup_helpers.go
@@ -22,7 +22,7 @@ import (
 
 	runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 // SetBindingPhase of this DBSubnetGroup.

diff --git a/...is/storage/v1alpha2/dbsubnetgroup_test.go → apis/storage/v1alpha2/dbsubnetgroup_test.go b/...is/storage/v1alpha2/dbsubnetgroup_test.go → apis/storage/v1alpha2/dbsubnetgroup_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/rds"
 	"github.com/onsi/gomega"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 func Test_DBSubnetGroup_BuildExternalStatusFromObservation(t *testing.T) {

diff --git a/...s/storage/v1alpha2/dbsubnetgroup_types.go → apis/storage/v1alpha2/dbsubnetgroup_types.go b/...s/storage/v1alpha2/dbsubnetgroup_types.go → apis/storage/v1alpha2/dbsubnetgroup_types.go
diff --git a/aws/apis/storage/v1alpha2/doc.go → apis/storage/v1alpha2/doc.go b/aws/apis/storage/v1alpha2/doc.go → apis/storage/v1alpha2/doc.go
diff --git a/aws/apis/storage/v1alpha2/register.go → apis/storage/v1alpha2/register.go b/aws/apis/storage/v1alpha2/register.go → apis/storage/v1alpha2/register.go
diff --git a/...storage/v1alpha2/zz_generated.deepcopy.go → ...storage/v1alpha2/zz_generated.deepcopy.go b/...storage/v1alpha2/zz_generated.deepcopy.go → ...storage/v1alpha2/zz_generated.deepcopy.go
diff --git a/aws/apis/v1alpha2/doc.go → apis/v1alpha2/doc.go b/aws/apis/v1alpha2/doc.go → apis/v1alpha2/doc.go
diff --git a/aws/apis/v1alpha2/register.go → apis/v1alpha2/register.go b/aws/apis/v1alpha2/register.go → apis/v1alpha2/register.go
diff --git a/aws/apis/v1alpha2/types.go → apis/v1alpha2/types.go b/aws/apis/v1alpha2/types.go → apis/v1alpha2/types.go
diff --git a/aws/apis/v1alpha2/types_test.go → apis/v1alpha2/types_test.go b/aws/apis/v1alpha2/types_test.go → apis/v1alpha2/types_test.go
diff --git a/aws/apis/v1alpha2/zz_generated.deepcopy.go → apis/v1alpha2/zz_generated.deepcopy.go b/aws/apis/v1alpha2/zz_generated.deepcopy.go → apis/v1alpha2/zz_generated.deepcopy.go
diff --git a/cluster/images/stack-aws/Dockerfile b/cluster/images/stack-aws/Dockerfile
@@ -4,9 +4,9 @@ RUN apk --no-cache add ca-certificates bash
 ARG ARCH
 ARG TINI_VERSION
 
-ADD crossplane /usr/local/bin/
+ADD stack /usr/local/bin/crossplane-aws-stack
 
 COPY stack-package /
 
 EXPOSE 8080
-ENTRYPOINT ["crossplane"]
+ENTRYPOINT ["crossplane-aws-stack"]
diff --git a/cluster/images/stack-aws/Makefile b/cluster/images/stack-aws/Makefile
@@ -15,7 +15,7 @@ include ../../../build/makelib/image.mk
 img.build:
 	@$(INFO) docker build $(IMAGE)
 	@cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL)
-	@cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/crossplane $(IMAGE_TEMP_DIR) || $(FAIL)
+	@cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/stack $(IMAGE_TEMP_DIR) || $(FAIL)
 	@cp -R ../../../$(STACK_PACKAGE) $(IMAGE_TEMP_DIR) || $(FAIL)
 	@cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL)
 	@docker build $(BUILD_ARGS) \

diff --git a/cmd/crossplane/main.go → cmd/stack/main.go b/cmd/crossplane/main.go → cmd/stack/main.go
@@ -27,11 +27,11 @@ import (
 	runtimelog "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
 
-	awsapis "github.com/crossplaneio/stack-aws/aws/apis"
-	"github.com/crossplaneio/stack-aws/pkg/controller/aws"
+	apis "github.com/crossplaneio/stack-aws/apis"
+	"github.com/crossplaneio/stack-aws/pkg/controller"
 
 	"github.com/crossplaneio/crossplane-runtime/pkg/logging"
-	"github.com/crossplaneio/crossplane/apis"
+	crossplaneapis "github.com/crossplaneio/crossplane/apis"
 )
 
 func main() {
@@ -101,7 +101,7 @@ func main() {
 }
 
 func controllerSetupWithManager(mgr manager.Manager) error {
-	if err := (&aws.Controllers{}).SetupWithManager(mgr); err != nil {
+	if err := (&controller.Controllers{}).SetupWithManager(mgr); err != nil {
 		return err
 	}
 
@@ -114,7 +114,7 @@ func addToScheme(scheme *runtime.Scheme) error {
 		return err
 	}
 
-	if err := awsapis.AddToScheme(scheme); err != nil {
+	if err := crossplaneapis.AddToScheme(scheme); err != nil {
 		return err
 	}
 

diff --git a/pkg/clients/aws/aws.go → pkg/clients/aws.go b/pkg/clients/aws/aws.go → pkg/clients/aws.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-ini/ini"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/v1alpha2"
+	"github.com/crossplaneio/stack-aws/apis/v1alpha2"
 
 	"github.com/crossplaneio/crossplane-runtime/pkg/util"
 )

diff --git a/pkg/clients/aws/aws_test.go → pkg/clients/aws_test.go b/pkg/clients/aws/aws_test.go → pkg/clients/aws_test.go
diff --git a/...ents/aws/cloudformation/cloudformation.go → pkg/clients/cloudformation/cloudformation.go b/...ents/aws/cloudformation/cloudformation.go → pkg/clients/cloudformation/cloudformation.go
diff --git a/pkg/clients/aws/cloudformation/fake/fake.go → pkg/clients/cloudformation/fake/fake.go b/pkg/clients/aws/cloudformation/fake/fake.go → pkg/clients/cloudformation/fake/fake.go
diff --git a/pkg/clients/aws/ec2/ec2_test.go → pkg/clients/ec2/ec2_test.go b/pkg/clients/aws/ec2/ec2_test.go → pkg/clients/ec2/ec2_test.go
diff --git a/pkg/clients/aws/ec2/fake/internetgateway.go → pkg/clients/ec2/fake/internetgateway.go b/pkg/clients/aws/ec2/fake/internetgateway.go → pkg/clients/ec2/fake/internetgateway.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/ec2"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/ec2"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/ec2/fake/routetable.go → pkg/clients/ec2/fake/routetable.go b/pkg/clients/aws/ec2/fake/routetable.go → pkg/clients/ec2/fake/routetable.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/ec2"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/ec2"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/ec2/fake/securitygroup.go → pkg/clients/ec2/fake/securitygroup.go b/pkg/clients/aws/ec2/fake/securitygroup.go → pkg/clients/ec2/fake/securitygroup.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/ec2"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/ec2"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/ec2/fake/subnet.go → pkg/clients/ec2/fake/subnet.go b/pkg/clients/aws/ec2/fake/subnet.go → pkg/clients/ec2/fake/subnet.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/ec2"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/ec2"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/ec2/fake/vpc.go → pkg/clients/ec2/fake/vpc.go b/pkg/clients/aws/ec2/fake/vpc.go → pkg/clients/ec2/fake/vpc.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/ec2"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/ec2"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/ec2/internetgateway.go → pkg/clients/ec2/internetgateway.go b/pkg/clients/aws/ec2/internetgateway.go → pkg/clients/ec2/internetgateway.go
diff --git a/pkg/clients/aws/ec2/routetable.go → pkg/clients/ec2/routetable.go b/pkg/clients/aws/ec2/routetable.go → pkg/clients/ec2/routetable.go
diff --git a/pkg/clients/aws/ec2/securitygroup.go → pkg/clients/ec2/securitygroup.go b/pkg/clients/aws/ec2/securitygroup.go → pkg/clients/ec2/securitygroup.go
diff --git a/pkg/clients/aws/ec2/subnet.go → pkg/clients/ec2/subnet.go b/pkg/clients/aws/ec2/subnet.go → pkg/clients/ec2/subnet.go
diff --git a/pkg/clients/aws/ec2/vpc.go → pkg/clients/ec2/vpc.go b/pkg/clients/aws/ec2/vpc.go → pkg/clients/ec2/vpc.go
diff --git a/pkg/clients/aws/eks/eks.go → pkg/clients/eks/eks.go b/pkg/clients/aws/eks/eks.go → pkg/clients/eks/eks.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 
-	awscomputev1alpha2 "github.com/crossplaneio/stack-aws/aws/apis/compute/v1alpha2"
-	cfc "github.com/crossplaneio/stack-aws/pkg/clients/aws/cloudformation"
+	awscomputev1alpha2 "github.com/crossplaneio/stack-aws/apis/compute/v1alpha2"
+	cfc "github.com/crossplaneio/stack-aws/pkg/clients/cloudformation"
 )
 
 const (

diff --git a/pkg/clients/aws/eks/eks_test.go → pkg/clients/eks/eks_test.go b/pkg/clients/aws/eks/eks_test.go → pkg/clients/eks/eks_test.go
diff --git a/pkg/clients/aws/eks/fake/fake.go → pkg/clients/eks/fake/fake.go b/pkg/clients/aws/eks/fake/fake.go → pkg/clients/eks/fake/fake.go
@@ -17,8 +17,8 @@ limitations under the License.
 package fake
 
 import (
-	"github.com/crossplaneio/stack-aws/aws/apis/compute/v1alpha2"
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws/eks"
+	"github.com/crossplaneio/stack-aws/apis/compute/v1alpha2"
+	"github.com/crossplaneio/stack-aws/pkg/clients/eks"
 )
 
 // MockEKSClient mock client for EKS

diff --git a/pkg/clients/aws/elasticache/elasticache.go → pkg/clients/elasticache/elasticache.go b/pkg/clients/aws/elasticache/elasticache.go → pkg/clients/elasticache/elasticache.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/cache/v1alpha2"
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	"github.com/crossplaneio/stack-aws/apis/cache/v1alpha2"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 // NamePrefix is the prefix for all created ElastiCache replication groups.

diff --git a/...ients/aws/elasticache/elasticache_test.go → pkg/clients/elasticache/elasticache_test.go b/...ients/aws/elasticache/elasticache_test.go → pkg/clients/elasticache/elasticache_test.go
@@ -24,8 +24,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/cache/v1alpha2"
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws"
+	"github.com/crossplaneio/stack-aws/apis/cache/v1alpha2"
+	aws "github.com/crossplaneio/stack-aws/pkg/clients"
 )
 
 const (

diff --git a/pkg/clients/aws/elasticache/fake/fake.go → pkg/clients/elasticache/fake/fake.go b/pkg/clients/aws/elasticache/fake/fake.go → pkg/clients/elasticache/fake/fake.go
diff --git a/pkg/clients/aws/iam/fake/client.go → pkg/clients/iam/fake/client.go b/pkg/clients/aws/iam/fake/client.go → pkg/clients/iam/fake/client.go
diff --git a/pkg/clients/aws/iam/fake/iamrole.go → pkg/clients/iam/fake/iamrole.go b/pkg/clients/aws/iam/fake/iamrole.go → pkg/clients/iam/fake/iamrole.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/iam"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/iam"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/...s/aws/iam/fake/iamrolepolicyattachment.go → ...ients/iam/fake/iamrolepolicyattachment.go b/...s/aws/iam/fake/iamrolepolicyattachment.go → ...ients/iam/fake/iamrolepolicyattachment.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/iam"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/iam"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/iam/iam.go → pkg/clients/iam/iam.go b/pkg/clients/aws/iam/iam.go → pkg/clients/iam/iam.go
diff --git a/pkg/clients/aws/iam/iamrole.go → pkg/clients/iam/iamrole.go b/pkg/clients/aws/iam/iamrole.go → pkg/clients/iam/iamrole.go
diff --git a/...lients/aws/iam/iamrolepolicyattachment.go → pkg/clients/iam/iamrolepolicyattachment.go b/...lients/aws/iam/iamrolepolicyattachment.go → pkg/clients/iam/iamrolepolicyattachment.go
diff --git a/pkg/clients/aws/rds/dbsubnetgroup.go → pkg/clients/rds/dbsubnetgroup.go b/pkg/clients/aws/rds/dbsubnetgroup.go → pkg/clients/rds/dbsubnetgroup.go
diff --git a/pkg/clients/aws/rds/fake/dbsubnetgroup.go → pkg/clients/rds/fake/dbsubnetgroup.go b/pkg/clients/aws/rds/fake/dbsubnetgroup.go → pkg/clients/rds/fake/dbsubnetgroup.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/rds"
 
-	clientset "github.com/crossplaneio/stack-aws/pkg/clients/aws/rds"
+	clientset "github.com/crossplaneio/stack-aws/pkg/clients/rds"
 )
 
 // this ensures that the mock implements the client interface

diff --git a/pkg/clients/aws/rds/fake/fake.go → pkg/clients/rds/fake/fake.go b/pkg/clients/aws/rds/fake/fake.go → pkg/clients/rds/fake/fake.go
@@ -17,8 +17,8 @@ limitations under the License.
 package fake
 
 import (
-	"github.com/crossplaneio/stack-aws/aws/apis/database/v1alpha2"
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws/rds"
+	"github.com/crossplaneio/stack-aws/apis/database/v1alpha2"
+	"github.com/crossplaneio/stack-aws/pkg/clients/rds"
 )
 
 // MockRDSClient for testing.

diff --git a/pkg/clients/aws/rds/rds.go → pkg/clients/rds/rds.go b/pkg/clients/aws/rds/rds.go → pkg/clients/rds/rds.go
@@ -24,7 +24,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/rds"
 	"github.com/aws/aws-sdk-go-v2/service/rds/rdsiface"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/database/v1alpha2"
+	"github.com/crossplaneio/stack-aws/apis/database/v1alpha2"
 )
 
 // Instance crossplane representation of the to AWS DBInstance

diff --git a/pkg/clients/aws/s3/fake/fake.go → pkg/clients/s3/fake/fake.go b/pkg/clients/aws/s3/fake/fake.go → pkg/clients/s3/fake/fake.go
@@ -19,8 +19,8 @@ package fake
 import (
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/storage/v1alpha2"
-	client "github.com/crossplaneio/stack-aws/pkg/clients/aws/s3"
+	"github.com/crossplaneio/stack-aws/apis/storage/v1alpha2"
+	client "github.com/crossplaneio/stack-aws/pkg/clients/s3"
 )
 
 // MockS3Client for testing.

diff --git a/.../operations/fake/create_bucket_request.go → .../operations/fake/create_bucket_request.go b/.../operations/fake/create_bucket_request.go → .../operations/fake/create_bucket_request.go
diff --git a/.../operations/fake/delete_bucket_request.go → .../operations/fake/delete_bucket_request.go b/.../operations/fake/delete_bucket_request.go → .../operations/fake/delete_bucket_request.go
diff --git a/...ons/fake/get_bucket_versioning_request.go → ...ons/fake/get_bucket_versioning_request.go b/...ons/fake/get_bucket_versioning_request.go → ...ons/fake/get_bucket_versioning_request.go
diff --git a/...ents/aws/s3/operations/fake/operations.go → pkg/clients/s3/operations/fake/operations.go b/...ents/aws/s3/operations/fake/operations.go → pkg/clients/s3/operations/fake/operations.go
diff --git a/...operations/fake/put_bucket_acl_request.go → ...operations/fake/put_bucket_acl_request.go b/...operations/fake/put_bucket_acl_request.go → ...operations/fake/put_bucket_acl_request.go
diff --git a/...ons/fake/put_bucket_versioning_request.go → ...ons/fake/put_bucket_versioning_request.go b/...ons/fake/put_bucket_versioning_request.go → ...ons/fake/put_bucket_versioning_request.go
diff --git a/pkg/clients/aws/s3/operations/operations.go → pkg/clients/s3/operations/operations.go b/pkg/clients/aws/s3/operations/operations.go → pkg/clients/s3/operations/operations.go
diff --git a/pkg/clients/aws/s3/operations/requests.go → pkg/clients/s3/operations/requests.go b/pkg/clients/aws/s3/operations/requests.go → pkg/clients/s3/operations/requests.go
diff --git a/...lients/aws/s3/operations/s3_operations.go → pkg/clients/s3/operations/s3_operations.go b/...lients/aws/s3/operations/s3_operations.go → pkg/clients/s3/operations/s3_operations.go
diff --git a/pkg/clients/aws/s3/s3.go → pkg/clients/s3/s3.go b/pkg/clients/aws/s3/s3.go → pkg/clients/s3/s3.go
@@ -20,15 +20,15 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/crossplaneio/stack-aws/pkg/clients/aws/s3/operations"
+	"github.com/crossplaneio/stack-aws/pkg/clients/s3/operations"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/aws/awserr"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 
-	"github.com/crossplaneio/stack-aws/aws/apis/storage/v1alpha2"
-	iamc "github.com/crossplaneio/stack-aws/pkg/clients/aws/iam"
+	"github.com/crossplaneio/stack-aws/apis/storage/v1alpha2"
+	iamc "github.com/crossplaneio/stack-aws/pkg/clients/iam"
 
 	"github.com/crossplaneio/crossplane-runtime/pkg/util"
 	storage "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"

diff --git a/pkg/clients/aws/s3/s3_test.go → pkg/clients/s3/s3_test.go b/pkg/clients/aws/s3/s3_test.go → pkg/clients/s3/s3_test.go
@@ -20,9 +20,9 @@ import (
 	"errors"
 	"testing"
 
-	awsstorage "github.com/crossplaneio/stack-aws/aws/apis/storage/v1alpha2"
-	fakeiam "github.com/crossplaneio/stack-aws/pkg/clients/aws/iam/fake"
-	fakeops "github.com/crossplaneio/stack-aws/pkg/clients/aws/s3/operations/fake"
+	awsstorage "github.com/crossplaneio/stack-aws/apis/storage/v1alpha2"
+	fakeiam "github.com/crossplaneio/stack-aws/pkg/clients/iam/fake"
+	fakeops "github.com/crossplaneio/stack-aws/pkg/clients/s3/operations/fake"
 
 	storage "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"