Skip to content

Commit 517e7b8

Browse files
vdarulisrobskillington
vdarulis
authored and
robskillington
committed
[ci] Use gofmt for renames
1 parent 3b5c0ff commit 517e7b8

File tree

13 files changed

+91
-160
lines changed

13 files changed

+91
-160
lines changed

‎Makefile‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@ all: test-ci-unit test-ci-integration services tools
171171
.PHONY: install-tools
172172
install-tools:
173173
@echo "Installing build tools"
174-
GOBIN=$(tools_bin_path) go install github.com/fossas/fossa-cli/cmd/fossa
175-
GOBIN=$(tools_bin_path) go install github.com/golang/mock/mockgen
176-
GOBIN=$(tools_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet
177-
GOBIN=$(tools_bin_path) go install github.com/m3db/build-tools/utilities/genclean
178-
GOBIN=$(tools_bin_path) go install github.com/m3db/tools/update-license
179-
GOBIN=$(tools_bin_path) go install github.com/golangci/golangci-lint/cmd/golangci-lint
180-
GOBIN=$(tools_bin_path) go install github.com/mauricelam/genny
181-
GOBIN=$(tools_bin_path) go install github.com/mjibson/esc
182-
GOBIN=$(tools_bin_path) go install github.com/pointlander/peg
183-
GOBIN=$(tools_bin_path) go install github.com/robskillington/gorename
184-
GOBIN=$(tools_bin_path) go install github.com/rakyll/statik
185-
GOBIN=$(tools_bin_path) go install github.com/garethr/kubeval
186-
GOBIN=$(tools_bin_path) go install github.com/wjdp/htmltest
174+
GOBIN=$(tools_bin_path) go install \
175+
github.com/fossas/fossa-cli/cmd/fossa \
176+
github.com/golang/mock/mockgen \
177+
github.com/google/go-jsonnet/cmd/jsonnet \
178+
github.com/m3db/build-tools/utilities/genclean \
179+
github.com/m3db/tools/update-license \
180+
github.com/golangci/golangci-lint/cmd/golangci-lint \
181+
github.com/mauricelam/genny \
182+
github.com/mjibson/esc \
183+
github.com/pointlander/peg \
184+
github.com/rakyll/statik \
185+
github.com/garethr/kubeval \
186+
github.com/wjdp/htmltest
187187

188188
.PHONY: check-for-goreleaser-github-token
189189
check-for-goreleaser-github-token:
@@ -298,14 +298,12 @@ asset-gen-$(SUBDIR): install-tools
298298
@[ ! -d src/$(SUBDIR)/$(assets_rules_dir) ] || \
299299
PATH=$(combined_bin_paths):$(PATH) PACKAGE=$(m3_package) $(auto_gen) src/$(SUBDIR)/$(assets_output_dir) src/$(SUBDIR)/$(assets_rules_dir)
300300

301-
# NB(schallert): gorename (used by our genny process) doesn't work with go
302-
# modules https://github.com/golang/go/issues/34222
303301
.PHONY: genny-gen-$(SUBDIR)
304302
genny-gen-$(SUBDIR): install-tools
305303
@echo "--- Generating genny files $(SUBDIR)"
306304
@[ ! -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk ] || \
307-
PATH=$(combined_bin_paths):$(PATH) GO111MODULE=off make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target)
308-
@PATH=$(combined_bin_paths):$(PATH) GO111MODULE=off bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/"
305+
PATH=$(combined_bin_paths):$(PATH) make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target)
306+
@PATH=$(combined_bin_paths):$(PATH) bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/"
309307

310308
.PHONY: license-gen-$(SUBDIR)
311309
license-gen-$(SUBDIR): install-tools

‎go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ require (
9090
github.com/rakyll/statik v0.1.6
9191
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
9292
github.com/rhysd/go-github-selfupdate v1.2.2 // indirect
93-
github.com/robskillington/gorename v0.0.0-20180424020013-52c7307cddd2
9493
github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7 // indirect
9594
github.com/satori/go.uuid v1.2.0
9695
github.com/sergi/go-diff v1.1.0

‎go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,6 @@ github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7
755755
github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo=
756756
github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6EZEHyp//wGEo=
757757
github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws=
758-
github.com/robskillington/gorename v0.0.0-20180424020013-52c7307cddd2 h1:t+C9QFlvAI+evRn96lz7eKyzo1CgDx3YVx3N/GJIetk=
759-
github.com/robskillington/gorename v0.0.0-20180424020013-52c7307cddd2/go.mod h1:CVTJ4xwzb/4H98jrd7NFgNoTAiL63scr2Pl7kqOcQAQ=
760758
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
761759
github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
762760
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=

‎src/dbnode/storage/id_list_gen.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/m3ninx/index/segment/builder/fields_map_new.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
// Copyright (c) 2020 Uber Technologies, Inc.
2-
//
3-
// Permission is hereby granted, free of charge, to any person obtaining a copy
4-
// of this software and associated documentation files (the "Software"), to deal
5-
// in the Software without restriction, including without limitation the rights
6-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
// copies of the Software, and to permit persons to whom the Software is
8-
// furnished to do so, subject to the following conditions:
9-
//
10-
// The above copyright notice and this permission notice shall be included in
11-
// all copies or substantial portions of the Software.
12-
//
13-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
// THE SOFTWARE.
20-
211
// This file was automatically generated by genny.
222
// Any changes will be lost if this file is regenerated.
233
// see https://github.com/mauricelam/genny

‎src/m3ninx/index/segment/builder/ids_map_new.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
// Copyright (c) 2020 Uber Technologies, Inc.
2-
//
3-
// Permission is hereby granted, free of charge, to any person obtaining a copy
4-
// of this software and associated documentation files (the "Software"), to deal
5-
// in the Software without restriction, including without limitation the rights
6-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
// copies of the Software, and to permit persons to whom the Software is
8-
// furnished to do so, subject to the following conditions:
9-
//
10-
// The above copyright notice and this permission notice shall be included in
11-
// all copies or substantial portions of the Software.
12-
//
13-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
// THE SOFTWARE.
20-
211
// This file was automatically generated by genny.
222
// Any changes will be lost if this file is regenerated.
233
// see https://github.com/mauricelam/genny

‎src/m3ninx/index/segment/builder/postings_map_new.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
// Copyright (c) 2020 Uber Technologies, Inc.
2-
//
3-
// Permission is hereby granted, free of charge, to any person obtaining a copy
4-
// of this software and associated documentation files (the "Software"), to deal
5-
// in the Software without restriction, including without limitation the rights
6-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
// copies of the Software, and to permit persons to whom the Software is
8-
// furnished to do so, subject to the following conditions:
9-
//
10-
// The above copyright notice and this permission notice shall be included in
11-
// all copies or substantial portions of the Software.
12-
//
13-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
// THE SOFTWARE.
20-
211
// This file was automatically generated by genny.
222
// Any changes will be lost if this file is regenerated.
233
// see https://github.com/mauricelam/genny

‎src/m3ninx/index/segment/mem/fields_map_new.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
// Copyright (c) 2020 Uber Technologies, Inc.
2-
//
3-
// Permission is hereby granted, free of charge, to any person obtaining a copy
4-
// of this software and associated documentation files (the "Software"), to deal
5-
// in the Software without restriction, including without limitation the rights
6-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
// copies of the Software, and to permit persons to whom the Software is
8-
// furnished to do so, subject to the following conditions:
9-
//
10-
// The above copyright notice and this permission notice shall be included in
11-
// all copies or substantial portions of the Software.
12-
//
13-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
// THE SOFTWARE.
20-
211
// This file was automatically generated by genny.
222
// Any changes will be lost if this file is regenerated.
233
// see https://github.com/mauricelam/genny

‎src/query/graphite/storage/series_metadata_map_new.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
// Copyright (c) 2020 Uber Technologies, Inc.
2-
//
3-
// Permission is hereby granted, free of charge, to any person obtaining a copy
4-
// of this software and associated documentation files (the "Software"), to deal
5-
// in the Software without restriction, including without limitation the rights
6-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
// copies of the Software, and to permit persons to whom the Software is
8-
// furnished to do so, subject to the following conditions:
9-
//
10-
// The above copyright notice and this permission notice shall be included in
11-
// all copies or substantial portions of the Software.
12-
//
13-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19-
// THE SOFTWARE.
20-
211
// This file was automatically generated by genny.
222
// Any changes will be lost if this file is regenerated.
233
// see https://github.com/mauricelam/genny

‎src/x/context/finalizeable_list_gen.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)