flyteorg · eapolinario · Mar 29, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
diff --git a/Dockerfile.datacatalog b/Dockerfile.datacatalog
@@ -23,6 +23,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.11 && \
 
 WORKDIR /go/src/github.com/flyteorg/datacatalog
 
+COPY boilerplate ../boilerplate
 COPY datacatalog .
 COPY flyteadmin ../flyteadmin
 COPY flytecopilot ../flytecopilot

diff --git a/Dockerfile.flyteadmin b/Dockerfile.flyteadmin
@@ -23,6 +23,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.11 && \
 
 WORKDIR /go/src/github.com/flyteorg/flyteadmin
 
+COPY boilerplate ../boilerplate
 COPY datacatalog ../datacatalog
 COPY flyteadmin .
 COPY flytecopilot ../flytecopilot

diff --git a/Dockerfile.flytecopilot b/Dockerfile.flytecopilot
@@ -13,6 +13,7 @@ RUN apk add git openssh-client make curl
 
 WORKDIR /go/src/github.com/flyteorg/flytecopilot
 
+COPY boilerplate ../boilerplate
 COPY datacatalog ../datacatalog
 COPY flyteadmin ../flyteadmin
 COPY flytecopilot .

diff --git a/Dockerfile.flytepropeller b/Dockerfile.flytepropeller
@@ -13,6 +13,7 @@ RUN apk add git openssh-client make curl
 
 WORKDIR /go/src/github.com/flyteorg/flytepropeller
 
+COPY boilerplate ../boilerplate
 COPY datacatalog ../datacatalog
 COPY flyteadmin ../flyteadmin
 COPY flytecopilot ../flytecopilot

diff --git a/Dockerfile.flytescheduler b/Dockerfile.flytescheduler
@@ -16,6 +16,7 @@ RUN mkdir /artifacts
 
 WORKDIR /go/src/github.com/flyteorg/flyteadmin
 
+COPY boilerplate ../boilerplate
 COPY datacatalog ../datacatalog
 COPY flyteadmin .
 COPY flytecopilot ../flytecopilot

diff --git a/...g/boilerplate/flyte/docker_build/Makefile → boilerplate/flyte/docker_build/Makefile b/...g/boilerplate/flyte/docker_build/Makefile → boilerplate/flyte/docker_build/Makefile
diff --git a/...boilerplate/flyte/docker_build/Readme.rst → boilerplate/flyte/docker_build/Readme.rst b/...boilerplate/flyte/docker_build/Readme.rst → boilerplate/flyte/docker_build/Readme.rst
diff --git a/...rplate/flyte/docker_build/docker_build.sh → ...rplate/flyte/docker_build/docker_build.sh b/...rplate/flyte/docker_build/docker_build.sh → ...rplate/flyte/docker_build/docker_build.sh
diff --git a/...ate/flyte/flyte_golang_compile/Readme.rst → ...ate/flyte/flyte_golang_compile/Readme.rst b/...ate/flyte/flyte_golang_compile/Readme.rst → ...ate/flyte/flyte_golang_compile/Readme.rst
diff --git a/...ang_compile/flyte_golang_compile.Template → ...ang_compile/flyte_golang_compile.Template b/...ang_compile/flyte_golang_compile.Template → ...ang_compile/flyte_golang_compile.Template
diff --git a/...late/flyte/flyte_golang_compile/update.sh → ...late/flyte/flyte_golang_compile/update.sh b/...late/flyte/flyte_golang_compile/update.sh → ...late/flyte/flyte_golang_compile/update.sh
diff --git a/...erplate/flyte/github_workflows/Readme.rst → ...erplate/flyte/github_workflows/Readme.rst b/...erplate/flyte/github_workflows/Readme.rst → ...erplate/flyte/github_workflows/Readme.rst
diff --git a/...thub_workflows/boilerplate_automation.yml → ...thub_workflows/boilerplate_automation.yml b/...thub_workflows/boilerplate_automation.yml → ...thub_workflows/boilerplate_automation.yml
diff --git a/...erplate/flyte/github_workflows/master.yml → ...erplate/flyte/github_workflows/master.yml b/...erplate/flyte/github_workflows/master.yml → ...erplate/flyte/github_workflows/master.yml
diff --git a/...e/flyte/github_workflows/pull_request.yml → ...e/flyte/github_workflows/pull_request.yml b/...e/flyte/github_workflows/pull_request.yml → ...e/flyte/github_workflows/pull_request.yml
diff --git a/...lerplate/flyte/github_workflows/stale.yml → boilerplate/flyte/github_workflows/stale.yml b/...lerplate/flyte/github_workflows/stale.yml → boilerplate/flyte/github_workflows/stale.yml
diff --git a/...lerplate/flyte/github_workflows/update.sh → boilerplate/flyte/github_workflows/update.sh b/...lerplate/flyte/github_workflows/update.sh → boilerplate/flyte/github_workflows/update.sh
diff --git a/...e/golang_dockerfile/Dockerfile.GoTemplate → ...e/golang_dockerfile/Dockerfile.GoTemplate b/...e/golang_dockerfile/Dockerfile.GoTemplate → ...e/golang_dockerfile/Dockerfile.GoTemplate
diff --git a/...rplate/flyte/golang_dockerfile/Readme.rst → ...rplate/flyte/golang_dockerfile/Readme.rst b/...rplate/flyte/golang_dockerfile/Readme.rst → ...rplate/flyte/golang_dockerfile/Readme.rst
diff --git a/...erplate/flyte/golang_dockerfile/update.sh → ...erplate/flyte/golang_dockerfile/update.sh b/...erplate/flyte/golang_dockerfile/update.sh → ...erplate/flyte/golang_dockerfile/update.sh
diff --git a/...erplate/flyte/golang_support_tools/go.mod → ...erplate/flyte/golang_support_tools/go.mod b/...erplate/flyte/golang_support_tools/go.mod → ...erplate/flyte/golang_support_tools/go.mod
diff --git a/...erplate/flyte/golang_support_tools/go.sum → ...erplate/flyte/golang_support_tools/go.sum b/...erplate/flyte/golang_support_tools/go.sum → ...erplate/flyte/golang_support_tools/go.sum
diff --git a/...plate/flyte/golang_support_tools/tools.go → ...plate/flyte/golang_support_tools/tools.go b/...plate/flyte/golang_support_tools/tools.go → ...plate/flyte/golang_support_tools/tools.go
diff --git a/boilerplate/flyte/golang_test_targets/Makefile b/boilerplate/flyte/golang_test_targets/Makefile
@@ -6,11 +6,11 @@
 
 .PHONY: download_tooling
 download_tooling: #download dependencies (including test deps) for the package
-	@boilerplate/flyte/golang_test_targets/download_tooling.sh
+	@../boilerplate/flyte/golang_test_targets/download_tooling.sh
 
 .PHONY: generate
 generate: download_tooling #generate go code
-	@boilerplate/flyte/golang_test_targets/go-gen.sh
+	@../boilerplate/flyte/golang_test_targets/go-gen.sh
 
 .PHONY: lint
 lint: download_tooling #lints the package for common code smells
@@ -50,8 +50,12 @@ test_unit_cover:
 test_unit_visual:
 	go test ./... -coverprofile /tmp/cover.out -covermode=count
 	go tool cover -html=/tmp/cover.out
-	
+
 .PHONY: test_unit_codecov
 test_unit_codecov:
 	go test ./... -race -coverprofile=coverage.txt -covermode=atomic
 	curl -s https://codecov.io/bash > codecov_bash.sh && bash codecov_bash.sh
+
+.PHONY: go-tidy
+go-tidy:
+	go mod tidy
diff --git a/boilerplate/flyte/golang_test_targets/download_tooling.sh b/boilerplate/flyte/golang_test_targets/download_tooling.sh
@@ -16,23 +16,25 @@ set -e
 # List of tools to go get
 # In the format of "<cli>:<package>" or ":<package>" if no cli
 tools=(
-  "github.com/EngHabu/mockery/cmd/mockery"
-  "github.com/flyteorg/flytestdlib/cli/pflags@latest"
-  "github.com/golangci/golangci-lint/cmd/golangci-lint"
-  "github.com/daixiang0/gci"
-  "github.com/alvaroloes/enumer"
-  "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
+	"github.com/EngHabu/mockery/cmd/mockery"
+	"github.com/golangci/golangci-lint/cmd/golangci-lint"
+	"github.com/daixiang0/gci"
+	"github.com/alvaroloes/enumer"
+	"github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
 )
 
+# This ensures pflags are up to date.
+make -C $REPO_ROOT/flytestdlib compile
+cp $REPO_ROOT/flytestdlib/bin/pflags $(go env GOPATH)/bin
+
 tmp_dir=$(mktemp -d -t gotooling-XXX)
 echo "Using temp directory ${tmp_dir}"
-cp -R boilerplate/flyte/golang_support_tools/* $tmp_dir
+cp -R ../boilerplate/flyte/golang_support_tools/* $tmp_dir
 pushd "$tmp_dir"
 
-for tool in "${tools[@]}"
-do
-    echo "Installing ${tool}"
-    GO111MODULE=on go install $tool
+for tool in "${tools[@]}"; do
+	echo "Installing ${tool}"
+	GO111MODULE=on go install $tool
 done
 
 popd
diff --git a/...erplate/flyte/golangci_file/.golangci.yml → ...erplate/flyte/golangci_file/.golangci.yml b/...erplate/flyte/golangci_file/.golangci.yml → ...erplate/flyte/golangci_file/.golangci.yml
diff --git a/...oilerplate/flyte/golangci_file/Readme.rst → boilerplate/flyte/golangci_file/Readme.rst b/...oilerplate/flyte/golangci_file/Readme.rst → boilerplate/flyte/golangci_file/Readme.rst
diff --git a/...boilerplate/flyte/golangci_file/update.sh → boilerplate/flyte/golangci_file/update.sh b/...boilerplate/flyte/golangci_file/update.sh → boilerplate/flyte/golangci_file/update.sh
diff --git a/...alog/boilerplate/flyte/precommit/Makefile → boilerplate/flyte/precommit/Makefile b/...alog/boilerplate/flyte/precommit/Makefile → boilerplate/flyte/precommit/Makefile
diff --git a/...oilerplate/flyte/precommit/hooks/pre-push → boilerplate/flyte/precommit/hooks/pre-push b/...oilerplate/flyte/precommit/hooks/pre-push → boilerplate/flyte/precommit/hooks/pre-push
diff --git a/.../flyte/precommit/hooks/prepare-commit-msg → .../flyte/precommit/hooks/prepare-commit-msg b/.../flyte/precommit/hooks/prepare-commit-msg → .../flyte/precommit/hooks/prepare-commit-msg
diff --git a/...log/boilerplate/flyte/precommit/update.sh → boilerplate/flyte/precommit/update.sh b/...log/boilerplate/flyte/precommit/update.sh → boilerplate/flyte/precommit/update.sh
diff --git a/...te/flyte/pull_request_template/Readme.rst → ...te/flyte/pull_request_template/Readme.rst b/...te/flyte/pull_request_template/Readme.rst → ...te/flyte/pull_request_template/Readme.rst
diff --git a/...request_template/pull_request_template.md → ...request_template/pull_request_template.md b/...request_template/pull_request_template.md → ...request_template/pull_request_template.md
diff --git a/...ate/flyte/pull_request_template/update.sh → ...ate/flyte/pull_request_template/update.sh b/...ate/flyte/pull_request_template/update.sh → ...ate/flyte/pull_request_template/update.sh
diff --git a/boilerplate/update.cfg b/boilerplate/update.cfg
diff --git a/datacatalog/Makefile b/datacatalog/Makefile
@@ -1,11 +1,7 @@
 export REPOSITORY=datacatalog
-include boilerplate/flyte/docker_build/Makefile
-include boilerplate/flyte/golang_test_targets/Makefile
-
-.PHONY: update_boilerplate
-update_boilerplate:
-	@curl https://raw.githubusercontent.com/flyteorg/boilerplate/master/boilerplate/update.sh -o boilerplate/update.sh
-	@boilerplate/update.sh
+export REPO_ROOT=..
+include ../boilerplate/flyte/docker_build/Makefile
+include ../boilerplate/flyte/golang_test_targets/Makefile
 
 .PHONY: compile
 compile:
@@ -17,11 +13,3 @@ linux_compile: export CGO_ENABLED ?= 0
 linux_compile: export GOOS ?= linux
 linux_compile:
 	go build -o /artifacts/datacatalog ./cmd/
-
-.PHONY: generate
-generate:
-	@go generate ./...
-
-.PHONY: go-tidy
-go-tidy:
-	go mod tidy
diff --git a/datacatalog/boilerplate/flyte/code_of_conduct/CODE_OF_CONDUCT.md b/datacatalog/boilerplate/flyte/code_of_conduct/CODE_OF_CONDUCT.md
diff --git a/datacatalog/boilerplate/flyte/code_of_conduct/README.rst b/datacatalog/boilerplate/flyte/code_of_conduct/README.rst
diff --git a/datacatalog/boilerplate/flyte/code_of_conduct/update.sh b/datacatalog/boilerplate/flyte/code_of_conduct/update.sh
diff --git a/datacatalog/boilerplate/flyte/end2end/Makefile b/datacatalog/boilerplate/flyte/end2end/Makefile
diff --git a/datacatalog/boilerplate/flyte/end2end/end2end.sh b/datacatalog/boilerplate/flyte/end2end/end2end.sh
diff --git a/datacatalog/boilerplate/flyte/end2end/functional-test-config.yaml b/datacatalog/boilerplate/flyte/end2end/functional-test-config.yaml