This repository has been archived by the owner on Oct 9, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 53
Migrate to go module and remove old Hive integration tests #36
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
8ace1e6
migrate to go module
honnix dfc6890
try to fix lint
honnix d83cb70
incorporate latest boilerplate changes
honnix e766780
use latest boilerplate
honnix 1ff094d
updated
776af84
update boilerplate
983cb6f
updating
9d6080e
change comment
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
module github.com/lyft/boilerplate | ||
|
||
go 1.13 | ||
|
||
require ( | ||
github.com/alvaroloes/enumer v1.1.2 | ||
github.com/golangci/golangci-lint v1.22.2 | ||
github.com/lyft/flytestdlib v0.2.31 | ||
github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5 | ||
) | ||
|
||
replace github.com/vektra/mockery => github.com/enghabu/mockery v0.0.0-20191009061720-9d0c8670c2f0 |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// +build tools | ||
|
||
package tools | ||
|
||
import ( | ||
_ "github.com/golangci/golangci-lint/cmd/golangci-lint" | ||
_ "github.com/lyft/flytestdlib/cli/pflags" | ||
_ "github.com/vektra/mockery/cmd/mockery" | ||
_ "github.com/alvaroloes/enumer" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
#!/bin/bash | ||
|
||
# Everything in this file needs to be installed outside of current module | ||
# The reason we cannot turn off module entirely and install is that we need the replace statement in go.mod | ||
# because we are installing a mockery fork. Turning it off would result installing the original not the fork. | ||
# We also want to version all the other tools. We also want to be able to run go mod tidy without removing the version | ||
# pins. To facilitate this, we're maintaining two sets of go.mod/sum files - the second one only for tooling. This is | ||
# the same approach that go 1.14 will take as well. | ||
# See: | ||
# https://github.com/lyft/flyte/issues/129 | ||
# https://github.com/golang/go/issues/30515 for some background context | ||
# https://github.com/go-modules-by-example/index/blob/5ec250b4b78114a55001bd7c9cb88f6e07270ea5/010_tools/README.md | ||
|
||
set -e | ||
|
||
# List of tools to go get | ||
# In the format of "<cli>:<package>" or ":<package>" if no cli | ||
tools=( | ||
"github.com/vektra/mockery/cmd/mockery" | ||
"github.com/lyft/flytestdlib/cli/pflags" | ||
"github.com/golangci/golangci-lint/cmd/golangci-lint" | ||
"github.com/alvaroloes/enumer" | ||
) | ||
|
||
tmp_dir=$(mktemp -d -t gotooling-XXX) | ||
echo "Using temp directory ${tmp_dir}" | ||
cp -R boilerplate/lyft/golang_support_tools/* $tmp_dir | ||
pushd "$tmp_dir" | ||
|
||
for tool in "${tools[@]}" | ||
do | ||
echo "Installing ${tool}" | ||
GO111MODULE=on go install $tool | ||
done | ||
|
||
popd |
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
lyft/golang_test_targets | ||
lyft/golangci_file | ||
lyft/golang_support_tools |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
module github.com/lyft/flyteplugins | ||
|
||
go 1.13 | ||
|
||
require ( | ||
github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.1.3 | ||
github.com/aws/aws-sdk-go v1.28.9 | ||
github.com/coocood/freecache v1.1.0 | ||
github.com/go-test/deep v1.0.5 | ||
github.com/golang/protobuf v1.3.2 | ||
github.com/hashicorp/golang-lru v0.5.4 | ||
github.com/json-iterator/go v1.1.9 // indirect | ||
github.com/lyft/flyteidl v0.17.0 | ||
github.com/lyft/flytestdlib v0.3.0 | ||
github.com/magiconair/properties v1.8.1 | ||
github.com/mitchellh/mapstructure v1.1.2 | ||
github.com/pkg/errors v0.9.1 | ||
github.com/prometheus/client_golang v1.3.0 | ||
github.com/spf13/pflag v1.0.5 | ||
github.com/stretchr/testify v1.4.0 | ||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa | ||
google.golang.org/grpc v1.26.0 | ||
k8s.io/api v0.17.2 | ||
k8s.io/apimachinery v0.17.2 | ||
k8s.io/client-go v11.0.0+incompatible | ||
k8s.io/klog v1.0.0 // indirect | ||
k8s.io/utils v0.0.0-20200122174043-1e243dd1a584 // indirect | ||
sigs.k8s.io/controller-runtime v0.4.0 | ||
) | ||
|
||
// Pin the version of client-go to something that's compatible with katrogan's fork of api and apimachinery | ||
honnix marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// Type the following | ||
// replace k8s.io/client-go => k8s.io/client-go kubernetes-1.16.2 | ||
// and it will be replaced with the 'sha' variant of the version | ||
|
||
replace ( | ||
github.com/GoogleCloudPlatform/spark-on-k8s-operator => github.com/lyft/spark-on-k8s-operator v0.1.3 | ||
k8s.io/api => github.com/lyft/api v0.0.0-20191031200350-b49a72c274e0 | ||
k8s.io/apimachinery => github.com/lyft/apimachinery v0.0.0-20191031200210-047e3ea32d7f | ||
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48 | ||
) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We used to depend on a SHA, is this version inclusive?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.4.0 includes sha 40070e2a1958c3d974ba95da883a2bd088137789