Move internal/x/cmd to internal/cmd (uber#71)

Minish144 · May 17, 2018 · 350f6d0 · 350f6d0
1 parent a3ca4ef
commit 350f6d0
Show file tree

Hide file tree

Showing 53 changed files with 264 additions and 231 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -15,4 +15,4 @@ ignore:
   - /example/cmd/excited
   - /example/gen/proto/go/foo
   - /example/gen/proto/go/sub
-  - /internal/x/cmd/testdata/grpc/gen/grpcpb
+  - /internal/cmd/testdata/grpc/gen/grpcpb
diff --git a/Makefile b/Makefile
@@ -33,10 +33,10 @@ license:
 
 .PHONY: golden
 golden: install
-	for file in $(shell find internal/x/cmd/testdata/format -name '*.proto.golden'); do \
+	for file in $(shell find internal/cmd/testdata/format -name '*.proto.golden'); do \
 		rm -f $${file}; \
 	done
-	for file in $(shell find internal/x/cmd/testdata/format -name '*.proto'); do \
+	for file in $(shell find internal/cmd/testdata/format -name '*.proto'); do \
 		prototool format $${file} > $${file}.golden || true; \
 	done
 
@@ -57,7 +57,7 @@ example: install
 
 .PHONY: internalgen
 internalgen: install
-	prototool gen internal/x/cmd/testdata/grpc
+	prototool gen internal/cmd/testdata/grpc
 	rm -f etc/config/example/prototool.yaml
 	prototool init etc/config/example --uncomment
 

diff --git a/cmd/prototool/main.go b/cmd/prototool/main.go
@@ -23,7 +23,7 @@ package main
 import (
 	"os"
 
-	"github.com/uber/prototool/internal/x/cmd"
+	"github.com/uber/prototool/internal/cmd"
 )
 
 func main() {