Clean up client-gen paths

schemahero · Mar 21, 2020 · 1154aba · 1154aba
1 parent ae2a1f6
commit 1154aba
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -86,7 +86,9 @@ vet:
 .PHONY: generate
 generate: controller-gen client-gen
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/...
-	$(CLIENT_GEN) --output-package=pkg/client --clientset-name schemaheroclientset --input-base github.com/schemahero/schemahero/pkg/apis --input databases/v1alpha3 --input schemas/v1alpha3 -h ./hack/boilerplate.go.txt
+	$(CLIENT_GEN) --output-package=github.com/schemahero/schemahero/pkg/client --clientset-name schemaheroclientset --input-base github.com/schemahero/schemahero/pkg/apis --input databases/v1alpha3 --input schemas/v1alpha3 -h ./hack/boilerplate.go.txt
+	rm -rf pkg/client && mv github.com/schemahero/schemahero/pkg/client pkg && rm -rf github.com
+	## ^^ this doesn't appear right.  it produces the right resutls, but this rm and mv shouldn't be necessary...
 
 .PHONY: bin/schemahero
 bin/schemahero:

diff --git a/pkg/client/schemaheroclientset/clientset.go b/pkg/client/schemaheroclientset/clientset.go
diff --git a/pkg/client/schemaheroclientset/fake/clientset_generated.go b/pkg/client/schemaheroclientset/fake/clientset_generated.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/database.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/database.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/databases_client.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/databases_client.go
diff --git a/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_databases_client.go b/pkg/client/schemaheroclientset/typed/databases/v1alpha3/fake/fake_databases_client.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_schemas_client.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/fake/fake_schemas_client.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/migration.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/migration.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/schemas_client.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/schemas_client.go
diff --git a/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/table.go b/pkg/client/schemaheroclientset/typed/schemas/v1alpha3/table.go