From b396bc80b76df9ef8d3fc5a0e8e3d2e74bd38ac9 Mon Sep 17 00:00:00 2001 From: Justin Chan Date: Wed, 30 May 2018 01:44:52 -0400 Subject: [PATCH] Clean up files after monorepo merge (#734) --- src/coordinator/CHANGELOG.md => CHANGELOG.md | 0 src/dbnode/CONTRIBUTING.md => CONTRIBUTING.md | 0 src/dbnode/DEVELOPER.md => DEVELOPER.md | 0 src/dbnode/TESTING.md => TESTING.md | 0 src/coordinator/.excludecoverage | 3 - src/coordinator/.gitignore | 23 --- src/coordinator/CONTRIBUTING.md | 32 ---- src/coordinator/LICENSE.md | 19 -- src/coordinator/Makefile | 169 ------------------ src/dbnode/CHANGELOG.md | 3 - src/dbnode/LICENSE.md | 19 -- 11 files changed, 268 deletions(-) rename src/coordinator/CHANGELOG.md => CHANGELOG.md (100%) rename src/dbnode/CONTRIBUTING.md => CONTRIBUTING.md (100%) rename src/dbnode/DEVELOPER.md => DEVELOPER.md (100%) rename src/dbnode/TESTING.md => TESTING.md (100%) delete mode 100644 src/coordinator/.excludecoverage delete mode 100644 src/coordinator/.gitignore delete mode 100644 src/coordinator/CONTRIBUTING.md delete mode 100644 src/coordinator/LICENSE.md delete mode 100644 src/coordinator/Makefile delete mode 100644 src/dbnode/CHANGELOG.md delete mode 100644 src/dbnode/LICENSE.md diff --git a/src/coordinator/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from src/coordinator/CHANGELOG.md rename to CHANGELOG.md diff --git a/src/dbnode/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from src/dbnode/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/src/dbnode/DEVELOPER.md b/DEVELOPER.md similarity index 100% rename from src/dbnode/DEVELOPER.md rename to DEVELOPER.md diff --git a/src/dbnode/TESTING.md b/TESTING.md similarity index 100% rename from src/dbnode/TESTING.md rename to TESTING.md diff --git a/src/coordinator/.excludecoverage b/src/coordinator/.excludecoverage deleted file mode 100644 index 418087f373..0000000000 --- a/src/coordinator/.excludecoverage +++ /dev/null @@ -1,3 +0,0 @@ -generated/ -vendor/ -integration/ diff --git a/src/coordinator/.gitignore b/src/coordinator/.gitignore deleted file mode 100644 index 134e051128..0000000000 --- a/src/coordinator/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.out -*.test -*.xml -*.swp -.idea/ -.vscode/ -*.iml -*.ipr -*.iws -*.cov -*.html -test.log - - -# Build binaries -bin/ - -# Debug binaries -debug -debug.test - -# Glide manages this -vendor/ diff --git a/src/coordinator/CONTRIBUTING.md b/src/coordinator/CONTRIBUTING.md deleted file mode 100644 index f7844da191..0000000000 --- a/src/coordinator/CONTRIBUTING.md +++ /dev/null @@ -1,32 +0,0 @@ -Contributing -============ - -We'd love your help making M3Coordinator great! - -## Getting Started - -M3Coordinator uses Go vendoring to manage dependencies. -To get started: - -```bash -git submodule update --init --recursive -make test -``` - -## Making A Change - -*Before making any significant changes, please [open an -issue](https://github.com/m3db/m3coordinator/issues).* Discussing your proposed -changes ahead of time will make the contribution process smooth for everyone. - -Once we've discussed your changes and you've got your code ready, make sure -that tests are passing (`make test` or `make cover`) and open your PR! Your -pull request is most likely to be accepted if it: - -* Includes tests for new functionality. -* Follows the guidelines in [Effective - Go](https://golang.org/doc/effective_go.html) and the [Go team's common code - review comments](https://github.com/golang/go/wiki/CodeReviewComments). -* Has a [good commit - message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). - diff --git a/src/coordinator/LICENSE.md b/src/coordinator/LICENSE.md deleted file mode 100644 index 858e02475f..0000000000 --- a/src/coordinator/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2017 Uber Technologies, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/src/coordinator/Makefile b/src/coordinator/Makefile deleted file mode 100644 index 70d61aa477..0000000000 --- a/src/coordinator/Makefile +++ /dev/null @@ -1,169 +0,0 @@ -SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -CI_DIR := $(SELF_DIR)/../dbnode -include $(CI_DIR)/.ci/common.mk - -SHELL=/bin/bash -o pipefail - -m3coord_package := github.com/m3db/m3db/src/coordinator -gopath_prefix := $(GOPATH)/src -vendor_prefix := vendor -license_dir := $(CI_DIR)/.ci/uber-licence -license_node_modules := $(license_dir)/node_modules -html_report := coverage.html -test := $(CI_DIR)/.ci/test-cover.sh -test_one_integration := $(CI_DIR)/.ci/test-one-integration.sh -test_ci_integration := $(CI_DIR)/.ci/test-integration.sh -convert-test-data := $(CI_DIR)/.ci/convert-test-data.sh -coverfile := cover.out -coverage_xml := coverage.xml -junit_xml := junit.xml -test_log := test.log -lint_check := $(CI_DIR)/.ci/lint.sh -metalint_check := $(CI_DIR)/.ci/metalint.sh -metalint_config := .metalinter.json -metalint_exclude := .excludemetalint -protoc_go_package := github.com/golang/protobuf/protoc-gen-go -proto_output_dir := generated/proto -proto_rules_dir := generated/proto -auto_gen := $(CI_DIR)/.ci/auto-gen.sh -mockgen_package := github.com/golang/mock/mockgen -mocks_output_dir := generated/mocks/mocks -mocks_rules_dir := generated/mocks - -BUILD := $(abspath ./bin) -LINUX_AMD64_ENV := GOOS=linux GOARCH=amd64 CGO_ENABLED=0 -VENDOR_ENV := GO15VENDOREXPERIMENT=1 - -SERVICES := \ - m3coordinator - -TOOLS := \ - -.PHONY: setup -setup: - mkdir -p $(BUILD) - -define SERVICE_RULES - -.PHONY: $(SERVICE) -$(SERVICE): setup - @echo Building $(SERVICE) - $(VENDOR_ENV) go build -o $(BUILD)/$(SERVICE) ./services/$(SERVICE)/main/. - -.PHONY: $(SERVICE)-linux-amd64 -$(SERVICE)-linux-amd64: - $(LINUX_AMD64_ENV) make $(SERVICE) - -endef - -define TOOL_RULES - -.PHONY: $(TOOL) -$(TOOL): setup - @echo Building $(TOOL) - $(VENDOR_ENV) go build -o $(BUILD)/$(TOOL) ./tools/$(TOOL)/main/. - -.PHONY: $(TOOL)-linux-amd64 -$(TOOL)-linux-amd64: - $(LINUX_AMD64_ENV) make $(TOOL) - -endef - -.PHONY: services services-linux-amd64 -services: $(SERVICES) -services-linux-amd64: - $(LINUX_AMD64_ENV) make services - -.PHONY: tools tools-linux-amd64 -tools: $(TOOLS) -tools-linux-amd64: - $(LINUX_AMD64_ENV) make tools - -$(foreach SERVICE,$(SERVICES),$(eval $(SERVICE_RULES))) -$(foreach TOOL,$(TOOLS),$(eval $(TOOL_RULES))) - -.PHONY: all -all: metalint test-ci-unit services tools - @echo Made all successfully - -.PHONY: install-license-bin -install-license-bin: install-vendor - @echo Installing node modules - git submodule update --init --recursive - [ -d $(license_node_modules) ] || (cd $(license_dir) && npm install) - -.PHONY: install-mockgen -install-mockgen: install-vendor - @echo Installing mockgen - rm -rf $(gopath_prefix)/$(mockgen_package) && \ - cp -r $(vendor_prefix)/$(mockgen_package) $(gopath_prefix)/$(mockgen_package) && \ - go install $(mockgen_package) - -.PHONY: install-proto-bin -install-proto-bin: install-vendor - @echo Installing protobuf binaries - @echo Note: the protobuf compiler v3.0.0 can be downloaded from https://github.com/google/protobuf/releases or built from source at https://github.com/google/protobuf. - go install $(m3coord_package)/$(vendor_prefix)/$(protoc_go_package) - -.PHONY: proto-gen -proto-gen: install-proto-bin install-license-bin - @echo Generating protobuf files - PACKAGE=$(m3coord_package) $(auto_gen) $(proto_output_dir) $(proto_rules_dir) - -.PHONY: mock-gen -mock-gen: install-mockgen install-license-bin - @echo Generating mocks - PACKAGE=$(m3coord_package) $(auto_gen) $(mocks_output_dir) $(mocks_rules_dir) - -.PHONY: all-gen -all-gen: proto-gen - -.PHONY: lint -lint: - @which golint > /dev/null || go get -u github.com/golang/lint/golint - $(VENDOR_ENV) $(lint_check) - -.PHONY: metalint -metalint: install-metalinter install-linter-badtime install-linter-importorder - @($(metalint_check) $(metalint_config) $(metalint_exclude)) - -.PHONY: test-internal -test-internal: - @which go-junit-report > /dev/null || go get -u github.com/sectioneight/go-junit-report - @$(VENDOR_ENV) $(test) $(coverfile) .excludecoverage test.log $(CI_DIR) | tee $(test_log) - -# Note: do not test native pooling since it's experimental/deprecated -.PHONY: test-integration -test-integration: - TEST_NATIVE_POOLING=false make test-base-integration - -.PHONY: test -test: test-base - # coverfile defined in common.mk - gocov convert $(coverfile) | gocov report - -.PHONY: test-xml -test-xml: test-base-xml - -.PHONY: test-html -test-html: test-base-html - -.PHONY: test-ci-unit -test-ci-unit: test-base - $(codecov_push) -f $(coverfile) -F coordinator - -.PHONY: test-ci-integration -test-ci-integration: - INTEGRATION_TIMEOUT=4m TEST_NATIVE_POOLING=false TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration - $(codecov_push) -f $(coverfile) -F coordinator - -# run as: make test-one-integration test= -.PHONY: test-one-integration -test-one-integration: - @$(VENDOR_ENV) TEST_NATIVE_POOLING=false $(test_one_integration) $(test) - -.PHONY: clean -clean: - @rm -f *.html *.xml *.out *.test - -.DEFAULT_GOAL := all diff --git a/src/dbnode/CHANGELOG.md b/src/dbnode/CHANGELOG.md deleted file mode 100644 index 38ff556074..0000000000 --- a/src/dbnode/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -Changelog -========= - diff --git a/src/dbnode/LICENSE.md b/src/dbnode/LICENSE.md deleted file mode 100644 index 8765c9fbc6..0000000000 --- a/src/dbnode/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2016 Uber Technologies, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.