From 327102b3f3e07d376d1d4d8f2fe2849a02d50988 Mon Sep 17 00:00:00 2001 From: soorena776 Date: Sat, 28 Sep 2019 14:49:15 -0700 Subject: [PATCH] remove redundant gcp folders Signed-off-by: soorena776 --- Makefile | 4 ++-- {gcp/apis => apis}/cache/cache.go | 0 .../v1alpha2/cloudmemorystore_instance_types.go | 0 .../cloudmemorystore_instance_types_test.go | 0 {gcp/apis => apis}/cache/v1alpha2/doc.go | 0 {gcp/apis => apis}/cache/v1alpha2/register.go | 0 .../cache/v1alpha2/zz_generated.deepcopy.go | 0 {gcp/apis => apis}/compute/compute.go | 0 {gcp/apis => apis}/compute/v1alpha2/doc.go | 0 .../compute/v1alpha2/gkecluster_types.go | 0 .../compute/v1alpha2/gkecluster_types_test.go | 0 .../compute/v1alpha2/globaladdress_types.go | 0 .../compute/v1alpha2/network_types.go | 0 .../compute/v1alpha2/network_types_test.go | 0 {gcp/apis => apis}/compute/v1alpha2/register.go | 0 .../compute/v1alpha2/subnetwork_types.go | 0 .../compute/v1alpha2/subnetwork_types_test.go | 0 .../compute/v1alpha2/zz_generated.deepcopy.go | 0 {gcp/apis => apis}/database/database.go | 0 .../database/v1alpha2/cloudsql_instance_types.go | 0 .../v1alpha2/cloudsql_instance_types_test.go | 0 {gcp/apis => apis}/database/v1alpha2/doc.go | 0 {gcp/apis => apis}/database/v1alpha2/register.go | 0 .../database/v1alpha2/zz_generated.deepcopy.go | 0 {gcp/apis => apis}/gcp.go | 14 +++++++------- {gcp/apis => apis}/gcp_test.go | 10 +++++----- .../servicenetworking/servicenetworking.go | 0 .../servicenetworking/v1alpha2/connection_types.go | 0 .../servicenetworking/v1alpha2/doc.go | 0 .../servicenetworking/v1alpha2/register.go | 0 .../v1alpha2/zz_generated.deepcopy.go | 0 {gcp/apis => apis}/storage/storage.go | 0 {gcp/apis => apis}/storage/v1alpha2/doc.go | 0 {gcp/apis => apis}/storage/v1alpha2/register.go | 0 {gcp/apis => apis}/storage/v1alpha2/types.go | 0 {gcp/apis => apis}/storage/v1alpha2/types_test.go | 0 .../storage/v1alpha2/zz_generated.deepcopy.go | 0 {gcp/apis => apis}/v1alpha2/doc.go | 0 {gcp/apis => apis}/v1alpha2/register.go | 0 {gcp/apis => apis}/v1alpha2/types.go | 0 {gcp/apis => apis}/v1alpha2/types_test.go | 0 .../v1alpha2/zz_generated.deepcopy.go | 0 cluster/images/stack-gcp/Dockerfile | 4 ++-- cluster/images/stack-gcp/Makefile | 2 +- cmd/{crossplane => stack}/main.go | 12 ++++++------ .../{gcp => }/cloudmemorystore/cloudmemorystore.go | 2 +- .../cloudmemorystore/cloudmemorystore_test.go | 2 +- .../{gcp => }/cloudmemorystore/fake/fake.go | 2 +- pkg/clients/{gcp => }/cloudsql/fake/instance.go | 2 +- pkg/clients/{gcp => }/cloudsql/fake/user.go | 2 +- pkg/clients/{gcp => }/cloudsql/instance.go | 0 pkg/clients/{gcp => }/cloudsql/user.go | 0 pkg/clients/{gcp => }/connection/connection.go | 2 +- .../{gcp => }/connection/connection_test.go | 2 +- pkg/clients/{gcp => }/fake/fake.go | 2 +- pkg/clients/{gcp => }/gcp.go | 0 pkg/clients/{gcp => }/gcp_test.go | 0 pkg/clients/{gcp => }/gke/gke.go | 4 ++-- pkg/clients/{gcp => }/gke/gke_test.go | 0 .../{gcp => }/globaladdress/globaladdress.go | 4 ++-- .../{gcp => }/globaladdress/globaladdress_test.go | 2 +- .../{gcp => }/integration/integration_test.go | 2 +- .../{gcp => }/integration/integration_testing.go | 0 pkg/clients/{gcp => }/network/network.go | 2 +- pkg/clients/{gcp => }/network/network_test.go | 2 +- pkg/clients/{gcp => }/storage/bucket.go | 0 pkg/clients/{gcp => }/storage/fake/fake.go | 2 +- pkg/clients/{gcp => }/subnetwork/subnetwork.go | 2 +- .../{gcp => }/subnetwork/subnetwork_test.go | 2 +- pkg/controller/{gcp => }/cache/claim.go | 2 +- pkg/controller/{gcp => }/cache/claim_test.go | 2 +- pkg/controller/{gcp => }/cache/managed.go | 6 +++--- pkg/controller/{gcp => }/cache/managed_test.go | 8 ++++---- pkg/controller/{gcp => }/compute/claim.go | 2 +- pkg/controller/{gcp => }/compute/claim_test.go | 2 +- pkg/controller/{gcp => }/compute/gke.go | 8 ++++---- pkg/controller/{gcp => }/compute/gke_test.go | 8 ++++---- pkg/controller/{gcp => }/compute/globaladdress.go | 8 ++++---- .../{gcp => }/compute/globaladdress_test.go | 4 ++-- pkg/controller/{gcp => }/compute/network.go | 8 ++++---- pkg/controller/{gcp => }/compute/network_test.go | 4 ++-- pkg/controller/{gcp => }/compute/subnetwork.go | 8 ++++---- .../{gcp => }/compute/subnetwork_test.go | 4 ++-- pkg/controller/{gcp => }/database/claim.go | 2 +- pkg/controller/{gcp => }/database/claim_test.go | 2 +- pkg/controller/{gcp => }/database/instance.go | 6 +++--- pkg/controller/{gcp => }/database/instance_test.go | 4 ++-- pkg/controller/{gcp => }/database/operations.go | 4 ++-- .../{gcp => }/database/operations_test.go | 6 +++--- pkg/controller/{gcp => }/gcp.go | 12 ++++++------ .../{gcp => }/servicenetworking/connection.go | 8 ++++---- .../{gcp => }/servicenetworking/connection_test.go | 4 ++-- pkg/controller/{gcp => }/storage/bucket.go | 6 +++--- .../{gcp => }/storage/bucket_operations.go | 4 ++-- .../{gcp => }/storage/bucket_operations_test.go | 6 +++--- pkg/controller/{gcp => }/storage/bucket_test.go | 6 +++--- pkg/controller/{gcp => }/storage/claim.go | 2 +- pkg/controller/{gcp => }/storage/claim_test.go | 2 +- 98 files changed, 116 insertions(+), 116 deletions(-) rename {gcp/apis => apis}/cache/cache.go (100%) rename {gcp/apis => apis}/cache/v1alpha2/cloudmemorystore_instance_types.go (100%) rename {gcp/apis => apis}/cache/v1alpha2/cloudmemorystore_instance_types_test.go (100%) rename {gcp/apis => apis}/cache/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/cache/v1alpha2/register.go (100%) rename {gcp/apis => apis}/cache/v1alpha2/zz_generated.deepcopy.go (100%) rename {gcp/apis => apis}/compute/compute.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/gkecluster_types.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/gkecluster_types_test.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/globaladdress_types.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/network_types.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/network_types_test.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/register.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/subnetwork_types.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/subnetwork_types_test.go (100%) rename {gcp/apis => apis}/compute/v1alpha2/zz_generated.deepcopy.go (100%) rename {gcp/apis => apis}/database/database.go (100%) rename {gcp/apis => apis}/database/v1alpha2/cloudsql_instance_types.go (100%) rename {gcp/apis => apis}/database/v1alpha2/cloudsql_instance_types_test.go (100%) rename {gcp/apis => apis}/database/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/database/v1alpha2/register.go (100%) rename {gcp/apis => apis}/database/v1alpha2/zz_generated.deepcopy.go (100%) rename {gcp/apis => apis}/gcp.go (69%) rename {gcp/apis => apis}/gcp_test.go (77%) rename {gcp/apis => apis}/servicenetworking/servicenetworking.go (100%) rename {gcp/apis => apis}/servicenetworking/v1alpha2/connection_types.go (100%) rename {gcp/apis => apis}/servicenetworking/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/servicenetworking/v1alpha2/register.go (100%) rename {gcp/apis => apis}/servicenetworking/v1alpha2/zz_generated.deepcopy.go (100%) rename {gcp/apis => apis}/storage/storage.go (100%) rename {gcp/apis => apis}/storage/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/storage/v1alpha2/register.go (100%) rename {gcp/apis => apis}/storage/v1alpha2/types.go (100%) rename {gcp/apis => apis}/storage/v1alpha2/types_test.go (100%) rename {gcp/apis => apis}/storage/v1alpha2/zz_generated.deepcopy.go (100%) rename {gcp/apis => apis}/v1alpha2/doc.go (100%) rename {gcp/apis => apis}/v1alpha2/register.go (100%) rename {gcp/apis => apis}/v1alpha2/types.go (100%) rename {gcp/apis => apis}/v1alpha2/types_test.go (100%) rename {gcp/apis => apis}/v1alpha2/zz_generated.deepcopy.go (100%) rename cmd/{crossplane => stack}/main.go (92%) rename pkg/clients/{gcp => }/cloudmemorystore/cloudmemorystore.go (99%) rename pkg/clients/{gcp => }/cloudmemorystore/cloudmemorystore_test.go (99%) rename pkg/clients/{gcp => }/cloudmemorystore/fake/fake.go (97%) rename pkg/clients/{gcp => }/cloudsql/fake/instance.go (96%) rename pkg/clients/{gcp => }/cloudsql/fake/user.go (96%) rename pkg/clients/{gcp => }/cloudsql/instance.go (100%) rename pkg/clients/{gcp => }/cloudsql/user.go (100%) rename pkg/clients/{gcp => }/connection/connection.go (97%) rename pkg/clients/{gcp => }/connection/connection_test.go (98%) rename pkg/clients/{gcp => }/fake/fake.go (95%) rename pkg/clients/{gcp => }/gcp.go (100%) rename pkg/clients/{gcp => }/gcp_test.go (100%) rename pkg/clients/{gcp => }/gke/gke.go (97%) rename pkg/clients/{gcp => }/gke/gke_test.go (100%) rename pkg/clients/{gcp => }/globaladdress/globaladdress.go (96%) rename pkg/clients/{gcp => }/globaladdress/globaladdress_test.go (99%) rename pkg/clients/{gcp => }/integration/integration_test.go (96%) rename pkg/clients/{gcp => }/integration/integration_testing.go (100%) rename pkg/clients/{gcp => }/network/network.go (97%) rename pkg/clients/{gcp => }/network/network_test.go (99%) rename pkg/clients/{gcp => }/storage/bucket.go (100%) rename pkg/clients/{gcp => }/storage/fake/fake.go (96%) rename pkg/clients/{gcp => }/subnetwork/subnetwork.go (97%) rename pkg/clients/{gcp => }/subnetwork/subnetwork_test.go (98%) rename pkg/controller/{gcp => }/cache/claim.go (98%) rename pkg/controller/{gcp => }/cache/claim_test.go (98%) rename pkg/controller/{gcp => }/cache/managed.go (97%) rename pkg/controller/{gcp => }/cache/managed_test.go (98%) rename pkg/controller/{gcp => }/compute/claim.go (98%) rename pkg/controller/{gcp => }/compute/claim_test.go (97%) rename pkg/controller/{gcp => }/compute/gke.go (97%) rename pkg/controller/{gcp => }/compute/gke_test.go (97%) rename pkg/controller/{gcp => }/compute/globaladdress.go (95%) rename pkg/controller/{gcp => }/compute/globaladdress_test.go (98%) rename pkg/controller/{gcp => }/compute/network.go (96%) rename pkg/controller/{gcp => }/compute/network_test.go (99%) rename pkg/controller/{gcp => }/compute/subnetwork.go (96%) rename pkg/controller/{gcp => }/compute/subnetwork_test.go (99%) rename pkg/controller/{gcp => }/database/claim.go (99%) rename pkg/controller/{gcp => }/database/claim_test.go (98%) rename pkg/controller/{gcp => }/database/instance.go (97%) rename pkg/controller/{gcp => }/database/instance_test.go (99%) rename pkg/controller/{gcp => }/database/operations.go (98%) rename pkg/controller/{gcp => }/database/operations_test.go (99%) rename pkg/controller/{gcp => }/gcp.go (82%) rename pkg/controller/{gcp => }/servicenetworking/connection.go (96%) rename pkg/controller/{gcp => }/servicenetworking/connection_test.go (99%) rename pkg/controller/{gcp => }/storage/bucket.go (97%) rename pkg/controller/{gcp => }/storage/bucket_operations.go (97%) rename pkg/controller/{gcp => }/storage/bucket_operations_test.go (98%) rename pkg/controller/{gcp => }/storage/bucket_test.go (99%) rename pkg/controller/{gcp => }/storage/claim.go (98%) rename pkg/controller/{gcp => }/storage/claim_test.go (98%) diff --git a/Makefile b/Makefile index d51343047..27a437a69 100644 --- 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 gcp +GO_SUBDIRS += cmd pkg apis -include build/makelib/golang.mk # ==================================================================================== diff --git a/gcp/apis/cache/cache.go b/apis/cache/cache.go similarity index 100% rename from gcp/apis/cache/cache.go rename to apis/cache/cache.go diff --git a/gcp/apis/cache/v1alpha2/cloudmemorystore_instance_types.go b/apis/cache/v1alpha2/cloudmemorystore_instance_types.go similarity index 100% rename from gcp/apis/cache/v1alpha2/cloudmemorystore_instance_types.go rename to apis/cache/v1alpha2/cloudmemorystore_instance_types.go diff --git a/gcp/apis/cache/v1alpha2/cloudmemorystore_instance_types_test.go b/apis/cache/v1alpha2/cloudmemorystore_instance_types_test.go similarity index 100% rename from gcp/apis/cache/v1alpha2/cloudmemorystore_instance_types_test.go rename to apis/cache/v1alpha2/cloudmemorystore_instance_types_test.go diff --git a/gcp/apis/cache/v1alpha2/doc.go b/apis/cache/v1alpha2/doc.go similarity index 100% rename from gcp/apis/cache/v1alpha2/doc.go rename to apis/cache/v1alpha2/doc.go diff --git a/gcp/apis/cache/v1alpha2/register.go b/apis/cache/v1alpha2/register.go similarity index 100% rename from gcp/apis/cache/v1alpha2/register.go rename to apis/cache/v1alpha2/register.go diff --git a/gcp/apis/cache/v1alpha2/zz_generated.deepcopy.go b/apis/cache/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/cache/v1alpha2/zz_generated.deepcopy.go rename to apis/cache/v1alpha2/zz_generated.deepcopy.go diff --git a/gcp/apis/compute/compute.go b/apis/compute/compute.go similarity index 100% rename from gcp/apis/compute/compute.go rename to apis/compute/compute.go diff --git a/gcp/apis/compute/v1alpha2/doc.go b/apis/compute/v1alpha2/doc.go similarity index 100% rename from gcp/apis/compute/v1alpha2/doc.go rename to apis/compute/v1alpha2/doc.go diff --git a/gcp/apis/compute/v1alpha2/gkecluster_types.go b/apis/compute/v1alpha2/gkecluster_types.go similarity index 100% rename from gcp/apis/compute/v1alpha2/gkecluster_types.go rename to apis/compute/v1alpha2/gkecluster_types.go diff --git a/gcp/apis/compute/v1alpha2/gkecluster_types_test.go b/apis/compute/v1alpha2/gkecluster_types_test.go similarity index 100% rename from gcp/apis/compute/v1alpha2/gkecluster_types_test.go rename to apis/compute/v1alpha2/gkecluster_types_test.go diff --git a/gcp/apis/compute/v1alpha2/globaladdress_types.go b/apis/compute/v1alpha2/globaladdress_types.go similarity index 100% rename from gcp/apis/compute/v1alpha2/globaladdress_types.go rename to apis/compute/v1alpha2/globaladdress_types.go diff --git a/gcp/apis/compute/v1alpha2/network_types.go b/apis/compute/v1alpha2/network_types.go similarity index 100% rename from gcp/apis/compute/v1alpha2/network_types.go rename to apis/compute/v1alpha2/network_types.go diff --git a/gcp/apis/compute/v1alpha2/network_types_test.go b/apis/compute/v1alpha2/network_types_test.go similarity index 100% rename from gcp/apis/compute/v1alpha2/network_types_test.go rename to apis/compute/v1alpha2/network_types_test.go diff --git a/gcp/apis/compute/v1alpha2/register.go b/apis/compute/v1alpha2/register.go similarity index 100% rename from gcp/apis/compute/v1alpha2/register.go rename to apis/compute/v1alpha2/register.go diff --git a/gcp/apis/compute/v1alpha2/subnetwork_types.go b/apis/compute/v1alpha2/subnetwork_types.go similarity index 100% rename from gcp/apis/compute/v1alpha2/subnetwork_types.go rename to apis/compute/v1alpha2/subnetwork_types.go diff --git a/gcp/apis/compute/v1alpha2/subnetwork_types_test.go b/apis/compute/v1alpha2/subnetwork_types_test.go similarity index 100% rename from gcp/apis/compute/v1alpha2/subnetwork_types_test.go rename to apis/compute/v1alpha2/subnetwork_types_test.go diff --git a/gcp/apis/compute/v1alpha2/zz_generated.deepcopy.go b/apis/compute/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/compute/v1alpha2/zz_generated.deepcopy.go rename to apis/compute/v1alpha2/zz_generated.deepcopy.go diff --git a/gcp/apis/database/database.go b/apis/database/database.go similarity index 100% rename from gcp/apis/database/database.go rename to apis/database/database.go diff --git a/gcp/apis/database/v1alpha2/cloudsql_instance_types.go b/apis/database/v1alpha2/cloudsql_instance_types.go similarity index 100% rename from gcp/apis/database/v1alpha2/cloudsql_instance_types.go rename to apis/database/v1alpha2/cloudsql_instance_types.go diff --git a/gcp/apis/database/v1alpha2/cloudsql_instance_types_test.go b/apis/database/v1alpha2/cloudsql_instance_types_test.go similarity index 100% rename from gcp/apis/database/v1alpha2/cloudsql_instance_types_test.go rename to apis/database/v1alpha2/cloudsql_instance_types_test.go diff --git a/gcp/apis/database/v1alpha2/doc.go b/apis/database/v1alpha2/doc.go similarity index 100% rename from gcp/apis/database/v1alpha2/doc.go rename to apis/database/v1alpha2/doc.go diff --git a/gcp/apis/database/v1alpha2/register.go b/apis/database/v1alpha2/register.go similarity index 100% rename from gcp/apis/database/v1alpha2/register.go rename to apis/database/v1alpha2/register.go diff --git a/gcp/apis/database/v1alpha2/zz_generated.deepcopy.go b/apis/database/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/database/v1alpha2/zz_generated.deepcopy.go rename to apis/database/v1alpha2/zz_generated.deepcopy.go diff --git a/gcp/apis/gcp.go b/apis/gcp.go similarity index 69% rename from gcp/apis/gcp.go rename to apis/gcp.go index 0ad92a157..03f8525f4 100644 --- a/gcp/apis/gcp.go +++ b/apis/gcp.go @@ -15,7 +15,7 @@ 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 for GCP cloud provider. package apis @@ -23,12 +23,12 @@ package apis import ( "k8s.io/apimachinery/pkg/runtime" - cachev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" - computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - databasev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - servicenetworkingv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2" - storagev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + cachev1alpha2 "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" + computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + databasev1alpha2 "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + servicenetworkingv1alpha2 "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2" + storagev1alpha2 "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) func init() { diff --git a/gcp/apis/gcp_test.go b/apis/gcp_test.go similarity index 77% rename from gcp/apis/gcp_test.go rename to apis/gcp_test.go index de06e89c9..d5cc24694 100644 --- a/gcp/apis/gcp_test.go +++ b/apis/gcp_test.go @@ -20,11 +20,11 @@ package apis import ( "testing" - cachev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" - computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - databasev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - storagev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + cachev1alpha2 "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" + computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + databasev1alpha2 "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + storagev1alpha2 "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/gcp/apis/servicenetworking/servicenetworking.go b/apis/servicenetworking/servicenetworking.go similarity index 100% rename from gcp/apis/servicenetworking/servicenetworking.go rename to apis/servicenetworking/servicenetworking.go diff --git a/gcp/apis/servicenetworking/v1alpha2/connection_types.go b/apis/servicenetworking/v1alpha2/connection_types.go similarity index 100% rename from gcp/apis/servicenetworking/v1alpha2/connection_types.go rename to apis/servicenetworking/v1alpha2/connection_types.go diff --git a/gcp/apis/servicenetworking/v1alpha2/doc.go b/apis/servicenetworking/v1alpha2/doc.go similarity index 100% rename from gcp/apis/servicenetworking/v1alpha2/doc.go rename to apis/servicenetworking/v1alpha2/doc.go diff --git a/gcp/apis/servicenetworking/v1alpha2/register.go b/apis/servicenetworking/v1alpha2/register.go similarity index 100% rename from gcp/apis/servicenetworking/v1alpha2/register.go rename to apis/servicenetworking/v1alpha2/register.go diff --git a/gcp/apis/servicenetworking/v1alpha2/zz_generated.deepcopy.go b/apis/servicenetworking/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/servicenetworking/v1alpha2/zz_generated.deepcopy.go rename to apis/servicenetworking/v1alpha2/zz_generated.deepcopy.go diff --git a/gcp/apis/storage/storage.go b/apis/storage/storage.go similarity index 100% rename from gcp/apis/storage/storage.go rename to apis/storage/storage.go diff --git a/gcp/apis/storage/v1alpha2/doc.go b/apis/storage/v1alpha2/doc.go similarity index 100% rename from gcp/apis/storage/v1alpha2/doc.go rename to apis/storage/v1alpha2/doc.go diff --git a/gcp/apis/storage/v1alpha2/register.go b/apis/storage/v1alpha2/register.go similarity index 100% rename from gcp/apis/storage/v1alpha2/register.go rename to apis/storage/v1alpha2/register.go diff --git a/gcp/apis/storage/v1alpha2/types.go b/apis/storage/v1alpha2/types.go similarity index 100% rename from gcp/apis/storage/v1alpha2/types.go rename to apis/storage/v1alpha2/types.go diff --git a/gcp/apis/storage/v1alpha2/types_test.go b/apis/storage/v1alpha2/types_test.go similarity index 100% rename from gcp/apis/storage/v1alpha2/types_test.go rename to apis/storage/v1alpha2/types_test.go diff --git a/gcp/apis/storage/v1alpha2/zz_generated.deepcopy.go b/apis/storage/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/storage/v1alpha2/zz_generated.deepcopy.go rename to apis/storage/v1alpha2/zz_generated.deepcopy.go diff --git a/gcp/apis/v1alpha2/doc.go b/apis/v1alpha2/doc.go similarity index 100% rename from gcp/apis/v1alpha2/doc.go rename to apis/v1alpha2/doc.go diff --git a/gcp/apis/v1alpha2/register.go b/apis/v1alpha2/register.go similarity index 100% rename from gcp/apis/v1alpha2/register.go rename to apis/v1alpha2/register.go diff --git a/gcp/apis/v1alpha2/types.go b/apis/v1alpha2/types.go similarity index 100% rename from gcp/apis/v1alpha2/types.go rename to apis/v1alpha2/types.go diff --git a/gcp/apis/v1alpha2/types_test.go b/apis/v1alpha2/types_test.go similarity index 100% rename from gcp/apis/v1alpha2/types_test.go rename to apis/v1alpha2/types_test.go diff --git a/gcp/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from gcp/apis/v1alpha2/zz_generated.deepcopy.go rename to apis/v1alpha2/zz_generated.deepcopy.go diff --git a/cluster/images/stack-gcp/Dockerfile b/cluster/images/stack-gcp/Dockerfile index 24a6248ac..0ecefdc68 100644 --- a/cluster/images/stack-gcp/Dockerfile +++ b/cluster/images/stack-gcp/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-gcp-stack COPY stack-package / EXPOSE 8080 -ENTRYPOINT ["crossplane"] +ENTRYPOINT ["crossplane-gcp-stack"] diff --git a/cluster/images/stack-gcp/Makefile b/cluster/images/stack-gcp/Makefile index 48a4eca7f..f40db7a3e 100755 --- a/cluster/images/stack-gcp/Makefile +++ b/cluster/images/stack-gcp/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 b/cmd/stack/main.go similarity index 92% rename from cmd/crossplane/main.go rename to cmd/stack/main.go index 120c50d47..b58a854d9 100644 --- a/cmd/crossplane/main.go +++ b/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" - "github.com/crossplaneio/crossplane-runtime/pkg/logging" - "github.com/crossplaneio/crossplane/apis" + "github.com/crossplaneio/stack-gcp/apis" + "github.com/crossplaneio/stack-gcp/pkg/controller" - gcpapis "github.com/crossplaneio/stack-gcp/gcp/apis" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp" + "github.com/crossplaneio/crossplane-runtime/pkg/logging" + crossplaneapis "github.com/crossplaneio/crossplane/apis" ) func main() { @@ -105,7 +105,7 @@ func main() { } func controllerSetupWithManager(mgr manager.Manager) error { - if err := (&gcp.Controllers{}).SetupWithManager(mgr); err != nil { + if err := (&controller.Controllers{}).SetupWithManager(mgr); err != nil { return err } @@ -118,7 +118,7 @@ func addToScheme(scheme *runtime.Scheme) error { return err } - if err := gcpapis.AddToScheme(scheme); err != nil { + if err := crossplaneapis.AddToScheme(scheme); err != nil { return err } diff --git a/pkg/clients/gcp/cloudmemorystore/cloudmemorystore.go b/pkg/clients/cloudmemorystore/cloudmemorystore.go similarity index 99% rename from pkg/clients/gcp/cloudmemorystore/cloudmemorystore.go rename to pkg/clients/cloudmemorystore/cloudmemorystore.go index 499eeddb6..32704195c 100644 --- a/pkg/clients/gcp/cloudmemorystore/cloudmemorystore.go +++ b/pkg/clients/cloudmemorystore/cloudmemorystore.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" ) // NamePrefix is the prefix for all created CloudMemorystore instances. diff --git a/pkg/clients/gcp/cloudmemorystore/cloudmemorystore_test.go b/pkg/clients/cloudmemorystore/cloudmemorystore_test.go similarity index 99% rename from pkg/clients/gcp/cloudmemorystore/cloudmemorystore_test.go rename to pkg/clients/cloudmemorystore/cloudmemorystore_test.go index 0211db081..efe9a18b6 100644 --- a/pkg/clients/gcp/cloudmemorystore/cloudmemorystore_test.go +++ b/pkg/clients/cloudmemorystore/cloudmemorystore_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" ) const ( diff --git a/pkg/clients/gcp/cloudmemorystore/fake/fake.go b/pkg/clients/cloudmemorystore/fake/fake.go similarity index 97% rename from pkg/clients/gcp/cloudmemorystore/fake/fake.go rename to pkg/clients/cloudmemorystore/fake/fake.go index fc0aeae01..6073b2901 100644 --- a/pkg/clients/gcp/cloudmemorystore/fake/fake.go +++ b/pkg/clients/cloudmemorystore/fake/fake.go @@ -23,7 +23,7 @@ import ( gax "github.com/googleapis/gax-go" redisv1pb "google.golang.org/genproto/googleapis/cloud/redis/v1" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore" ) var _ cloudmemorystore.Client = &MockClient{} diff --git a/pkg/clients/gcp/cloudsql/fake/instance.go b/pkg/clients/cloudsql/fake/instance.go similarity index 96% rename from pkg/clients/gcp/cloudsql/fake/instance.go rename to pkg/clients/cloudsql/fake/instance.go index 1646f153c..f741c9d43 100644 --- a/pkg/clients/gcp/cloudsql/fake/instance.go +++ b/pkg/clients/cloudsql/fake/instance.go @@ -21,7 +21,7 @@ import ( sqladmin "google.golang.org/api/sqladmin/v1beta4" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql" ) // MockInstanceClient for testing purposes diff --git a/pkg/clients/gcp/cloudsql/fake/user.go b/pkg/clients/cloudsql/fake/user.go similarity index 96% rename from pkg/clients/gcp/cloudsql/fake/user.go rename to pkg/clients/cloudsql/fake/user.go index d65f8a1b2..8245bc777 100644 --- a/pkg/clients/gcp/cloudsql/fake/user.go +++ b/pkg/clients/cloudsql/fake/user.go @@ -19,7 +19,7 @@ package fake import ( "context" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql" sqladmin "google.golang.org/api/sqladmin/v1beta4" ) diff --git a/pkg/clients/gcp/cloudsql/instance.go b/pkg/clients/cloudsql/instance.go similarity index 100% rename from pkg/clients/gcp/cloudsql/instance.go rename to pkg/clients/cloudsql/instance.go diff --git a/pkg/clients/gcp/cloudsql/user.go b/pkg/clients/cloudsql/user.go similarity index 100% rename from pkg/clients/gcp/cloudsql/user.go rename to pkg/clients/cloudsql/user.go diff --git a/pkg/clients/gcp/connection/connection.go b/pkg/clients/connection/connection.go similarity index 97% rename from pkg/clients/gcp/connection/connection.go rename to pkg/clients/connection/connection.go index 1a552583d..ab61d1ada 100644 --- a/pkg/clients/gcp/connection/connection.go +++ b/pkg/clients/connection/connection.go @@ -24,7 +24,7 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2" ) // VPC Network peering states. diff --git a/pkg/clients/gcp/connection/connection_test.go b/pkg/clients/connection/connection_test.go similarity index 98% rename from pkg/clients/gcp/connection/connection_test.go rename to pkg/clients/connection/connection_test.go index 6ee5d6bed..6edb43eab 100644 --- a/pkg/clients/gcp/connection/connection_test.go +++ b/pkg/clients/connection/connection_test.go @@ -26,7 +26,7 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2" ) func TestFromParameters(t *testing.T) { diff --git a/pkg/clients/gcp/fake/fake.go b/pkg/clients/fake/fake.go similarity index 95% rename from pkg/clients/gcp/fake/fake.go rename to pkg/clients/fake/fake.go index e6392497a..5153776df 100644 --- a/pkg/clients/gcp/fake/fake.go +++ b/pkg/clients/fake/fake.go @@ -19,7 +19,7 @@ package fake import ( "google.golang.org/api/container/v1" - computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) // GKEClient for mocking. diff --git a/pkg/clients/gcp/gcp.go b/pkg/clients/gcp.go similarity index 100% rename from pkg/clients/gcp/gcp.go rename to pkg/clients/gcp.go diff --git a/pkg/clients/gcp/gcp_test.go b/pkg/clients/gcp_test.go similarity index 100% rename from pkg/clients/gcp/gcp_test.go rename to pkg/clients/gcp_test.go diff --git a/pkg/clients/gcp/gke/gke.go b/pkg/clients/gke/gke.go similarity index 97% rename from pkg/clients/gcp/gke/gke.go rename to pkg/clients/gke/gke.go index 6474399bd..0b4f3c9d8 100644 --- a/pkg/clients/gcp/gke/gke.go +++ b/pkg/clients/gke/gke.go @@ -24,8 +24,8 @@ import ( "google.golang.org/api/container/v1" "google.golang.org/api/option" - computev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" + computev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcp "github.com/crossplaneio/stack-gcp/pkg/clients" ) const ( diff --git a/pkg/clients/gcp/gke/gke_test.go b/pkg/clients/gke/gke_test.go similarity index 100% rename from pkg/clients/gcp/gke/gke_test.go rename to pkg/clients/gke/gke_test.go diff --git a/pkg/clients/gcp/globaladdress/globaladdress.go b/pkg/clients/globaladdress/globaladdress.go similarity index 96% rename from pkg/clients/gcp/globaladdress/globaladdress.go rename to pkg/clients/globaladdress/globaladdress.go index d347273e1..18a99f6c7 100644 --- a/pkg/clients/gcp/globaladdress/globaladdress.go +++ b/pkg/clients/globaladdress/globaladdress.go @@ -21,8 +21,8 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcp "github.com/crossplaneio/stack-gcp/pkg/clients" ) // Known Address statuses. diff --git a/pkg/clients/gcp/globaladdress/globaladdress_test.go b/pkg/clients/globaladdress/globaladdress_test.go similarity index 99% rename from pkg/clients/gcp/globaladdress/globaladdress_test.go rename to pkg/clients/globaladdress/globaladdress_test.go index 2b61352b2..10d5d3149 100644 --- a/pkg/clients/gcp/globaladdress/globaladdress_test.go +++ b/pkg/clients/globaladdress/globaladdress_test.go @@ -25,7 +25,7 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) func TestFromParameters(t *testing.T) { diff --git a/pkg/clients/gcp/integration/integration_test.go b/pkg/clients/integration/integration_test.go similarity index 96% rename from pkg/clients/gcp/integration/integration_test.go rename to pkg/clients/integration/integration_test.go index 765e21d71..f367f07c5 100644 --- a/pkg/clients/gcp/integration/integration_test.go +++ b/pkg/clients/integration/integration_test.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/gomega" - . "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" + . "github.com/crossplaneio/stack-gcp/pkg/clients" ) func TestProject(t *testing.T) { diff --git a/pkg/clients/gcp/integration/integration_testing.go b/pkg/clients/integration/integration_testing.go similarity index 100% rename from pkg/clients/gcp/integration/integration_testing.go rename to pkg/clients/integration/integration_testing.go diff --git a/pkg/clients/gcp/network/network.go b/pkg/clients/network/network.go similarity index 97% rename from pkg/clients/gcp/network/network.go rename to pkg/clients/network/network.go index 09fc021b1..2819d603d 100644 --- a/pkg/clients/gcp/network/network.go +++ b/pkg/clients/network/network.go @@ -19,7 +19,7 @@ package network import ( googlecompute "google.golang.org/api/compute/v1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) // GenerateNetwork takes a *NetworkParameters and returns *googlecompute.Network. diff --git a/pkg/clients/gcp/network/network_test.go b/pkg/clients/network/network_test.go similarity index 99% rename from pkg/clients/gcp/network/network_test.go rename to pkg/clients/network/network_test.go index f2f55baaf..e6f180f13 100644 --- a/pkg/clients/gcp/network/network_test.go +++ b/pkg/clients/network/network_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" "google.golang.org/api/compute/v1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) const ( diff --git a/pkg/clients/gcp/storage/bucket.go b/pkg/clients/storage/bucket.go similarity index 100% rename from pkg/clients/gcp/storage/bucket.go rename to pkg/clients/storage/bucket.go diff --git a/pkg/clients/gcp/storage/fake/fake.go b/pkg/clients/storage/fake/fake.go similarity index 96% rename from pkg/clients/gcp/storage/fake/fake.go rename to pkg/clients/storage/fake/fake.go index add431011..7f317c6d8 100644 --- a/pkg/clients/gcp/storage/fake/fake.go +++ b/pkg/clients/storage/fake/fake.go @@ -21,7 +21,7 @@ import ( "cloud.google.com/go/storage" - gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage" + gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/storage" ) // MockBucketClient Client interface implementation diff --git a/pkg/clients/gcp/subnetwork/subnetwork.go b/pkg/clients/subnetwork/subnetwork.go similarity index 97% rename from pkg/clients/gcp/subnetwork/subnetwork.go rename to pkg/clients/subnetwork/subnetwork.go index 028a45cf5..a9477216b 100644 --- a/pkg/clients/gcp/subnetwork/subnetwork.go +++ b/pkg/clients/subnetwork/subnetwork.go @@ -19,7 +19,7 @@ package subnetwork import ( "google.golang.org/api/compute/v1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) // GenerateSubnetwork creates a *googlecompute.Subnetwork object using SubnetworkParameters. diff --git a/pkg/clients/gcp/subnetwork/subnetwork_test.go b/pkg/clients/subnetwork/subnetwork_test.go similarity index 98% rename from pkg/clients/gcp/subnetwork/subnetwork_test.go rename to pkg/clients/subnetwork/subnetwork_test.go index 7c2f90805..b252df0f0 100644 --- a/pkg/clients/gcp/subnetwork/subnetwork_test.go +++ b/pkg/clients/subnetwork/subnetwork_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/api/compute/v1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) const ( diff --git a/pkg/controller/gcp/cache/claim.go b/pkg/controller/cache/claim.go similarity index 98% rename from pkg/controller/gcp/cache/claim.go rename to pkg/controller/cache/claim.go index cd6efecd5..d59b85ad8 100644 --- a/pkg/controller/gcp/cache/claim.go +++ b/pkg/controller/cache/claim.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" cachev1alpha1 "github.com/crossplaneio/crossplane/apis/cache/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" ) // CloudMemorystoreInstanceClaimController is responsible for adding the Cloud Memorystore diff --git a/pkg/controller/gcp/cache/claim_test.go b/pkg/controller/cache/claim_test.go similarity index 98% rename from pkg/controller/gcp/cache/claim_test.go rename to pkg/controller/cache/claim_test.go index e84e91b63..50ccf7e28 100644 --- a/pkg/controller/gcp/cache/claim_test.go +++ b/pkg/controller/cache/claim_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/test" cachev1alpha1 "github.com/crossplaneio/crossplane/apis/cache/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" ) var _ resource.ManagedConfigurator = resource.ManagedConfiguratorFn(ConfigureCloudMemorystoreInstance) diff --git a/pkg/controller/gcp/cache/managed.go b/pkg/controller/cache/managed.go similarity index 97% rename from pkg/controller/gcp/cache/managed.go rename to pkg/controller/cache/managed.go index ac45264c9..e30378a6d 100644 --- a/pkg/controller/gcp/cache/managed.go +++ b/pkg/controller/cache/managed.go @@ -31,9 +31,9 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" "github.com/crossplaneio/crossplane-runtime/pkg/resource" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore" ) // Error strings. diff --git a/pkg/controller/gcp/cache/managed_test.go b/pkg/controller/cache/managed_test.go similarity index 98% rename from pkg/controller/gcp/cache/managed_test.go rename to pkg/controller/cache/managed_test.go index 523450ff1..0d45e4e54 100644 --- a/pkg/controller/gcp/cache/managed_test.go +++ b/pkg/controller/cache/managed_test.go @@ -37,10 +37,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/cache/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudmemorystore/fake" + "github.com/crossplaneio/stack-gcp/apis/cache/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudmemorystore/fake" ) const ( diff --git a/pkg/controller/gcp/compute/claim.go b/pkg/controller/compute/claim.go similarity index 98% rename from pkg/controller/gcp/compute/claim.go rename to pkg/controller/compute/claim.go index 1ad09be16..b226f138c 100644 --- a/pkg/controller/gcp/compute/claim.go +++ b/pkg/controller/compute/claim.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" computev1alpha1 "github.com/crossplaneio/crossplane/apis/compute/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) // GKEClusterClaimController is responsible for adding the GKECluster diff --git a/pkg/controller/gcp/compute/claim_test.go b/pkg/controller/compute/claim_test.go similarity index 97% rename from pkg/controller/gcp/compute/claim_test.go rename to pkg/controller/compute/claim_test.go index 3ea7801e7..dcf8e54b8 100644 --- a/pkg/controller/gcp/compute/claim_test.go +++ b/pkg/controller/compute/claim_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/test" computev1alpha1 "github.com/crossplaneio/crossplane/apis/compute/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" ) var _ resource.ManagedConfigurator = resource.ManagedConfiguratorFn(ConfigureGKECluster) diff --git a/pkg/controller/gcp/compute/gke.go b/pkg/controller/compute/gke.go similarity index 97% rename from pkg/controller/gcp/compute/gke.go rename to pkg/controller/compute/gke.go index 744c4d499..5214c0af3 100644 --- a/pkg/controller/gcp/compute/gke.go +++ b/pkg/controller/compute/gke.go @@ -40,10 +40,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/util" - gcpcomputev1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/gke" + gcpcomputev1alpha2 "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + gcp "github.com/crossplaneio/stack-gcp/pkg/clients" + "github.com/crossplaneio/stack-gcp/pkg/clients/gke" ) const ( diff --git a/pkg/controller/gcp/compute/gke_test.go b/pkg/controller/compute/gke_test.go similarity index 97% rename from pkg/controller/gcp/compute/gke_test.go rename to pkg/controller/compute/gke_test.go index 32f4a4596..3827ef1b0 100644 --- a/pkg/controller/gcp/compute/gke_test.go +++ b/pkg/controller/compute/gke_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/crossplaneio/stack-gcp/gcp/apis" + "github.com/crossplaneio/stack-gcp/apis" "github.com/google/go-cmp/cmp" . "github.com/onsi/gomega" @@ -39,9 +39,9 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - . "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/fake" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/gke" + . "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/fake" + "github.com/crossplaneio/stack-gcp/pkg/clients/gke" ) const ( diff --git a/pkg/controller/gcp/compute/globaladdress.go b/pkg/controller/compute/globaladdress.go similarity index 95% rename from pkg/controller/gcp/compute/globaladdress.go rename to pkg/controller/compute/globaladdress.go index d49cd6fbf..a8ca9c595 100644 --- a/pkg/controller/gcp/compute/globaladdress.go +++ b/pkg/controller/compute/globaladdress.go @@ -33,10 +33,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" "github.com/crossplaneio/crossplane-runtime/pkg/resource" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/globaladdress" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + gcp "github.com/crossplaneio/stack-gcp/pkg/clients" + "github.com/crossplaneio/stack-gcp/pkg/clients/globaladdress" ) // Error strings. diff --git a/pkg/controller/gcp/compute/globaladdress_test.go b/pkg/controller/compute/globaladdress_test.go similarity index 98% rename from pkg/controller/gcp/compute/globaladdress_test.go rename to pkg/controller/compute/globaladdress_test.go index 1622b5b2a..1de658dd8 100644 --- a/pkg/controller/gcp/compute/globaladdress_test.go +++ b/pkg/controller/compute/globaladdress_test.go @@ -36,8 +36,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) var ( diff --git a/pkg/controller/gcp/compute/network.go b/pkg/controller/compute/network.go similarity index 96% rename from pkg/controller/gcp/compute/network.go rename to pkg/controller/compute/network.go index 88543accd..0e9ed005a 100644 --- a/pkg/controller/gcp/compute/network.go +++ b/pkg/controller/compute/network.go @@ -32,10 +32,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" "github.com/crossplaneio/crossplane-runtime/pkg/resource" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - apisv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - clients "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/network" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + apisv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + clients "github.com/crossplaneio/stack-gcp/pkg/clients" + "github.com/crossplaneio/stack-gcp/pkg/clients/network" ) const ( diff --git a/pkg/controller/gcp/compute/network_test.go b/pkg/controller/compute/network_test.go similarity index 99% rename from pkg/controller/gcp/compute/network_test.go rename to pkg/controller/compute/network_test.go index c0fc7b498..20e116d74 100644 --- a/pkg/controller/gcp/compute/network_test.go +++ b/pkg/controller/compute/network_test.go @@ -37,8 +37,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - apisv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + apisv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) const ( diff --git a/pkg/controller/gcp/compute/subnetwork.go b/pkg/controller/compute/subnetwork.go similarity index 96% rename from pkg/controller/gcp/compute/subnetwork.go rename to pkg/controller/compute/subnetwork.go index c44c219a8..ffd2ca380 100644 --- a/pkg/controller/gcp/compute/subnetwork.go +++ b/pkg/controller/compute/subnetwork.go @@ -32,10 +32,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" "github.com/crossplaneio/crossplane-runtime/pkg/resource" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - gcpapis "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - clients "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/subnetwork" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcpapis "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + clients "github.com/crossplaneio/stack-gcp/pkg/clients" + "github.com/crossplaneio/stack-gcp/pkg/clients/subnetwork" ) const ( diff --git a/pkg/controller/gcp/compute/subnetwork_test.go b/pkg/controller/compute/subnetwork_test.go similarity index 99% rename from pkg/controller/gcp/compute/subnetwork_test.go rename to pkg/controller/compute/subnetwork_test.go index 925dc3b54..75d4da243 100644 --- a/pkg/controller/gcp/compute/subnetwork_test.go +++ b/pkg/controller/compute/subnetwork_test.go @@ -37,8 +37,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/compute/v1alpha2" - gcpapis "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/compute/v1alpha2" + gcpapis "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) const ( diff --git a/pkg/controller/gcp/database/claim.go b/pkg/controller/database/claim.go similarity index 99% rename from pkg/controller/gcp/database/claim.go rename to pkg/controller/database/claim.go index 2cf506b02..b0219b1db 100644 --- a/pkg/controller/gcp/database/claim.go +++ b/pkg/controller/database/claim.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" databasev1alpha1 "github.com/crossplaneio/crossplane/apis/database/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" ) // PostgreSQLInstanceClaimController is responsible for adding the PostgreSQLInstance diff --git a/pkg/controller/gcp/database/claim_test.go b/pkg/controller/database/claim_test.go similarity index 98% rename from pkg/controller/gcp/database/claim_test.go rename to pkg/controller/database/claim_test.go index b434ee68a..0ec0465e4 100644 --- a/pkg/controller/gcp/database/claim_test.go +++ b/pkg/controller/database/claim_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/test" databasev1alpha1 "github.com/crossplaneio/crossplane/apis/database/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" ) var ( diff --git a/pkg/controller/gcp/database/instance.go b/pkg/controller/database/instance.go similarity index 97% rename from pkg/controller/gcp/database/instance.go rename to pkg/controller/database/instance.go index 05751620c..e5d15dae5 100644 --- a/pkg/controller/gcp/database/instance.go +++ b/pkg/controller/database/instance.go @@ -31,9 +31,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql" "github.com/crossplaneio/stack-gcp/pkg/util/googleapi" "github.com/crossplaneio/crossplane-runtime/pkg/logging" diff --git a/pkg/controller/gcp/database/instance_test.go b/pkg/controller/database/instance_test.go similarity index 99% rename from pkg/controller/gcp/database/instance_test.go rename to pkg/controller/database/instance_test.go index 72c3ba667..610d6ca20 100644 --- a/pkg/controller/gcp/database/instance_test.go +++ b/pkg/controller/database/instance_test.go @@ -20,8 +20,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) type mockCreateUpdater struct { diff --git a/pkg/controller/gcp/database/operations.go b/pkg/controller/database/operations.go similarity index 98% rename from pkg/controller/gcp/database/operations.go rename to pkg/controller/database/operations.go index 081302d32..b3501bb27 100644 --- a/pkg/controller/gcp/database/operations.go +++ b/pkg/controller/database/operations.go @@ -34,8 +34,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" runtimeutil "github.com/crossplaneio/crossplane-runtime/pkg/util" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql" ) type localOperations interface { diff --git a/pkg/controller/gcp/database/operations_test.go b/pkg/controller/database/operations_test.go similarity index 99% rename from pkg/controller/gcp/database/operations_test.go rename to pkg/controller/database/operations_test.go index 0926099e6..61d4b5772 100644 --- a/pkg/controller/gcp/database/operations_test.go +++ b/pkg/controller/database/operations_test.go @@ -23,9 +23,9 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/database/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/cloudsql/fake" + "github.com/crossplaneio/stack-gcp/apis/database/v1alpha2" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql" + "github.com/crossplaneio/stack-gcp/pkg/clients/cloudsql/fake" ) const ( diff --git a/pkg/controller/gcp/gcp.go b/pkg/controller/gcp.go similarity index 82% rename from pkg/controller/gcp/gcp.go rename to pkg/controller/gcp.go index 3a645e84c..82336dcf1 100644 --- a/pkg/controller/gcp/gcp.go +++ b/pkg/controller/gcp.go @@ -14,16 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -package gcp +package controller import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp/cache" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp/compute" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp/database" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp/servicenetworking" - "github.com/crossplaneio/stack-gcp/pkg/controller/gcp/storage" + "github.com/crossplaneio/stack-gcp/pkg/controller/cache" + "github.com/crossplaneio/stack-gcp/pkg/controller/compute" + "github.com/crossplaneio/stack-gcp/pkg/controller/database" + "github.com/crossplaneio/stack-gcp/pkg/controller/servicenetworking" + "github.com/crossplaneio/stack-gcp/pkg/controller/storage" ) // Controllers passes down config and adds individual controllers to the manager. diff --git a/pkg/controller/gcp/servicenetworking/connection.go b/pkg/controller/servicenetworking/connection.go similarity index 96% rename from pkg/controller/gcp/servicenetworking/connection.go rename to pkg/controller/servicenetworking/connection.go index 0b066d4a6..bbb512098 100644 --- a/pkg/controller/gcp/servicenetworking/connection.go +++ b/pkg/controller/servicenetworking/connection.go @@ -35,10 +35,10 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/meta" "github.com/crossplaneio/crossplane-runtime/pkg/resource" - "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp" - "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/connection" + "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + gcp "github.com/crossplaneio/stack-gcp/pkg/clients" + "github.com/crossplaneio/stack-gcp/pkg/clients/connection" ) // Error strings. diff --git a/pkg/controller/gcp/servicenetworking/connection_test.go b/pkg/controller/servicenetworking/connection_test.go similarity index 99% rename from pkg/controller/gcp/servicenetworking/connection_test.go rename to pkg/controller/servicenetworking/connection_test.go index ecef4c12e..71a9b2b98 100644 --- a/pkg/controller/gcp/servicenetworking/connection_test.go +++ b/pkg/controller/servicenetworking/connection_test.go @@ -37,8 +37,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/servicenetworking/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/servicenetworking/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) var ( diff --git a/pkg/controller/gcp/storage/bucket.go b/pkg/controller/storage/bucket.go similarity index 97% rename from pkg/controller/gcp/storage/bucket.go rename to pkg/controller/storage/bucket.go index 544d86bd6..93c942641 100644 --- a/pkg/controller/gcp/storage/bucket.go +++ b/pkg/controller/storage/bucket.go @@ -36,9 +36,9 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/logging" "github.com/crossplaneio/crossplane-runtime/pkg/meta" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" - gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" + gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/storage" ) const ( diff --git a/pkg/controller/gcp/storage/bucket_operations.go b/pkg/controller/storage/bucket_operations.go similarity index 97% rename from pkg/controller/gcp/storage/bucket_operations.go rename to pkg/controller/storage/bucket_operations.go index 024c09f61..523ab893d 100644 --- a/pkg/controller/gcp/storage/bucket_operations.go +++ b/pkg/controller/storage/bucket_operations.go @@ -30,8 +30,8 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" "github.com/crossplaneio/crossplane-runtime/pkg/util" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/storage" ) type operations interface { diff --git a/pkg/controller/gcp/storage/bucket_operations_test.go b/pkg/controller/storage/bucket_operations_test.go similarity index 98% rename from pkg/controller/gcp/storage/bucket_operations_test.go rename to pkg/controller/storage/bucket_operations_test.go index 1b9baf1f1..bdf4e6a1f 100644 --- a/pkg/controller/gcp/storage/bucket_operations_test.go +++ b/pkg/controller/storage/bucket_operations_test.go @@ -32,9 +32,9 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage" - storagefake "github.com/crossplaneio/stack-gcp/pkg/clients/gcp/storage/fake" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpstorage "github.com/crossplaneio/stack-gcp/pkg/clients/storage" + storagefake "github.com/crossplaneio/stack-gcp/pkg/clients/storage/fake" ) type mockOperations struct { diff --git a/pkg/controller/gcp/storage/bucket_test.go b/pkg/controller/storage/bucket_test.go similarity index 99% rename from pkg/controller/gcp/storage/bucket_test.go rename to pkg/controller/storage/bucket_test.go index 98c1e282c..b2891274a 100644 --- a/pkg/controller/gcp/storage/bucket_test.go +++ b/pkg/controller/storage/bucket_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/crossplaneio/stack-gcp/gcp/apis" + "github.com/crossplaneio/stack-gcp/apis" "cloud.google.com/go/storage" "github.com/google/go-cmp/cmp" @@ -41,8 +41,8 @@ import ( runtimev1alpha1 "github.com/crossplaneio/crossplane-runtime/apis/core/v1alpha1" "github.com/crossplaneio/crossplane-runtime/pkg/test" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" - gcpv1alpha2 "github.com/crossplaneio/stack-gcp/gcp/apis/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" + gcpv1alpha2 "github.com/crossplaneio/stack-gcp/apis/v1alpha2" ) func init() { diff --git a/pkg/controller/gcp/storage/claim.go b/pkg/controller/storage/claim.go similarity index 98% rename from pkg/controller/gcp/storage/claim.go rename to pkg/controller/storage/claim.go index 3db1d5a67..112f74915 100644 --- a/pkg/controller/gcp/storage/claim.go +++ b/pkg/controller/storage/claim.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/resource" storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" ) // BucketClaimController is responsible for adding the Bucket claim controller and its diff --git a/pkg/controller/gcp/storage/claim_test.go b/pkg/controller/storage/claim_test.go similarity index 98% rename from pkg/controller/gcp/storage/claim_test.go rename to pkg/controller/storage/claim_test.go index 8cd6bc0e4..85bb25e40 100644 --- a/pkg/controller/gcp/storage/claim_test.go +++ b/pkg/controller/storage/claim_test.go @@ -30,7 +30,7 @@ import ( "github.com/crossplaneio/crossplane-runtime/pkg/test" storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1" - "github.com/crossplaneio/stack-gcp/gcp/apis/storage/v1alpha2" + "github.com/crossplaneio/stack-gcp/apis/storage/v1alpha2" ) var _ resource.ManagedConfigurator = resource.ManagedConfiguratorFn(ConfigureBucket)