From 044df63770a850459826eef6ff1d97e5ac4b21ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= Date: Fri, 11 Sep 2020 12:29:12 +0800 Subject: [PATCH 1/3] change go package to oam-dev/kubevela --- CONTRIBUTING.md | 16 ++++++++-------- Makefile | 4 ++-- PROJECT | 2 +- README.md | 7 +++---- cmd/core/main.go | 6 +++--- cmd/vela/main.go | 14 +++++++------- docs/index.md | 6 +++--- e2e/apiserver/apiserver_test.go | 6 +++--- e2e/application/application_test.go | 2 +- e2e/capability/capability_test.go | 6 +++--- e2e/commonContext.go | 4 ++-- e2e/env/env_test.go | 2 +- e2e/setup/setup_suite_test.go | 2 +- e2e/trait/trait_test.go | 2 +- e2e/workload/workload_test.go | 2 +- go.mod | 2 +- pkg/application/app.go | 8 ++++---- pkg/application/run.go | 2 +- pkg/cmd/app.go | 4 ++-- pkg/cmd/capability.go | 6 +++--- pkg/cmd/comp.go | 8 ++++---- pkg/cmd/completion.go | 2 +- pkg/cmd/dashboard.go | 10 +++++----- pkg/cmd/delete.go | 6 +++--- pkg/cmd/env.go | 8 ++++---- pkg/cmd/env_test.go | 8 ++++---- pkg/cmd/logs.go | 4 ++-- pkg/cmd/ls.go | 8 ++++---- pkg/cmd/refresh.go | 8 ++++---- pkg/cmd/run.go | 6 +++--- pkg/cmd/show.go | 6 +++--- pkg/cmd/status.go | 6 +++--- pkg/cmd/system.go | 10 +++++----- pkg/cmd/trait.go | 10 +++++----- pkg/cmd/traits.go | 4 ++-- pkg/cmd/traits_test.go | 4 ++-- pkg/cmd/util/helpers.go | 2 +- pkg/cmd/workloads.go | 6 +++--- pkg/controller/setup.go | 4 ++-- .../containerized/containerized_controller.go | 2 +- .../v1alpha1/containerized/suite_test.go | 2 +- .../v1alpha1/metrics/metricstrait_controller.go | 2 +- .../metricstrait_controller_integration_test.go | 2 +- pkg/controller/v1alpha1/metrics/suite_test.go | 2 +- pkg/cue/convert.go | 2 +- pkg/cue/convert_test.go | 2 +- pkg/oam/application.go | 8 ++++---- pkg/oam/capability.go | 10 +++++----- pkg/oam/env.go | 4 ++-- pkg/oam/system.go | 4 ++-- pkg/oam/trait.go | 10 +++++----- pkg/oam/workload.go | 8 ++++---- pkg/plugins/capcenter.go | 4 ++-- pkg/plugins/cluster.go | 8 ++++---- pkg/plugins/cluster_test.go | 2 +- pkg/plugins/local.go | 4 ++-- pkg/plugins/local_test.go | 2 +- pkg/plugins/suit_test.go | 2 +- pkg/server/apis/types.go | 2 +- pkg/server/handler/appHandlers.go | 4 ++-- pkg/server/handler/capabilityHandlers.go | 6 +++--- pkg/server/handler/envHandlers.go | 6 +++--- pkg/server/handler/traitHandler.go | 8 ++++---- pkg/server/handler/workloadHandler.go | 10 +++++----- pkg/server/route.go | 4 ++-- pkg/server/util/api.go | 2 +- pkg/utils/system/system.go | 2 +- pkg/webhook/containerized/containerized_test.go | 4 ++-- pkg/webhook/containerized/mutating_handler.go | 4 ++-- pkg/webhook/containerized/validating_handler.go | 2 +- pkg/webhook/metrics/metrics_test.go | 4 ++-- pkg/webhook/metrics/mutating_handler.go | 4 ++-- pkg/webhook/metrics/validating_handler.go | 2 +- pkg/webhook/register.go | 4 ++-- 74 files changed, 185 insertions(+), 186 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1cebf7de..2592ca6df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # CONTRIBUTING This doc explains how to set up a development environment, so you can get started -contributing to `RudrX` or build a PoC (Proof of Concept). +contributing to `kubevela` or build a PoC (Proof of Concept). ## Prerequisites @@ -9,14 +9,14 @@ contributing to `RudrX` or build a PoC (Proof of Concept). 2. Kubernetes version v1.15+ with `~/.kube/config` configured. 3. OAM Kubernetes Runtime installed. 4. Kustomize version 3.8+ -5. ginkgo 1.14.0+ (just for [E2E test](https://github.com/cloud-native-application/RudrX/blob/master/DEVELOPMENT.md#e2e-test)) +5. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test)) 6. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow. ## Build * Clone this project ```shell script -git clone git@github.com:cloud-native-application/RudrX.git +git clone git@github.com:oam-dev/kubevela.git ``` * Install Template CRD into your cluster @@ -76,33 +76,33 @@ Will run 5 of 5 specs Trait env init should print env initiation successful message - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:14 + kubevela/e2e/commonContext.go:14 Create env succeed, current env is default • ------------------------------ Trait env switch should show env switch message - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:40 + kubevela/e2e/commonContext.go:40 Switch env succeed, current env is default • ------------------------------ Trait run should print successful creation information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:76 + kubevela/e2e/commonContext.go:76 Creating AppConfig app-trait-basic SUCCEED • ------------------------------ Trait rudr attach trait should print successful attached information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/trait/trait_test.go:24 + kubevela/e2e/trait/trait_test.go:24 Applying trait for app Succeeded! • ------------------------------ Trait delete should print successful deletion information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:85 + kubevela/e2e/commonContext.go:85 Deleting AppConfig "app-trait-basic" DELETE SUCCEED • diff --git a/Makefile b/Makefile index f5a2b1ea7..10fd485a4 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ VELA_VERSION ?= 0.1.0 # Repo info GIT_COMMIT ?= git-$(shell git rev-parse --short HEAD) -VELA_VERSION_VAR := github.com/cloud-native-application/rudrx/version.VelaVersion -VELA_GITVERSION_VAR := github.com/cloud-native-application/rudrx/version.GitRevision +VELA_VERSION_VAR := github.com/oam-dev/kubevela/version.VelaVersion +VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision LDFLAGS ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)" GOX = go run github.com/mitchellh/gox diff --git a/PROJECT b/PROJECT index 169a3d9e9..3ea643ef5 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,3 @@ domain: oam.dev -repo: github.com/cloud-native-application/rudrx +repo: github.com/oam-dev/kubevela version: "2" diff --git a/README.md b/README.md index 8fc3b7e23..3394e5cd9 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,9 @@ The Open Application Platform based on Kubernetes and OAM. ## Install `vela` binary ```shell script -git clone git@github.com:cloud-native-application/RudrX.git -cd RudrX -make -mv bin/vela /usr/local/bin +curl https://github.com/oam-dev/kubevela/releases/download/v0.0.1.2/vela-refs.tags.v0.0.1.2-darwin-amd64 +chmod a+x vela-refs.tags.v0.0.1.2-darwin-amd64 +mv vela-refs.tags.v0.0.1.2-darwin-amd64 /usr/local/bin/vela ``` ## Vela commands diff --git a/cmd/core/main.go b/cmd/core/main.go index e38e03515..7d1debd8a 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -23,9 +23,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" - velacore "github.com/cloud-native-application/rudrx/api/v1alpha1" - velacontroller "github.com/cloud-native-application/rudrx/pkg/controller" - velawebhook "github.com/cloud-native-application/rudrx/pkg/webhook" + velacore "github.com/oam-dev/kubevela/api/v1alpha1" + velacontroller "github.com/oam-dev/kubevela/pkg/controller" + velawebhook "github.com/oam-dev/kubevela/pkg/webhook" ) var scheme = runtime.NewScheme() diff --git a/cmd/vela/main.go b/cmd/vela/main.go index 2595ff129..627539367 100644 --- a/cmd/vela/main.go +++ b/cmd/vela/main.go @@ -8,28 +8,28 @@ import ( "runtime" "time" - "github.com/cloud-native-application/rudrx/cmd/vela/fake" + "github.com/oam-dev/kubevela/cmd/vela/fake" - "github.com/cloud-native-application/rudrx/version" + "github.com/oam-dev/kubevela/version" "github.com/gosuri/uitable" "k8s.io/klog" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "sigs.k8s.io/controller-runtime/pkg/client/config" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core" "github.com/spf13/cobra" k8sruntime "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "github.com/cloud-native-application/rudrx/pkg/cmd" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/utils/logs" + "github.com/oam-dev/kubevela/pkg/cmd" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/utils/logs" ) var ( diff --git a/docs/index.md b/docs/index.md index 37848153b..8d0f2cb8d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,9 +11,9 @@ way to integrate any Workloads and Traits. ## Get Started -Check out [Get Started](https://github.com/cloud-native-application/RudrX) to try KubeVela. +Check out [Get Started](https://github.com/oam-dev/kubevela) to try KubeVela. -Explore [Cli docs](https://github.com/cloud-native-application/RudrX/tree/master/documentation/cli) to get a quick glance +Explore [Cli docs](https://github.com/oam-dev/kubevela/tree/master/documentation/cli) to get a quick glance of the power of KubeVela. ## Community @@ -22,4 +22,4 @@ of the power of KubeVela. ## Support or Contact -Having trouble with KubeVela? File an [issue](https://github.com/cloud-native-application/RudrX/issues), or contact us directly [Twitter](https://twitter.com/oam_dev) or [Gitter](https://gitter.im/oam-dev/) +Having trouble with KubeVela? File an [issue](https://github.com/oam-dev/kubevela/issues), or contact us directly [Twitter](https://twitter.com/oam_dev) or [Gitter](https://gitter.im/oam-dev/) diff --git a/e2e/apiserver/apiserver_test.go b/e2e/apiserver/apiserver_test.go index e804e61d2..fd2f6a1c0 100644 --- a/e2e/apiserver/apiserver_test.go +++ b/e2e/apiserver/apiserver_test.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/util" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/onsi/gomega" diff --git a/e2e/application/application_test.go b/e2e/application/application_test.go index aa88908d7..6f42cc557 100644 --- a/e2e/application/application_test.go +++ b/e2e/application/application_test.go @@ -3,7 +3,7 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" ) diff --git a/e2e/capability/capability_test.go b/e2e/capability/capability_test.go index 4cca59e1c..97b9866cf 100644 --- a/e2e/capability/capability_test.go +++ b/e2e/capability/capability_test.go @@ -3,11 +3,11 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/commonContext.go b/e2e/commonContext.go index a539a2213..13850abb7 100644 --- a/e2e/commonContext.go +++ b/e2e/commonContext.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/onsi/ginkgo" "github.com/onsi/gomega" diff --git a/e2e/env/env_test.go b/e2e/env/env_test.go index ef2530ccc..419038d17 100644 --- a/e2e/env/env_test.go +++ b/e2e/env/env_test.go @@ -1,7 +1,7 @@ package e2e import ( - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/setup/setup_suite_test.go b/e2e/setup/setup_suite_test.go index 917d40f6f..89b30a410 100644 --- a/e2e/setup/setup_suite_test.go +++ b/e2e/setup/setup_suite_test.go @@ -3,7 +3,7 @@ package e2e import ( "testing" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" diff --git a/e2e/trait/trait_test.go b/e2e/trait/trait_test.go index 0a133310b..16a10bcca 100644 --- a/e2e/trait/trait_test.go +++ b/e2e/trait/trait_test.go @@ -5,7 +5,7 @@ import ( "github.com/onsi/gomega" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" ) diff --git a/e2e/workload/workload_test.go b/e2e/workload/workload_test.go index 162bf9bd2..60f7cd24b 100644 --- a/e2e/workload/workload_test.go +++ b/e2e/workload/workload_test.go @@ -3,7 +3,7 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/go.mod b/go.mod index ab237491c..9c9dc1364 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cloud-native-application/rudrx +module github.com/oam-dev/kubevela go 1.13 diff --git a/pkg/application/app.go b/pkg/application/app.go index f8f7f6763..e765384d3 100644 --- a/pkg/application/app.go +++ b/pkg/application/app.go @@ -20,16 +20,16 @@ import ( "k8s.io/apimachinery/pkg/runtime" - mycue "github.com/cloud-native-application/rudrx/pkg/cue" + mycue "github.com/oam-dev/kubevela/pkg/cue" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/ghodss/yaml" ) diff --git a/pkg/application/run.go b/pkg/application/run.go index 5b0598820..f74aac538 100644 --- a/pkg/application/run.go +++ b/pkg/application/run.go @@ -9,7 +9,7 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" ctypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/app.go b/pkg/cmd/app.go index 126b58b3f..410054360 100644 --- a/pkg/cmd/app.go +++ b/pkg/cmd/app.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/capability.go b/pkg/cmd/capability.go index 6ac5203b7..95d7d6094 100644 --- a/pkg/cmd/capability.go +++ b/pkg/cmd/capability.go @@ -8,11 +8,11 @@ import ( "github.com/gosuri/uitable" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/comp.go b/pkg/cmd/comp.go index 7ab0fdb94..ce7c20932 100644 --- a/pkg/cmd/comp.go +++ b/pkg/cmd/comp.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/completion.go b/pkg/cmd/completion.go index 92e7c7458..09620431a 100644 --- a/pkg/cmd/completion.go +++ b/pkg/cmd/completion.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/dashboard.go b/pkg/cmd/dashboard.go index 38f3526ae..c54627873 100644 --- a/pkg/cmd/dashboard.go +++ b/pkg/cmd/dashboard.go @@ -17,11 +17,11 @@ import ( "github.com/mholt/archiver/v3" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/server" - "github.com/cloud-native-application/rudrx/pkg/server/util" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/server" + "github.com/oam-dev/kubevela/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/spf13/cobra" "go.uber.org/zap/zapcore" diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go index 4010a7951..5e0f69d09 100644 --- a/pkg/cmd/delete.go +++ b/pkg/cmd/delete.go @@ -3,9 +3,9 @@ package cmd import ( "errors" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cmd/env.go b/pkg/cmd/env.go index a33b2b542..402e08f4a 100644 --- a/pkg/cmd/env.go +++ b/pkg/cmd/env.go @@ -7,10 +7,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/pkg/cmd/env_test.go b/pkg/cmd/env_test.go index d9efcd106..c12b2ed4e 100644 --- a/pkg/cmd/env_test.go +++ b/pkg/cmd/env_test.go @@ -7,15 +7,15 @@ import ( "strings" "testing" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/crossplane/crossplane-runtime/pkg/test" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/logs.go b/pkg/cmd/logs.go index c0aef79cc..c18fe0e5b 100644 --- a/pkg/cmd/logs.go +++ b/pkg/cmd/logs.go @@ -5,8 +5,8 @@ import ( "github.com/wercker/stern/kubernetes" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" sternCmd "github.com/wercker/stern/cmd" "github.com/wercker/stern/stern" diff --git a/pkg/cmd/ls.go b/pkg/cmd/ls.go index dea2c9bcf..3d56e60ef 100644 --- a/pkg/cmd/ls.go +++ b/pkg/cmd/ls.go @@ -6,13 +6,13 @@ import ( gocmp "github.com/google/go-cmp/cmp" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gosuri/uitable" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/refresh.go b/pkg/cmd/refresh.go index a53be4d8d..5fb05d665 100644 --- a/pkg/cmd/refresh.go +++ b/pkg/cmd/refresh.go @@ -3,10 +3,10 @@ package cmd import ( "context" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index c71b38c25..6c89dee1b 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/show.go b/pkg/cmd/show.go index c057144a8..968da61eb 100644 --- a/pkg/cmd/show.go +++ b/pkg/cmd/show.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/application" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go index 25d3bdbf2..9cf2bc9d1 100644 --- a/pkg/cmd/status.go +++ b/pkg/cmd/status.go @@ -11,11 +11,11 @@ import ( "github.com/fatih/color" "github.com/gosuri/uitable" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/system.go b/pkg/cmd/system.go index 71670654f..46dae7be7 100644 --- a/pkg/cmd/system.go +++ b/pkg/cmd/system.go @@ -6,15 +6,15 @@ import ( "io" "strings" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/builtin/traitdefinition" + "github.com/oam-dev/kubevela/pkg/builtin/traitdefinition" - "github.com/cloud-native-application/rudrx/pkg/builtin/workloaddefinition" + "github.com/oam-dev/kubevela/pkg/builtin/workloaddefinition" "github.com/ghodss/yaml" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "k8s.io/apimachinery/pkg/runtime" @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" kubeerrors "k8s.io/apimachinery/pkg/api/errors" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" ) type initCmd struct { diff --git a/pkg/cmd/trait.go b/pkg/cmd/trait.go index b3bc13f75..32b3a777a 100644 --- a/pkg/cmd/trait.go +++ b/pkg/cmd/trait.go @@ -4,15 +4,15 @@ import ( "context" "errors" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/traits.go b/pkg/cmd/traits.go index 1b4662b09..f302d34ef 100644 --- a/pkg/cmd/traits.go +++ b/pkg/cmd/traits.go @@ -3,9 +3,9 @@ package cmd import ( "strings" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/traits_test.go b/pkg/cmd/traits_test.go index 2c6cfb5a9..11a3753b5 100644 --- a/pkg/cmd/traits_test.go +++ b/pkg/cmd/traits_test.go @@ -8,8 +8,8 @@ import ( "github.com/gosuri/uitable" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" ) func Test_printTraitList(t *testing.T) { diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go index 51c32d782..561aeab9f 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/cmd/util/helpers.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/workloads.go b/pkg/cmd/workloads.go index d93dab18a..71d99c082 100644 --- a/pkg/cmd/workloads.go +++ b/pkg/cmd/workloads.go @@ -1,10 +1,10 @@ package cmd import ( - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" ) diff --git a/pkg/controller/setup.go b/pkg/controller/setup.go index f8a3452d3..40aee2903 100644 --- a/pkg/controller/setup.go +++ b/pkg/controller/setup.go @@ -19,8 +19,8 @@ package controller import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/cloud-native-application/rudrx/pkg/controller/v1alpha1/containerized" - "github.com/cloud-native-application/rudrx/pkg/controller/v1alpha1/metrics" + "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/containerized" + "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/metrics" ) // Setup workload controllers. diff --git a/pkg/controller/v1alpha1/containerized/containerized_controller.go b/pkg/controller/v1alpha1/containerized/containerized_controller.go index b0a8785c2..c22065d75 100644 --- a/pkg/controller/v1alpha1/containerized/containerized_controller.go +++ b/pkg/controller/v1alpha1/containerized/containerized_controller.go @@ -35,7 +35,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // Reconcile error strings. diff --git a/pkg/controller/v1alpha1/containerized/suite_test.go b/pkg/controller/v1alpha1/containerized/suite_test.go index 2daee74aa..f36dc363b 100644 --- a/pkg/controller/v1alpha1/containerized/suite_test.go +++ b/pkg/controller/v1alpha1/containerized/suite_test.go @@ -30,7 +30,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - v1alpha1 "github.com/cloud-native-application/rudrx/api/v1alpha1" + v1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller.go b/pkg/controller/v1alpha1/metrics/metricstrait_controller.go index 631a2ebb0..aa0bc75b5 100644 --- a/pkg/controller/v1alpha1/metrics/metricstrait_controller.go +++ b/pkg/controller/v1alpha1/metrics/metricstrait_controller.go @@ -37,7 +37,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) const ( diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go b/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go index 2129cd617..170eeb0d0 100644 --- a/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go +++ b/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go @@ -18,7 +18,7 @@ import ( "k8s.io/utils/pointer" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) var ( diff --git a/pkg/controller/v1alpha1/metrics/suite_test.go b/pkg/controller/v1alpha1/metrics/suite_test.go index b366ed289..4852b9fa9 100644 --- a/pkg/controller/v1alpha1/metrics/suite_test.go +++ b/pkg/controller/v1alpha1/metrics/suite_test.go @@ -36,7 +36,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - standardv1alpha1 "github.com/cloud-native-application/rudrx/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/cue/convert.go b/pkg/cue/convert.go index 56e9023d6..a188cbd43 100644 --- a/pkg/cue/convert.go +++ b/pkg/cue/convert.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "cuelang.org/go/cue" "cuelang.org/go/pkg/encoding/json" diff --git a/pkg/cue/convert_test.go b/pkg/cue/convert_test.go index 1aa5ff2f2..716c19123 100644 --- a/pkg/cue/convert_test.go +++ b/pkg/cue/convert_test.go @@ -7,7 +7,7 @@ import ( "cuelang.org/go/cue" "cuelang.org/go/pkg/encoding/json" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/oam/application.go b/pkg/oam/application.go index 35bb4ae66..1bec2e93c 100644 --- a/pkg/oam/application.go +++ b/pkg/oam/application.go @@ -6,10 +6,10 @@ import ( "os" "sort" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/application" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/server/apis" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/oam/capability.go b/pkg/oam/capability.go index 45f54ade5..73c4d3c3e 100644 --- a/pkg/oam/capability.go +++ b/pkg/oam/capability.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/oam/env.go b/pkg/oam/env.go index f217ca85d..84f5b58b7 100644 --- a/pkg/oam/env.go +++ b/pkg/oam/env.go @@ -16,8 +16,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/utils/system" ) func GetEnvByName(name string) (*types.EnvMeta, error) { diff --git a/pkg/oam/system.go b/pkg/oam/system.go index dc19e971b..e9a2b9fbb 100644 --- a/pkg/oam/system.go +++ b/pkg/oam/system.go @@ -18,10 +18,10 @@ import ( "helm.sh/helm/v3/pkg/repo" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/pkg/errors" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "helm.sh/helm/v3/pkg/kube" "helm.sh/helm/v3/pkg/action" diff --git a/pkg/oam/trait.go b/pkg/oam/trait.go index 4b912e604..ba01c4b52 100644 --- a/pkg/oam/trait.go +++ b/pkg/oam/trait.go @@ -13,14 +13,14 @@ import ( "github.com/gin-gonic/gin" "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" "github.com/spf13/pflag" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" plur "github.com/gertd/go-pluralize" diff --git a/pkg/oam/workload.go b/pkg/oam/workload.go index c7bbd3891..403f6afd8 100644 --- a/pkg/oam/workload.go +++ b/pkg/oam/workload.go @@ -6,16 +6,16 @@ import ( "strconv" "strings" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/pflag" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cmd/util" "sigs.k8s.io/controller-runtime/pkg/client" "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" ) type RunOptions struct { diff --git a/pkg/plugins/capcenter.go b/pkg/plugins/capcenter.go index dec4c5ff5..825b5d2c2 100644 --- a/pkg/plugins/capcenter.go +++ b/pkg/plugins/capcenter.go @@ -16,10 +16,10 @@ import ( "github.com/google/go-github/v32/github" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/ghodss/yaml" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/plugins/cluster.go b/pkg/plugins/cluster.go index ecc5010c9..dbc9bc42f 100644 --- a/pkg/plugins/cluster.go +++ b/pkg/plugins/cluster.go @@ -7,16 +7,16 @@ import ( "io/ioutil" "path/filepath" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cue" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cue" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/plugins/cluster_test.go b/pkg/plugins/cluster_test.go index 105ac552f..a7b326fa5 100644 --- a/pkg/plugins/cluster_test.go +++ b/pkg/plugins/cluster_test.go @@ -9,7 +9,7 @@ import ( "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/plugins/local.go b/pkg/plugins/local.go index 6a4044dc5..c5436b890 100644 --- a/pkg/plugins/local.go +++ b/pkg/plugins/local.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/utils/system" ) func LoadCapabilityByName(name string) (types.Capability, error) { diff --git a/pkg/plugins/local_test.go b/pkg/plugins/local_test.go index 1dbdb9b5d..4db7fe3cc 100644 --- a/pkg/plugins/local_test.go +++ b/pkg/plugins/local_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/plugins/suit_test.go b/pkg/plugins/suit_test.go index 56e0c3458..87132382f 100644 --- a/pkg/plugins/suit_test.go +++ b/pkg/plugins/suit_test.go @@ -10,7 +10,7 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/server/apis/types.go b/pkg/server/apis/types.go index 8b5cc3a19..e7623c8bd 100644 --- a/pkg/server/apis/types.go +++ b/pkg/server/apis/types.go @@ -1,7 +1,7 @@ package apis import ( - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/server/handler/appHandlers.go b/pkg/server/handler/appHandlers.go index c693a4fe1..88a223951 100644 --- a/pkg/server/handler/appHandlers.go +++ b/pkg/server/handler/appHandlers.go @@ -1,11 +1,11 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gin-gonic/gin" ) diff --git a/pkg/server/handler/capabilityHandlers.go b/pkg/server/handler/capabilityHandlers.go index 2a8d38413..aaf421a5d 100644 --- a/pkg/server/handler/capabilityHandlers.go +++ b/pkg/server/handler/capabilityHandlers.go @@ -1,9 +1,9 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/envHandlers.go b/pkg/server/handler/envHandlers.go index ad460f013..c406f039b 100644 --- a/pkg/server/handler/envHandlers.go +++ b/pkg/server/handler/envHandlers.go @@ -1,14 +1,14 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" ) // ENV related handlers diff --git a/pkg/server/handler/traitHandler.go b/pkg/server/handler/traitHandler.go index f1d297f42..3828c6ee7 100644 --- a/pkg/server/handler/traitHandler.go +++ b/pkg/server/handler/traitHandler.go @@ -3,10 +3,10 @@ package handler import ( "strconv" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/server/handler/workloadHandler.go b/pkg/server/handler/workloadHandler.go index 7a5138119..afe9e7eb9 100644 --- a/pkg/server/handler/workloadHandler.go +++ b/pkg/server/handler/workloadHandler.go @@ -1,14 +1,14 @@ package handler import ( - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" ) diff --git a/pkg/server/route.go b/pkg/server/route.go index 7337e0891..231301165 100644 --- a/pkg/server/route.go +++ b/pkg/server/route.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/handler" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/handler" + "github.com/oam-dev/kubevela/pkg/server/util" ) // setup the gin http server handler diff --git a/pkg/server/util/api.go b/pkg/server/util/api.go index 92c5349c8..d050b79f4 100644 --- a/pkg/server/util/api.go +++ b/pkg/server/util/api.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" ) var DefaultDashboardPort = ":38081" diff --git a/pkg/utils/system/system.go b/pkg/utils/system/system.go index 19870185f..1e3c2f2be 100644 --- a/pkg/utils/system/system.go +++ b/pkg/utils/system/system.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" ) const defaultVelaHome = ".vela" diff --git a/pkg/webhook/containerized/containerized_test.go b/pkg/webhook/containerized/containerized_test.go index 4a43395ab..46f65c308 100644 --- a/pkg/webhook/containerized/containerized_test.go +++ b/pkg/webhook/containerized/containerized_test.go @@ -7,8 +7,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - . "github.com/cloud-native-application/rudrx/pkg/webhook/containerized" + "github.com/oam-dev/kubevela/api/v1alpha1" + . "github.com/oam-dev/kubevela/pkg/webhook/containerized" ) var _ = Describe("Containerized", func() { diff --git a/pkg/webhook/containerized/mutating_handler.go b/pkg/webhook/containerized/mutating_handler.go index 166323eaf..ec12101e2 100644 --- a/pkg/webhook/containerized/mutating_handler.go +++ b/pkg/webhook/containerized/mutating_handler.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - util "github.com/cloud-native-application/rudrx/pkg/utils" + "github.com/oam-dev/kubevela/api/v1alpha1" + util "github.com/oam-dev/kubevela/pkg/utils" ) // MutatingHandler handles Containerized workload diff --git a/pkg/webhook/containerized/validating_handler.go b/pkg/webhook/containerized/validating_handler.go index 272bf6e38..523da1a35 100644 --- a/pkg/webhook/containerized/validating_handler.go +++ b/pkg/webhook/containerized/validating_handler.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // ValidatingHandler handles Containerized diff --git a/pkg/webhook/metrics/metrics_test.go b/pkg/webhook/metrics/metrics_test.go index 20109353d..458625b8e 100644 --- a/pkg/webhook/metrics/metrics_test.go +++ b/pkg/webhook/metrics/metrics_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - . "github.com/cloud-native-application/rudrx/pkg/webhook/metrics" + "github.com/oam-dev/kubevela/api/v1alpha1" + . "github.com/oam-dev/kubevela/pkg/webhook/metrics" ) var _ = Describe("Metrics Admission controller Test", func() { diff --git a/pkg/webhook/metrics/mutating_handler.go b/pkg/webhook/metrics/mutating_handler.go index eb05ed32e..a56c169b6 100644 --- a/pkg/webhook/metrics/mutating_handler.go +++ b/pkg/webhook/metrics/mutating_handler.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - util "github.com/cloud-native-application/rudrx/pkg/utils" + "github.com/oam-dev/kubevela/api/v1alpha1" + util "github.com/oam-dev/kubevela/pkg/utils" ) const ( diff --git a/pkg/webhook/metrics/validating_handler.go b/pkg/webhook/metrics/validating_handler.go index a3518f02e..51bc66fad 100644 --- a/pkg/webhook/metrics/validating_handler.go +++ b/pkg/webhook/metrics/validating_handler.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // ValidatingHandler handles MetricsTrait diff --git a/pkg/webhook/register.go b/pkg/webhook/register.go index 36f04e82d..1a00918a0 100644 --- a/pkg/webhook/register.go +++ b/pkg/webhook/register.go @@ -4,8 +4,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/cloud-native-application/rudrx/pkg/webhook/containerized" - "github.com/cloud-native-application/rudrx/pkg/webhook/metrics" + "github.com/oam-dev/kubevela/pkg/webhook/containerized" + "github.com/oam-dev/kubevela/pkg/webhook/metrics" ) // +kubebuilder:webhook:verbs=create;update;delete,path=/validate-standard-oam-dev-v1alpha1-metricstrait,mutating=false,failurePolicy=fail,groups=standard.oam.dev,resources=metricstraits,versions=v1alpha1,name=vmetricstrait.kb.io From 1e4a1159b5b5de5775c573ce269efa9562e2e103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= Date: Fri, 11 Sep 2020 17:52:14 +0800 Subject: [PATCH 2/3] clean up --- CONTRIBUTING.md | 2 +- Makefile | 7 +- README.md | 85 +------ api/types/capability.go | 4 +- api/types/types.go | 6 +- .../cert-manager/download-cert-manager.sh | 44 ---- .../crds}/cert-manager-crds.yaml | 0 .../templates}/cert-manager.yaml | 40 ---- cmd/vela/fake/source.go | 2 + cmd/vela/main.go | 51 ++--- ...restful-interface => restful-interface.md} | 0 documentation/cli/vela.md | 2 +- .../{vela_system_init.md => vela_install.md} | 6 +- e2e/apiserver/apiserver_test.go | 7 +- e2e/application/application_test.go | 1 + e2e/capability/capability_test.go | 3 +- e2e/cli.go | 4 +- e2e/commonContext.go | 4 +- e2e/env/env_test.go | 1 + e2e/system/system_test.go | 2 +- e2e/trait/trait_test.go | 2 +- go.mod | 5 +- go.sum | 207 ++++++++++++++++++ hack/chart/generate.go | 20 ++ integration/integration_suite_test.go | 20 -- integration/server_test.go | 23 -- pkg/application/app.go | 21 +- pkg/application/run.go | 10 +- pkg/{cmd => commands}/app.go | 5 +- pkg/{cmd => commands}/capability.go | 10 +- pkg/{cmd => commands}/comp.go | 4 +- pkg/{cmd => commands}/completion.go | 2 +- pkg/{cmd => commands}/dashboard.go | 7 +- pkg/{cmd => commands}/delete.go | 4 +- pkg/{cmd => commands}/env.go | 7 +- pkg/{cmd => commands}/env_test.go | 4 +- pkg/{cmd => commands}/logs.go | 8 +- pkg/{cmd => commands}/ls.go | 16 +- pkg/{cmd => commands}/refresh.go | 5 +- pkg/{cmd => commands}/run.go | 7 +- pkg/{cmd => commands}/show.go | 4 +- pkg/{cmd => commands}/status.go | 12 +- pkg/{cmd => commands}/system.go | 87 ++++---- pkg/{cmd => commands}/trait.go | 11 +- pkg/{cmd => commands}/trait_test.go | 2 +- pkg/{cmd => commands}/traits.go | 4 +- pkg/{cmd => commands}/traits_test.go | 4 +- pkg/{cmd => commands}/util/cmd.go | 0 pkg/{cmd => commands}/util/factory.go | 0 pkg/{cmd => commands}/util/helpers.go | 11 +- pkg/{cmd => commands}/util/init.go | 0 pkg/{cmd => commands}/workloads.go | 4 +- pkg/oam/application.go | 2 +- pkg/oam/capability.go | 13 +- pkg/oam/env.go | 4 +- pkg/oam/system.go | 22 +- pkg/oam/trait.go | 76 +------ pkg/oam/workload.go | 12 +- pkg/plugins/capcenter.go | 10 +- pkg/plugins/cluster.go | 14 +- pkg/plugins/suit_test.go | 16 +- pkg/server/apis/types.go | 3 +- pkg/server/handler/appHandlers.go | 2 +- pkg/server/handler/capabilityHandlers.go | 1 + pkg/server/handler/envHandlers.go | 3 +- pkg/server/handler/miscHandlers.go | 13 +- pkg/server/handler/traitHandler.go | 5 +- pkg/server/handler/workloadHandler.go | 8 +- pkg/server/route.go | 1 - pkg/utils/logs/logs.go | 61 ------ .../containerized/containerized_suite_test.go | 13 -- .../containerized/containerized_test.go | 14 +- pkg/webhook/containerized/mutating_handler.go | 4 +- pkg/webhook/metrics/metrics_suite_test.go | 13 -- pkg/webhook/metrics/metrics_test.go | 16 +- pkg/webhook/metrics/mutating_handler.go | 6 +- 76 files changed, 498 insertions(+), 631 deletions(-) delete mode 100755 charts/third_party/cert-manager/download-cert-manager.sh rename charts/{third_party/cert-manager => vela-core/crds}/cert-manager-crds.yaml (100%) rename charts/{third_party/cert-manager => vela-core/templates}/cert-manager.yaml (93%) rename design/{restful-interface => restful-interface.md} (100%) rename documentation/cli/{vela_system_init.md => vela_install.md} (82%) create mode 100644 hack/chart/generate.go delete mode 100644 integration/integration_suite_test.go delete mode 100644 integration/server_test.go rename pkg/{cmd => commands}/app.go (90%) rename pkg/{cmd => commands}/capability.go (99%) rename pkg/{cmd => commands}/comp.go (98%) rename pkg/{cmd => commands}/completion.go (99%) rename pkg/{cmd => commands}/dashboard.go (98%) rename pkg/{cmd => commands}/delete.go (97%) rename pkg/{cmd => commands}/env.go (98%) rename pkg/{cmd => commands}/env_test.go (97%) rename pkg/{cmd => commands}/logs.go (97%) rename pkg/{cmd => commands}/ls.go (98%) rename pkg/{cmd => commands}/refresh.go (96%) rename pkg/{cmd => commands}/run.go (96%) rename pkg/{cmd => commands}/show.go (98%) rename pkg/{cmd => commands}/status.go (99%) rename pkg/{cmd => commands}/system.go (78%) rename pkg/{cmd => commands}/trait.go (98%) rename pkg/{cmd => commands}/trait_test.go (97%) rename pkg/{cmd => commands}/traits.go (94%) rename pkg/{cmd => commands}/traits_test.go (96%) rename pkg/{cmd => commands}/util/cmd.go (100%) rename pkg/{cmd => commands}/util/factory.go (100%) rename pkg/{cmd => commands}/util/helpers.go (99%) rename pkg/{cmd => commands}/util/init.go (100%) rename pkg/{cmd => commands}/workloads.go (93%) delete mode 100644 pkg/utils/logs/logs.go delete mode 100644 pkg/webhook/containerized/containerized_suite_test.go delete mode 100644 pkg/webhook/metrics/metrics_suite_test.go diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2592ca6df..ad9029b5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,7 +93,7 @@ Creating AppConfig app-trait-basic SUCCEED • ------------------------------ -Trait rudr attach trait +Trait kubevela attach trait should print successful attached information kubevela/e2e/trait/trait_test.go:24 Applying trait for app diff --git a/Makefile b/Makefile index 10fd485a4..2393d6ab4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VELA_VERSION ?= 0.1.0 GIT_COMMIT ?= git-$(shell git rev-parse --short HEAD) VELA_VERSION_VAR := github.com/oam-dev/kubevela/version.VelaVersion VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision -LDFLAGS ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)" +LDFLAGS ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT) -X main.chartTGZSource=$$(cat -) -s -w" GOX = go run github.com/mitchellh/gox TARGETS := darwin/amd64 linux/amd64 windows/amd64 @@ -24,7 +24,7 @@ test: fmt vet lint # Build manager binary build: fmt vet lint - go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go + go run hack/chart/generate.go | go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go npm-build: cd dashboard && npm run build && cd ./.. @@ -36,8 +36,7 @@ generate-source: go run hack/frontend/source.go cross-build: -# TODO: build vela core chart into vela binary - GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=3 -output="bin/vela-{{.OS}}-{{.Arch}}" -osarch='$(TARGETS)' ./cmd/vela/ + go run hack/chart/generate.go | GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=3 -output="bin/vela-{{.OS}}-{{.Arch}}" -osarch='$(TARGETS)' ./cmd/vela/ # Run against the configured Kubernetes cluster in ~/.kube/config run: fmt vet diff --git a/README.md b/README.md index 3394e5cd9..b2c90a57b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The Open Application Platform based on Kubernetes and OAM. -## Install `vela` binary +## Get `vela` binary ```shell script curl https://github.com/oam-dev/kubevela/releases/download/v0.0.1.2/vela-refs.tags.v0.0.1.2-darwin-amd64 @@ -10,69 +10,10 @@ chmod a+x vela-refs.tags.v0.0.1.2-darwin-amd64 mv vela-refs.tags.v0.0.1.2-darwin-amd64 /usr/local/bin/vela ``` -## Vela commands +## Install ```shell script -$ vela -✈️ A Micro App Platform for Kubernetes. - -Usage: - vela [flags] - vela [command] - -Available Commands: - - Getting Started: - - env Manage application environments - delete Delete environment - init Create environment and switch to it - ls List all environments - switch switch to another environment - version Prints out build version information - - Applications: - - app Manage applications with ls, show, delete, run - delete Delete Applications - ls List applications with workloads, traits, status and created time - run [args] Run a bundle of OAM Applications - show get details of your app, including its workload and trait - status get status of an application, including its workload and trait - comp Manage Components - delete Delete Component From Application - ls List applications with workloads, traits, status and created time - run [args] Init and Run workloads - show get component detail, including arguments of workload and trait - - Traits: - - rollout [args] Attach rollout trait to an app - route [args] Attach route trait to an app - scale [args] Attach scale trait to an app - - Want more? < install more capabilities by `vela cap` > - - Others: - - cap Capability Management with config, list, add, remove capabilities - add
/ Add capability into cluster - center Manage Capability Center with config, sync, list - ls [centerName] List all capabilities in center - remove Remove capability from cluster - - System: - - completion < bash | zsh > Output shell completion code for the specified shell (bash or zsh... - bash Generate the autocompletion script for Vela for the bash shell.... - zsh Generate the autocompletion script for Vela for the zsh shell. - - T... - dashboard Setup API Server and launch Dashboard - system system management utilities - info show vela client and cluster version - init Install OAM runtime and vela builtin capabilities. - update Refresh and sync definition files from cluster +vela install ``` #### env @@ -101,9 +42,12 @@ Error: you can't delete current using default $ vela comp run -t deployment app123 -p 80 --image nginx:1.9.4 Creating AppConfig app123 SUCCEED + +$ vela comp status app123 ``` #### app + ``` $ vela app ls app123 @@ -122,19 +66,6 @@ Deleting AppConfig "app123" DELETE SUCCEED ``` -#### WorkloadDefinitions/TraitDefinitions -```shell script -$ vela traits -NAME ALIAS DEFINITION APPLIES TO STATUS -manualscalertraits.core.oam.dev manualscalertraits.core.oam.dev core.oam.dev/v1alpha2.ContainerizedWorkload - -simplerollouttraits.extend.oam.dev simplerollouttraits.extend.oam.dev core.oam.dev/v1alpha2.ContainerizedWorkload, deployments.... - - -$ vela workloads -NAME SHORT DEFINITION -containerizedworkloads.core.oam.dev containerizedworkloads.core.oam.dev -deployments.apps deployments.apps -``` - #### Auto-Completion ##### bash @@ -163,8 +94,8 @@ $ vela completion zsh > "${fpath[1]}/_vela" ### Clean your environment ```shell script -$ helm uninstall core-runtime -n oam-system -release "core-runtime" uninstalled +$ helm uninstall vela-core -n oam-system +release "vela-core" uninstalled ``` ```shell script diff --git a/api/types/capability.go b/api/types/capability.go index ef9e8ae91..c422d6495 100644 --- a/api/types/capability.go +++ b/api/types/capability.go @@ -20,10 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/spf13/pflag" - "cuelang.org/go/cue" - + "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/api/types/types.go b/api/types/types.go index 951f141b1..5264aabe3 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -2,10 +2,8 @@ package types const ( DefaultOAMNS = "oam-system" - DefaultOAMReleaseName = "core-runtime" - DefaultOAMRuntimeChartName = "oam-kubernetes-runtime" - DefaultOAMRepoName = "crossplane-master" - DefaultOAMRepoURL = "https://charts.crossplane.io/master" + DefaultOAMReleaseName = "vela-core" + DefaultOAMRuntimeChartName = "vela-core" DefaultOAMVersion = ">0.0.0-0" DefaultEnvName = "default" diff --git a/charts/third_party/cert-manager/download-cert-manager.sh b/charts/third_party/cert-manager/download-cert-manager.sh deleted file mode 100755 index 6091483d8..000000000 --- a/charts/third_party/cert-manager/download-cert-manager.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# Copyright 2019 The Knative Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#!/usr/bin/env bash - -# Download and unpack cert-manager -CERT_MANAGER_VERSION=0.16.1 -ARCHIVE_DOWNLOAD_URL=https://github.com/jetstack/cert-manager/archive/v${CERT_MANAGER_VERSION}.tar.gz -YAML_URL=https://github.com/jetstack/cert-manager/releases/download/v${CERT_MANAGER_VERSION}/cert-manager.yaml - -wget $ARCHIVE_DOWNLOAD_URL -tar xzf v${CERT_MANAGER_VERSION}.tar.gz - -( -# subshell in downloaded directory -cd cert-manager-${CERT_MANAGER_VERSION} || exit - -# Copy the CRD yaml file -cp deploy/manifests/00-crds.yaml ../cert-manager-crds.yaml -) - -# Download the cert-manager yaml file -wget $YAML_URL - -# Clean up. -rm -rf cert-manager-${CERT_MANAGER_VERSION} -rm v${CERT_MANAGER_VERSION}.tar.gz - -# Add enable-certificate-owner-ref option to cert-manager's controller. -# The option is to cleans up secret(certificate) by adding ownerref. -patch -l cert-manager.yaml owner-ref.patch diff --git a/charts/third_party/cert-manager/cert-manager-crds.yaml b/charts/vela-core/crds/cert-manager-crds.yaml similarity index 100% rename from charts/third_party/cert-manager/cert-manager-crds.yaml rename to charts/vela-core/crds/cert-manager-crds.yaml diff --git a/charts/third_party/cert-manager/cert-manager.yaml b/charts/vela-core/templates/cert-manager.yaml similarity index 93% rename from charts/third_party/cert-manager/cert-manager.yaml rename to charts/vela-core/templates/cert-manager.yaml index 38c590173..24faa8822 100644 --- a/charts/third_party/cert-manager/cert-manager.yaml +++ b/charts/vela-core/templates/cert-manager.yaml @@ -15,7 +15,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 --- @@ -30,7 +29,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 --- @@ -44,7 +42,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 --- # Source: cert-manager/templates/cainjector-rbac.yaml @@ -56,7 +53,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["cert-manager.io"] @@ -86,7 +82,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -108,7 +103,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: # Used for leader election by the controller @@ -130,7 +124,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -155,7 +148,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -181,7 +173,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -203,7 +194,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: @@ -226,7 +216,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: # Used for leader election by the controller @@ -248,7 +237,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -271,7 +259,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["cert-manager.io"] @@ -298,7 +285,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["cert-manager.io"] @@ -325,7 +311,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["cert-manager.io"] @@ -361,7 +346,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["acme.cert-manager.io"] @@ -400,7 +384,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: # Use to update challenge resource status @@ -452,7 +435,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rules: - apiGroups: ["cert-manager.io"] @@ -484,7 +466,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -505,7 +486,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -526,7 +506,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -547,7 +526,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -568,7 +546,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -589,7 +566,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 roleRef: apiGroup: rbac.authorization.k8s.io @@ -610,7 +586,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rbac.authorization.k8s.io/aggregate-to-view: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" @@ -630,7 +605,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-admin: "true" @@ -651,7 +625,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 spec: type: ClusterIP @@ -674,7 +647,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 spec: type: ClusterIP @@ -686,7 +658,6 @@ spec: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller --- # Source: cert-manager/templates/cainjector-deployment.yaml apiVersion: apps/v1 @@ -698,7 +669,6 @@ metadata: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 spec: replicas: 1 @@ -707,14 +677,12 @@ spec: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller template: metadata: labels: app: cainjector app.kubernetes.io/name: cainjector app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 annotations: spec: @@ -746,7 +714,6 @@ metadata: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 spec: replicas: 1 @@ -755,14 +722,12 @@ spec: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller template: metadata: labels: app: cert-manager app.kubernetes.io/name: cert-manager app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 annotations: prometheus.io/path: "/metrics" @@ -808,7 +773,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 spec: replicas: 1 @@ -817,14 +781,12 @@ spec: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller template: metadata: labels: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 annotations: spec: @@ -873,7 +835,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 annotations: cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-tls" @@ -947,7 +908,6 @@ metadata: app: webhook app.kubernetes.io/name: webhook app.kubernetes.io/instance: cert-manager - app.kubernetes.io/managed-by: Tiller helm.sh/chart: cert-manager-v0.12.0 annotations: cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-tls" diff --git a/cmd/vela/fake/source.go b/cmd/vela/fake/source.go index 46ad7bed3..a762ca95b 100644 --- a/cmd/vela/fake/source.go +++ b/cmd/vela/fake/source.go @@ -1,3 +1,5 @@ package fake +// FrontendSource is a base64-encoded, gzipped tarball of the default Frontend Static files. +// This whole file will be rewrite at build time. var FrontendSource string diff --git a/cmd/vela/main.go b/cmd/vela/main.go index 627539367..80f63a5bc 100644 --- a/cmd/vela/main.go +++ b/cmd/vela/main.go @@ -8,34 +8,30 @@ import ( "runtime" "time" + "github.com/oam-dev/kubevela/api/types" "github.com/oam-dev/kubevela/cmd/vela/fake" - + "github.com/oam-dev/kubevela/pkg/commands" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/oam-dev/kubevela/version" - "github.com/gosuri/uitable" - - "k8s.io/klog" - - "github.com/oam-dev/kubevela/api/types" - - "sigs.k8s.io/controller-runtime/pkg/client/config" - - "github.com/oam-dev/kubevela/pkg/utils/system" - "github.com/crossplane/oam-kubernetes-runtime/apis/core" + "github.com/gosuri/uitable" "github.com/spf13/cobra" k8sruntime "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - - "github.com/oam-dev/kubevela/pkg/cmd" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/oam-dev/kubevela/pkg/utils/logs" + "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client/config" ) var ( scheme = k8sruntime.NewScheme() ) +// chartTGZSource is a base64-encoded, gzipped tarball of the default Helm chart. +// Its value is initialized at build time. +var chartTGZSource string + func init() { _ = clientgoscheme.AddToScheme(scheme) @@ -47,8 +43,6 @@ func main() { rand.Seed(time.Now().UnixNano()) command := newCommand() - logs.InitLogs() - defer logs.FlushLogs() if err := command.Execute(); err != nil { os.Exit(1) @@ -98,34 +92,35 @@ func newCommand() *cobra.Command { cmds.AddCommand( // Getting Start - cmd.NewEnvCommand(commandArgs, ioStream), + commands.NewInstallCommand(commandArgs, chartTGZSource, ioStream), + commands.NewEnvCommand(commandArgs, ioStream), // Getting Start NewVersionCommand(), // Apps - cmd.NewAppsCommand(commandArgs, ioStream), + commands.NewAppsCommand(commandArgs, ioStream), // Workloads - cmd.AddCompCommands(commandArgs, ioStream), + commands.AddCompCommands(commandArgs, ioStream), // Capability Systems - cmd.CapabilityCommandGroup(commandArgs, ioStream), + commands.CapabilityCommandGroup(commandArgs, ioStream), // System - cmd.SystemCommandGroup(commandArgs, ioStream), - cmd.NewCompletionCommand(), + commands.SystemCommandGroup(commandArgs, ioStream), + commands.NewCompletionCommand(), - cmd.NewTraitsCommand(ioStream), - cmd.NewWorkloadsCommand(ioStream), + commands.NewTraitsCommand(ioStream), + commands.NewWorkloadsCommand(ioStream), - cmd.NewDashboardCommand(commandArgs, ioStream, fake.FrontendSource), + commands.NewDashboardCommand(commandArgs, ioStream, fake.FrontendSource), - cmd.NewLogsCommand(commandArgs, ioStream), + commands.NewLogsCommand(commandArgs, ioStream), ) // Traits - if err = cmd.AddTraitCommands(cmds, commandArgs, ioStream); err != nil { + if err = commands.AddTraitCommands(cmds, commandArgs, ioStream); err != nil { fmt.Println("Add trait commands from traitDefinition err", err) os.Exit(1) } diff --git a/design/restful-interface b/design/restful-interface.md similarity index 100% rename from design/restful-interface rename to design/restful-interface.md diff --git a/documentation/cli/vela.md b/documentation/cli/vela.md index 5b0706020..9f450df92 100644 --- a/documentation/cli/vela.md +++ b/documentation/cli/vela.md @@ -41,7 +41,7 @@ vela [flags] * [vela scale](vela_scale.md) - Attach scale trait to an app * [vela scale:detach](vela_scale_detach.md) - Detach scale trait from an app * [vela system:info](vela_system_info.md) - show vela client and cluster version -* [vela system init](vela_system_init.md) - Initialize vela on both client and server +* [vela install](vela_system_init.md) - Initialize vela on both client and server * [vela system update](vela_system_update.md) - Sync definition from cluster * [vela traits](vela_traits.md) - List traits * [vela version](vela_version.md) - Prints out build version information diff --git a/documentation/cli/vela_system_init.md b/documentation/cli/vela_install.md similarity index 82% rename from documentation/cli/vela_system_init.md rename to documentation/cli/vela_install.md index e5340d66b..0857214af 100644 --- a/documentation/cli/vela_system_init.md +++ b/documentation/cli/vela_install.md @@ -1,4 +1,4 @@ -## vela system init +## vela install Initialize vela on both client and server @@ -7,13 +7,13 @@ Initialize vela on both client and server Install OAM runtime and vela builtin capabilities. ``` -vela system init [flags] +vela install [flags] ``` ### Options ``` - -h, --help help for system init + -h, --help help for install -v, --version string Override chart version ``` diff --git a/e2e/apiserver/apiserver_test.go b/e2e/apiserver/apiserver_test.go index fd2f6a1c0..300e506c0 100644 --- a/e2e/apiserver/apiserver_test.go +++ b/e2e/apiserver/apiserver_test.go @@ -8,14 +8,11 @@ import ( "strings" "github.com/oam-dev/kubevela/e2e" - + "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/oam-dev/kubevela/pkg/server/util" - "github.com/oam-dev/kubevela/pkg/server/apis" - - "github.com/onsi/gomega" - "github.com/onsi/ginkgo" + "github.com/onsi/gomega" ) var ( diff --git a/e2e/application/application_test.go b/e2e/application/application_test.go index 6f42cc557..38eb0ec94 100644 --- a/e2e/application/application_test.go +++ b/e2e/application/application_test.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/oam-dev/kubevela/e2e" + "github.com/onsi/ginkgo" ) diff --git a/e2e/capability/capability_test.go b/e2e/capability/capability_test.go index 97b9866cf..aec402052 100644 --- a/e2e/capability/capability_test.go +++ b/e2e/capability/capability_test.go @@ -4,10 +4,9 @@ import ( "fmt" "github.com/oam-dev/kubevela/api/types" - + "github.com/oam-dev/kubevela/e2e" "github.com/oam-dev/kubevela/pkg/server/apis" - "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/cli.go b/e2e/cli.go index 0c6509ecd..e414c7687 100644 --- a/e2e/cli.go +++ b/e2e/cli.go @@ -13,7 +13,7 @@ import ( var rudrPath = GetCliBinary() -//GetCliBinary is to build rudr binary. +//GetCliBinary is to build kubevela binary. func GetCliBinary() string { cwd, _ := os.Getwd() return path.Join(cwd, "../..", "./bin") @@ -38,7 +38,7 @@ func AsyncExec(cli string) (*gexec.Session, error) { } func BeforeSuit() { - _, _ = Exec("vela system init") + _, _ = Exec("vela install") //Without this line, will hit issue like `: Error: unknown command "scale" for "vela"` _, _ = Exec("vela system update") } diff --git a/e2e/commonContext.go b/e2e/commonContext.go index 13850abb7..97d6270e2 100644 --- a/e2e/commonContext.go +++ b/e2e/commonContext.go @@ -15,11 +15,11 @@ import ( ) var ( - // SystemInitContext used for test system init + // SystemInitContext used for test install SystemInitContext = func(context string) bool { return ginkgo.Context(context, func() { ginkgo.It("Install OAM runtime and vela builtin capabilities.", func() { - output, err := Exec("vela system init") + output, err := Exec("vela install") gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(output).To(gomega.ContainSubstring("- Installing OAM Kubernetes Runtime")) gomega.Expect(output).To(gomega.ContainSubstring("- Installing builtin capabilities")) diff --git a/e2e/env/env_test.go b/e2e/env/env_test.go index 419038d17..c8d21e66f 100644 --- a/e2e/env/env_test.go +++ b/e2e/env/env_test.go @@ -2,6 +2,7 @@ package e2e import ( "github.com/oam-dev/kubevela/e2e" + "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/system/system_test.go b/e2e/system/system_test.go index 4d05b4fce..64949a46b 100644 --- a/e2e/system/system_test.go +++ b/e2e/system/system_test.go @@ -6,5 +6,5 @@ import ( var _ = ginkgo.Describe("Application", func() { // TODO(zzxwill) Need to find out why it failed in Github workflow. - //e2e.SystemInitContext("system init") + //e2e.SystemInitContext("install") }) diff --git a/e2e/trait/trait_test.go b/e2e/trait/trait_test.go index 16a10bcca..a664858ce 100644 --- a/e2e/trait/trait_test.go +++ b/e2e/trait/trait_test.go @@ -3,10 +3,10 @@ package e2e import ( "fmt" + "github.com/onsi/ginkgo" "github.com/onsi/gomega" "github.com/oam-dev/kubevela/e2e" - "github.com/onsi/ginkgo" ) var ( diff --git a/go.mod b/go.mod index 9c9dc1364..9f576b96e 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,9 @@ require ( github.com/gosuri/uitable v0.0.4 github.com/mholt/archiver/v3 v3.3.0 github.com/oam-dev/trait-injector v0.0.0-20200331033130-0a27b176ffc4 - github.com/onsi/ginkgo v1.11.0 - github.com/onsi/gomega v1.8.1 + github.com/onsi/ginkgo v1.13.0 + github.com/onsi/gomega v1.10.1 + github.com/openservicemesh/osm v0.3.0 github.com/pkg/errors v0.9.1 github.com/rs/xid v1.2.1 // indirect github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b diff --git a/go.sum b/go.sum index 64f9a6c32..85a66ee3a 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,7 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -30,14 +31,17 @@ cloud.google.com/go/storage v1.3.0/go.mod h1:9IAwXhoyBJ7z9LcAwkj0/7NnPzYaPeZxxVp cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= +contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= cuelang.org/go v0.2.2 h1:i/wFo48WDibGHKQTRZ08nB8PqmGpVpQ2sRflZPj73nQ= cuelang.org/go v0.2.2/go.mod h1:Dyjk8Y/B3CfFT1jQKJU0g5PpCeMiDe0yMOhk57oXwqo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737/go.mod h1:w1KSuh2JgIL3nyRiZijboSUwbbxOrTzWwyWVFUHtXBQ= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v23.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v34.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v36.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -50,6 +54,7 @@ github.com/Azure/go-autorest v11.2.8+incompatible h1:Q2feRPMlcfVcqz3pF87PJzkm5lZ github.com/Azure/go-autorest v11.2.8+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v12.2.0+incompatible h1:2Fxszbg492oAJrcvJlgyVaTqnQYRkxmEK6VPCLLVpBI= github.com/Azure/go-autorest v12.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.9.2 h1:6AWuh3uWrsZJcNoCHrCF/+g4aKPCU39kaMO6/qrnK/4= github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -57,6 +62,7 @@ github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503/go.mo github.com/Azure/go-autorest/autorest v0.10.0/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.10.2 h1:NuSF3gXetiHyUbVdneJMEVyPUYAe5wh+aN08JYAf1tI= github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= +github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I= github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= @@ -64,6 +70,8 @@ github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/ github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.8.3 h1:O1AGG9Xig71FxdX9HO5pGNyZ7TbSyHaVg+5eJO/jSGw= github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod h1:Gf7/i2FUpyb/sGBLIFxTBzrNzBo7aPXXE3ZVeDRwdpM= +github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= @@ -71,12 +79,15 @@ github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxB github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc= github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= github.com/Azure/go-autorest/autorest/to v0.3.1-0.20191028180845-3492b2aff503/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= github.com/Azure/go-autorest/autorest/validation v0.2.1-0.20191028180845-3492b2aff503/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -86,11 +97,14 @@ github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig/v3 v3.1.0 h1:j7GpgZ7PdFqNsmncycTHsLmVPf5/3wJtlgW9TNDYD9Y= @@ -106,6 +120,7 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -117,6 +132,7 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/O github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= @@ -155,6 +171,7 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/axw/gocov v1.0.0/go.mod h1:LvQpEYiwwIb2nYkXY2fDWhg9/AsYqkhmrCshjlUJECE= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -166,6 +183,7 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= @@ -173,6 +191,7 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4Yn github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/brancz/kube-rbac-proxy v0.5.0/go.mod h1:cL2VjiIFGS90Cjh5ZZ8+It6tMcBt8rwvuw2J6Mamnl0= github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA= @@ -188,6 +207,7 @@ github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v0.0.0-20181017004759-096ff4a8a059/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -205,6 +225,8 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE= @@ -227,6 +249,7 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kw github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.15+incompatible h1:+9RjdC18gMxNQVvSiXvObLu29mOFmkgdsB4cRTlV+EE= github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -248,6 +271,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crossplane/crossplane-runtime v0.8.0 h1:IBm5LWVeqB2BjHpkykURHY0PSozXWfIXk7LfWtr27wY= github.com/crossplane/crossplane-runtime v0.8.0/go.mod h1:gNY/21MLBaz5KNP7hmfXbBXp8reYRbwY5B/97Kp4tgM= github.com/crossplane/crossplane-runtime v0.9.0 h1:K6/tLhXKzhsEUUddTvEWWnQLLrawWyw1ptNK7NBDpDU= @@ -259,6 +283,7 @@ github.com/crossplane/oam-kubernetes-runtime v0.1.1-0.20200909070723-78b84f2c479 github.com/crossplane/oam-kubernetes-runtime v0.1.1-0.20200909070723-78b84f2c4799/go.mod h1:UZ4eXkl/e4lKrAhK81Pz1sR90wqeuE9PgdwVXr8kDgI= github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/daixiang0/gci v0.0.0-20200727065011-66f1df783cb2/go.mod h1:+AV8KmHTGxxwp/pY84TLQfFKp2vuKXXJVzF3kD/hfR4= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/dave/jennifer v1.3.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -266,8 +291,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/deislabs/oras v0.8.1 h1:If674KraJVpujYR00rzdi0QAmW4BxzMJPVAZJKuhQ0c= github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC4G4As= +github.com/denis-tingajkin/go-header v0.3.1/go.mod h1:sq/2IxMhaZX+RRcgHfCRx/m0M5na0fBt4/CRe7Lrji0= github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -276,6 +303,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 h1:FwssHbCDJD025h+BchanCwE1Q8fyMgqDr2mOQAWOLGw= github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= @@ -327,6 +355,7 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.6/go.mod h1:GFqM7v0B62MraO4PWRedIbhThr/Rf7ev6aHOOPXeaDA= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= @@ -340,6 +369,7 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structtag v1.1.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= @@ -347,6 +377,8 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gertd/go-pluralize v0.1.7 h1:RgvJTJ5W7olOoAks97BOwOlekBFsLEyh00W48Z6ZEZY= @@ -365,6 +397,7 @@ github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= +github.com/go-critic/go-critic v0.5.0/go.mod h1:4jeRh3ZAVnRYhuWdOEvwzVqLUpxMSoAT0xZ74JsTPlo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -372,6 +405,8 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= +github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -381,6 +416,7 @@ github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-logr/zapr v0.1.1 h1:qXBXPDdNncunGs7XeEpsJt8wCjYBygluzfdLO0G5baE= github.com/go-logr/zapr v0.1.1/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -472,6 +508,22 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= +github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= +github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= +github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= @@ -555,9 +607,26 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/golangci-lint v1.30.0/go.mod h1:5t0i3wHlqQc9deBBvZsP+a/4xz7cfjV+zhp5U0Mzp14= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= @@ -571,6 +640,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= @@ -602,10 +672,12 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.4.0 h1:BXDUo8p/DaxC+4FJY/SSx3gvnx9C1VdHNgaUkiEL5mk= github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/gookit/color v1.2.5/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM= @@ -623,6 +695,9 @@ github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= @@ -633,6 +708,7 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -650,6 +726,8 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -659,7 +737,9 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -669,6 +749,7 @@ github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjG github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= @@ -690,6 +771,10 @@ github.com/hashicorp/memberlist v0.2.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.8.5/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc1oal+k= github.com/hashicorp/serf v0.9.0/go.mod h1:YL0HO+FifKOW2u1ke99DGVu1zhcpZzNwrLIqBC7vbYU= +github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= +github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= @@ -717,12 +802,17 @@ github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mq github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= +github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5 h1:lrdPtrORjGv1HbbEvKWDUAy97mPpFm4B8hp77tcCUJY= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -753,6 +843,9 @@ github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.10.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.10.5 h1:7q6vHIqubShURwQz8cQK6yIe/xC3IF0Vm7TGfqjewrc= +github.com/klauspost/compress v1.10.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= @@ -763,6 +856,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -772,9 +867,11 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/kyoh86/exportloopref v0.1.7/go.mod h1:h1rDl2Kdj97+Kwh4gdz3ujE7XHmH51Q0lUiZ1z4NLj8= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= @@ -793,9 +890,11 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.0/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lovoo/gcloud-opentracing v0.3.0/go.mod h1:ZFqk2y38kMDDikZPAK7ynTTGuyt17nSPdS3K5e+ZTBY= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -805,9 +904,12 @@ github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8= github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= +github.com/matm/gocov-html v0.0.0-20200509184451-71874e2e203b/go.mod h1:zha4ZSIA/qviBBKx3j6tJG/Lx6aIdjOXPWuKAcJchQM= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -840,6 +942,7 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do= github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mholt/archiver v1.1.2 h1:xukR55YIrnhDHp10lrNtRSsAK5THpWrOCuviweNSBw4= @@ -860,11 +963,14 @@ github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747/go.mod h1:Sfy github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= @@ -885,6 +991,7 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mozillazg/go-cos v0.13.0/go.mod h1:Zp6DvvXn0RUOXGJ2chmWt2bLEqRAnJnS3DnAZsJsoaE= github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= @@ -895,6 +1002,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -902,9 +1010,14 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.0.0-20200708172631-8866003e3856/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c= github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs= github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oam-dev/stern v1.13.0-alpha h1:EVjM8Qvh6LssB6t4RZrjf9DtCq1cz+/cy6OF7fpy9wk= github.com/oam-dev/stern v1.13.0-alpha/go.mod h1:AOkvfFUv0Arz7GBi0jz7S0Jsu4K/kdvSjNsnRt1+BIg= github.com/oam-dev/trait-injector v0.0.0-20200331033130-0a27b176ffc4 h1:fc41JCTc9w140pE/WPtpmL3uiCjC3DEfzbtvHT6h6xY= @@ -926,6 +1039,9 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.13.0 h1:M76yO2HkZASFjXL0HSoZJ1AYEmQxNJmY41Jx1zNUq1Y= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -934,6 +1050,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -949,6 +1067,8 @@ github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= +github.com/openservicemesh/osm v0.3.0 h1:U88Nv1xm+7M+xYNkwjYVU6WSMp3MHIObTcO+gH20nOw= +github.com/openservicemesh/osm v0.3.0/go.mod h1:gyK0vN5ENnP26Y8huqgeTR52fOotZhnEorie215FnpU= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -970,12 +1090,14 @@ github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.0.0-20180311214515-816c9085562c/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1052,6 +1174,9 @@ github.com/prometheus/prometheus v1.8.2-0.20200110114423-1e64d757f711/go.mod h1: github.com/prometheus/prometheus v1.8.2-0.20200507164740-ecee9c8abfd1/go.mod h1:S5n0C6tSgdnwWshBUceRx5G1OsjLv/EeZ9t3wIfEtsY= github.com/prometheus/prometheus v1.8.2-0.20200609102542-5d7e3e970602/go.mod h1:CwaXafRa0mm72de2GQWtfQxjGytbSKIGivWxQvjpRZs= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= @@ -1068,14 +1193,18 @@ github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 h1:xkBtI5JktwbW/vf4vopBbhYsRFTGfQWHYXzC0/qYwxI= github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod h1:rtQlpHw+eR6UrqaS3kX1VYeaCxzCVdimDS7g5Ln4pPc= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= +github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= @@ -1084,10 +1213,18 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/securego/gosec/v2 v2.4.0/go.mod h1:0/Q4cjmlFDfDUj1+Fib61sc+U5IQb2w+Iv9/C3wPVko= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/servicemeshinterface/smi-sdk-go v0.4.1/go.mod h1:9rsLPBNcqfDNmEgyYwpopn93aE9yz46d2EHFBNOYj/w= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= +github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -1100,13 +1237,17 @@ github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -1131,6 +1272,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/ssgreg/nlreturn/v2 v2.0.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -1146,12 +1289,17 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tetafro/godot v0.4.8/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= github.com/thanos-io/thanos v0.11.0/go.mod h1:N/Yes7J68KqvmY+xM6J5CJqEvWIvKSR5sqGtmuD6wDc= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.20.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.23.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= @@ -1166,9 +1314,16 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.12.0/go.mod h1:229t1eWu9UXTPmoUkbpN/fctKPBY4IJoFXQnxHGXy6E= +github.com/valyala/quicktemplate v1.5.1/go.mod h1:v7yYWpBEiutDyNfVaph6oC/yKwejzVyTX/2cwwHxyok= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= @@ -1189,12 +1344,14 @@ github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6Ut github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.elastic.co/apm v1.5.0/go.mod h1:OdB9sPtM6Vt7oz3VXt7+KR96i9li74qrxBGHTQygFvk= @@ -1247,6 +1404,7 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1269,6 +1427,8 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 h1:bXoxMPcSLOq08zI3/c5dEB golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200422194213-44a606286825 h1:dSChiwOTvzwbHFTMq2l6uRardHH7/E6SqEkqccinS/o= golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1306,6 +1466,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1348,8 +1509,11 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= @@ -1367,6 +1531,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1378,6 +1544,7 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1403,10 +1570,12 @@ golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 h1:HmbHVPwrPEKPGLAcHSrMe6+hqSUlvZU0rab6x5EXfGU= @@ -1415,6 +1584,7 @@ golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1434,6 +1604,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1442,6 +1613,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1457,20 +1629,26 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1478,9 +1656,12 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190813034749-528a2984e271/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190918214516-5a1a30219888/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1489,7 +1670,9 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191111182352-50fa39b762bc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1502,18 +1685,28 @@ golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200321224714-0d839f3cf2ed/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200422205258-72e4a01eba43/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200519015757-0d0afa43d58a/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200603131246-cc40288be839/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200630223951-c138986dd9b9 h1:CrrjeBLnUL9WPTAjIqIPdfEAAs5XNY+8A4/CNxRqmbI= golang.org/x/tools v0.0.0-20200630223951-c138986dd9b9/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200701041122-1837592efa10/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1557,6 +1750,7 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1584,8 +1778,10 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200603110839-e855014d5736 h1:+IE3xTD+6Eb7QWG5JFp+dQr/XjKpjmrNkh4pdjTdHEs= google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1611,17 +1807,20 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1643,6 +1842,7 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXL gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -1667,6 +1867,7 @@ gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8 h1:jL/vaozO53FMfZLySWM+4nulF gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +helm.sh/helm/v3 v3.2.0/go.mod h1:ZaXz/vzktgwjyGGFbUWtIQkscfE7WYoRGP2szqAFHR0= helm.sh/helm/v3 v3.2.4 h1:lz/0ZRkSgyIF+pCo6pjFzap1udCARB1IN6CRfqkpcOg= helm.sh/helm/v3 v3.2.4/go.mod h1:ZaXz/vzktgwjyGGFbUWtIQkscfE7WYoRGP2szqAFHR0= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1677,6 +1878,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= k8s.io/api v0.0.0-20190813020757-36bff7324fb7/go.mod h1:3Iy+myeAORNCLgjd/Xu9ebwN7Vh59Bw0vh9jhoX+V58= k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= @@ -1768,6 +1970,10 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= @@ -1796,4 +2002,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/hack/chart/generate.go b/hack/chart/generate.go new file mode 100644 index 000000000..af48d2e7c --- /dev/null +++ b/hack/chart/generate.go @@ -0,0 +1,20 @@ +package main + +import ( + "fmt" + "os" + "path/filepath" + + "github.com/openservicemesh/osm/pkg/cli" +) + +func main() { + // Path relative to the Makefile where this is invoked. + chartPath := filepath.Join("charts", "vela-core") + source, err := cli.GetChartSource(chartPath) + if err != nil { + fmt.Fprintln(os.Stderr, "error getting chart source:", err) + os.Exit(1) + } + fmt.Print(source) +} diff --git a/integration/integration_suite_test.go b/integration/integration_suite_test.go deleted file mode 100644 index 635c1b53f..000000000 --- a/integration/integration_suite_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package integration_test - -import ( - "net/http" - "testing" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -var restServer http.Handler - -//var _ = BeforeSuite(func() { -// restServer = server.SetupRoute() -//}) - -func TestIntegration(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Integration Suite") -} diff --git a/integration/server_test.go b/integration/server_test.go deleted file mode 100644 index 48bb0ed5a..000000000 --- a/integration/server_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package integration_test - -import ( - "fmt" - "net/http" - "net/http/httptest" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -var _ = Describe("example test", func() { - - It("Test get environment", func() { - w := httptest.NewRecorder() - req, _ := http.NewRequest("GET", "/api/envs/test", nil) - restServer.ServeHTTP(w, req) - - Expect(w.Code).Should(Equal(http.StatusOK)) - // TODO: unmarshall the body and check - fmt.Println(w.Body.String()) - }) -}) diff --git a/pkg/application/app.go b/pkg/application/app.go index e765384d3..2ca15b459 100644 --- a/pkg/application/app.go +++ b/pkg/application/app.go @@ -12,25 +12,18 @@ import ( "strings" "time" - "github.com/crossplane/oam-kubernetes-runtime/pkg/oam" - - "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" - "cuelang.org/go/cue" - + "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" + "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" + "github.com/crossplane/oam-kubernetes-runtime/pkg/oam" + "github.com/ghodss/yaml" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - mycue "github.com/oam-dev/kubevela/pkg/cue" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - - "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/oam-dev/kubevela/api/types" - - "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - + mycue "github.com/oam-dev/kubevela/pkg/cue" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/utils/system" - "github.com/ghodss/yaml" ) const ( diff --git a/pkg/application/run.go b/pkg/application/run.go index f74aac538..e568b529d 100644 --- a/pkg/application/run.go +++ b/pkg/application/run.go @@ -3,15 +3,13 @@ package application import ( "context" - "github.com/crossplane/oam-kubernetes-runtime/pkg/oam" - - apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - - "github.com/oam-dev/kubevela/api/types" + "github.com/crossplane/oam-kubernetes-runtime/pkg/oam" + apierrors "k8s.io/apimachinery/pkg/api/errors" ctypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/oam-dev/kubevela/api/types" ) func (app *Application) Run(ctx context.Context, client client.Client, env *types.EnvMeta) error { diff --git a/pkg/cmd/app.go b/pkg/commands/app.go similarity index 90% rename from pkg/cmd/app.go rename to pkg/commands/app.go index 410054360..73f85af81 100644 --- a/pkg/cmd/app.go +++ b/pkg/commands/app.go @@ -1,8 +1,9 @@ -package cmd +package commands import ( "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/spf13/cobra" ) diff --git a/pkg/cmd/capability.go b/pkg/commands/capability.go similarity index 99% rename from pkg/cmd/capability.go rename to pkg/commands/capability.go index 95d7d6094..d78417ca8 100644 --- a/pkg/cmd/capability.go +++ b/pkg/commands/capability.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "errors" @@ -6,14 +6,12 @@ import ( "strings" "github.com/gosuri/uitable" + "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/pkg/oam" - "github.com/oam-dev/kubevela/api/types" - - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/spf13/cobra" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/oam" ) func CapabilityCommandGroup(c types.Args, ioStream cmdutil.IOStreams) *cobra.Command { diff --git a/pkg/cmd/comp.go b/pkg/commands/comp.go similarity index 98% rename from pkg/cmd/comp.go rename to pkg/commands/comp.go index ce7c20932..cb36ad41f 100644 --- a/pkg/cmd/comp.go +++ b/pkg/commands/comp.go @@ -1,11 +1,11 @@ -package cmd +package commands import ( "errors" "fmt" "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/plugins" diff --git a/pkg/cmd/completion.go b/pkg/commands/completion.go similarity index 99% rename from pkg/cmd/completion.go rename to pkg/commands/completion.go index 09620431a..a479adf19 100644 --- a/pkg/cmd/completion.go +++ b/pkg/commands/completion.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "fmt" diff --git a/pkg/cmd/dashboard.go b/pkg/commands/dashboard.go similarity index 98% rename from pkg/cmd/dashboard.go rename to pkg/commands/dashboard.go index c54627873..30afbed2a 100644 --- a/pkg/cmd/dashboard.go +++ b/pkg/commands/dashboard.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "context" @@ -15,14 +15,13 @@ import ( "syscall" "time" - "github.com/mholt/archiver/v3" - "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/server" "github.com/oam-dev/kubevela/pkg/server/util" "github.com/oam-dev/kubevela/pkg/utils/system" + "github.com/mholt/archiver/v3" "github.com/spf13/cobra" "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" diff --git a/pkg/cmd/delete.go b/pkg/commands/delete.go similarity index 97% rename from pkg/cmd/delete.go rename to pkg/commands/delete.go index 5e0f69d09..091adef7d 100644 --- a/pkg/cmd/delete.go +++ b/pkg/commands/delete.go @@ -1,10 +1,10 @@ -package cmd +package commands import ( "errors" "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" "github.com/spf13/cobra" diff --git a/pkg/cmd/env.go b/pkg/commands/env.go similarity index 98% rename from pkg/cmd/env.go rename to pkg/commands/env.go index 402e08f4a..3be8a6848 100644 --- a/pkg/cmd/env.go +++ b/pkg/commands/env.go @@ -1,19 +1,18 @@ -package cmd +package commands import ( "context" "fmt" "os" - "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/gosuri/uitable" "github.com/spf13/cobra" + "sigs.k8s.io/controller-runtime/pkg/client" ) func NewEnvCommand(c types.Args, ioStream cmdutil.IOStreams) *cobra.Command { diff --git a/pkg/cmd/env_test.go b/pkg/commands/env_test.go similarity index 97% rename from pkg/cmd/env_test.go rename to pkg/commands/env_test.go index c12b2ed4e..767d2f78e 100644 --- a/pkg/cmd/env_test.go +++ b/pkg/commands/env_test.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "bytes" @@ -15,7 +15,7 @@ import ( "github.com/oam-dev/kubevela/pkg/utils/system" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/logs.go b/pkg/commands/logs.go similarity index 97% rename from pkg/cmd/logs.go rename to pkg/commands/logs.go index c18fe0e5b..f6b0056a1 100644 --- a/pkg/cmd/logs.go +++ b/pkg/commands/logs.go @@ -1,14 +1,14 @@ -package cmd +package commands import ( "context" - "github.com/wercker/stern/kubernetes" - "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/spf13/cobra" sternCmd "github.com/wercker/stern/cmd" + "github.com/wercker/stern/kubernetes" "github.com/wercker/stern/stern" ) diff --git a/pkg/cmd/ls.go b/pkg/commands/ls.go similarity index 98% rename from pkg/cmd/ls.go rename to pkg/commands/ls.go index 3d56e60ef..22e450434 100644 --- a/pkg/cmd/ls.go +++ b/pkg/commands/ls.go @@ -1,21 +1,19 @@ -package cmd +package commands import ( "context" "strings" - gocmp "github.com/google/go-cmp/cmp" - - "github.com/oam-dev/kubevela/pkg/application" - corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - - "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/oam-dev/kubevela/pkg/oam" + gocmp "github.com/google/go-cmp/cmp" "github.com/gosuri/uitable" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/oam" ) func NewAppListCommand(c types.Args, ioStreams cmdutil.IOStreams) *cobra.Command { diff --git a/pkg/cmd/refresh.go b/pkg/commands/refresh.go similarity index 96% rename from pkg/cmd/refresh.go rename to pkg/commands/refresh.go index 5fb05d665..a3a6b6a15 100644 --- a/pkg/cmd/refresh.go +++ b/pkg/commands/refresh.go @@ -1,12 +1,13 @@ -package cmd +package commands import ( "context" "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/utils/system" + "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/run.go b/pkg/commands/run.go similarity index 96% rename from pkg/cmd/run.go rename to pkg/commands/run.go index 6c89dee1b..0fde83ba6 100644 --- a/pkg/cmd/run.go +++ b/pkg/commands/run.go @@ -1,14 +1,13 @@ -package cmd +package commands import ( "context" "errors" - "github.com/oam-dev/kubevela/pkg/application" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/show.go b/pkg/commands/show.go similarity index 98% rename from pkg/cmd/show.go rename to pkg/commands/show.go index 968da61eb..74fa59b73 100644 --- a/pkg/cmd/show.go +++ b/pkg/commands/show.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "fmt" @@ -7,7 +7,7 @@ import ( "github.com/oam-dev/kubevela/api/types" "github.com/oam-dev/kubevela/pkg/application" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/pkg/cmd/status.go b/pkg/commands/status.go similarity index 99% rename from pkg/cmd/status.go rename to pkg/commands/status.go index 9cf2bc9d1..80ddcc345 100644 --- a/pkg/cmd/status.go +++ b/pkg/commands/status.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "context" @@ -10,14 +10,12 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/fatih/color" "github.com/gosuri/uitable" - - "github.com/oam-dev/kubevela/pkg/application" - - "github.com/oam-dev/kubevela/api/types" - - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) // HealthStatus represents health status strings. diff --git a/pkg/cmd/system.go b/pkg/commands/system.go similarity index 78% rename from pkg/cmd/system.go rename to pkg/commands/system.go index 46dae7be7..e886d23b9 100644 --- a/pkg/cmd/system.go +++ b/pkg/commands/system.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "context" @@ -6,34 +6,29 @@ import ( "io" "strings" - "github.com/oam-dev/kubevela/pkg/oam" - - "github.com/oam-dev/kubevela/pkg/builtin/traitdefinition" - - "github.com/oam-dev/kubevela/pkg/builtin/workloaddefinition" - - "github.com/ghodss/yaml" - - "github.com/oam-dev/kubevela/api/types" - - "k8s.io/apimachinery/pkg/runtime" - oamv1 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - + "github.com/ghodss/yaml" + "github.com/openservicemesh/osm/pkg/cli" + "github.com/pkg/errors" "github.com/spf13/cobra" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + kubeerrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/pkg/errors" - kubeerrors "k8s.io/apimachinery/pkg/api/errors" - - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/builtin/traitdefinition" + "github.com/oam-dev/kubevela/pkg/builtin/workloaddefinition" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/oam" ) type initCmd struct { namespace string ioStreams cmdutil.IOStreams client client.Client - version string + chartPath string } type infoCmd struct { @@ -72,7 +67,7 @@ func SystemCommandGroup(c types.Args, ioStream cmdutil.IOStreams) *cobra.Command types.TagCommandType: types.TypeSystem, }, } - cmd.AddCommand(NewAdminInitCommand(c, ioStream), NewAdminInfoCommand(ioStream), NewRefreshCommand(c, ioStream)) + cmd.AddCommand(NewAdminInfoCommand(ioStream), NewRefreshCommand(c, ioStream)) return cmd } @@ -81,8 +76,8 @@ func NewAdminInfoCommand(ioStreams cmdutil.IOStreams) *cobra.Command { cmd := &cobra.Command{ Use: "info", - Short: "show vela client and cluster version", - Long: "show vela client and cluster version", + Short: "show vela client and cluster chartPath", + Long: "show vela client and cluster chartPath", RunE: func(cmd *cobra.Command, args []string) error { return i.run(ioStreams) }, @@ -96,7 +91,7 @@ func NewAdminInfoCommand(ioStreams cmdutil.IOStreams) *cobra.Command { func (i *infoCmd) run(ioStreams cmdutil.IOStreams) error { clusterVersion, err := GetOAMReleaseVersion() if err != nil { - ioStreams.Errorf("fail to get cluster version, err: %v \n", err) + ioStreams.Errorf("fail to get cluster chartPath, err: %v \n", err) return err } ioStreams.Info("Versions:") @@ -106,10 +101,10 @@ func (i *infoCmd) run(ioStreams cmdutil.IOStreams) error { return nil } -func NewAdminInitCommand(c types.Args, ioStreams cmdutil.IOStreams) *cobra.Command { +func NewInstallCommand(c types.Args, chartSource string, ioStreams cmdutil.IOStreams) *cobra.Command { i := &initCmd{ioStreams: ioStreams} cmd := &cobra.Command{ - Use: "init", + Use: "install", Short: "Initialize vela on both client and server", Long: "Install OAM runtime and vela builtin capabilities.", RunE: func(cmd *cobra.Command, args []string) error { @@ -119,21 +114,21 @@ func NewAdminInitCommand(c types.Args, ioStreams cmdutil.IOStreams) *cobra.Comma } i.client = newClient i.namespace = types.DefaultOAMNS - return i.run(ioStreams) + return i.run(ioStreams, chartSource) }, Annotations: map[string]string{ - types.TagCommandType: types.TypeSystem, + types.TagCommandType: types.TypeStart, }, } flag := cmd.Flags() - flag.StringVarP(&i.version, "version", "v", "", "Override chart version") + flag.StringVarP(&i.chartPath, "vela-chart-path", "p", "", "path to vela core chart to override default chart") return cmd } -func (i *initCmd) run(ioStreams cmdutil.IOStreams) error { - ioStreams.Info("- Installing OAM Kubernetes Runtime:") +func (i *initCmd) run(ioStreams cmdutil.IOStreams, chartSource string) error { + ioStreams.Info("- Installing Vela Core Chart:") if !cmdutil.IsNamespaceExist(i.client, types.DefaultOAMNS) { if err := cmdutil.NewNamespace(i.client, types.DefaultOAMNS); err != nil { return err @@ -142,10 +137,10 @@ func (i *initCmd) run(ioStreams cmdutil.IOStreams) error { if i.IsOamRuntimeExist() { i.ioStreams.Info("Vela system along with OAM runtime already exist.") - } - - if err := InstallOamRuntime(ioStreams, i.version); err != nil { - return err + } else { + if err := InstallOamRuntime(i.chartPath, chartSource); err != nil { + return err + } } ioStreams.Info("- Installing builtin capabilities:") @@ -169,8 +164,26 @@ func (i *initCmd) IsOamRuntimeExist() bool { return oam.IsHelmReleaseRunning(types.DefaultOAMReleaseName, types.DefaultOAMRuntimeChartName, i.ioStreams) } -func InstallOamRuntime(ioStreams cmdutil.IOStreams, version string) error { - return oam.HelmInstall(ioStreams, types.DefaultOAMRepoName, types.DefaultOAMRepoURL, types.DefaultOAMRuntimeChartName, version, types.DefaultOAMReleaseName, nil) +func InstallOamRuntime(chartPath, chartSource string) error { + var err error + var chartRequested *chart.Chart + if chartPath != "" { + chartRequested, err = loader.Load(chartPath) + } else { + chartRequested, err = cli.LoadChart(chartSource) + } + if err != nil { + return fmt.Errorf("error loading chart for installation: %s", err) + } + installClient, err := oam.NewHelmInstall("", types.DefaultOAMReleaseName) + if err != nil { + return fmt.Errorf("error create helm install client: %s", err) + } + //TODO(wonderflow) values here could give more arguments in command line + if _, err = installClient.Run(chartRequested, nil); err != nil { + return err + } + return nil } func GetOAMReleaseVersion() (string, error) { @@ -184,7 +197,7 @@ func GetOAMReleaseVersion() (string, error) { return result.Chart.AppVersion(), nil } } - return "", errors.New("oam-kubernetes-runtime not found in your kubernetes cluster, try `vela system init` to install") + return "", errors.New("oam-kubernetes-runtime not found in your kubernetes cluster, try `vela install` to install") } func GenNativeResourceDefinition(c client.Client) error { diff --git a/pkg/cmd/trait.go b/pkg/commands/trait.go similarity index 98% rename from pkg/cmd/trait.go rename to pkg/commands/trait.go index 32b3a777a..231a1741e 100644 --- a/pkg/cmd/trait.go +++ b/pkg/commands/trait.go @@ -1,18 +1,15 @@ -package cmd +package commands import ( "context" "errors" - "github.com/oam-dev/kubevela/pkg/oam" - + "github.com/oam-dev/kubevela/api/types" "github.com/oam-dev/kubevela/pkg/application" - + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/oam-dev/kubevela/api/types" - - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/trait_test.go b/pkg/commands/trait_test.go similarity index 97% rename from pkg/cmd/trait_test.go rename to pkg/commands/trait_test.go index 5fda4ca4d..a065e4788 100644 --- a/pkg/cmd/trait_test.go +++ b/pkg/commands/trait_test.go @@ -1,4 +1,4 @@ -package cmd +package commands /* func TestNewBindCommand(t *testing.T) { diff --git a/pkg/cmd/traits.go b/pkg/commands/traits.go similarity index 94% rename from pkg/cmd/traits.go rename to pkg/commands/traits.go index f302d34ef..e9fa0fde6 100644 --- a/pkg/cmd/traits.go +++ b/pkg/commands/traits.go @@ -1,12 +1,12 @@ -package cmd +package commands import ( "strings" "github.com/oam-dev/kubevela/pkg/oam" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/traits_test.go b/pkg/commands/traits_test.go similarity index 96% rename from pkg/cmd/traits_test.go rename to pkg/commands/traits_test.go index 11a3753b5..a30a0d3ce 100644 --- a/pkg/cmd/traits_test.go +++ b/pkg/commands/traits_test.go @@ -1,4 +1,4 @@ -package cmd +package commands import ( "bytes" @@ -9,7 +9,7 @@ import ( "github.com/gosuri/uitable" "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) func Test_printTraitList(t *testing.T) { diff --git a/pkg/cmd/util/cmd.go b/pkg/commands/util/cmd.go similarity index 100% rename from pkg/cmd/util/cmd.go rename to pkg/commands/util/cmd.go diff --git a/pkg/cmd/util/factory.go b/pkg/commands/util/factory.go similarity index 100% rename from pkg/cmd/util/factory.go rename to pkg/commands/util/factory.go diff --git a/pkg/cmd/util/helpers.go b/pkg/commands/util/helpers.go similarity index 99% rename from pkg/cmd/util/helpers.go rename to pkg/commands/util/helpers.go index 561aeab9f..a2839937f 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/commands/util/helpers.go @@ -1,21 +1,18 @@ package util import ( + "context" + "encoding/json" "fmt" "os" "strings" - "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "sigs.k8s.io/controller-runtime/pkg/client" - - "context" - "encoding/json" - + "github.com/spf13/cobra" "k8s.io/klog" + "sigs.k8s.io/controller-runtime/pkg/client" ) const ( diff --git a/pkg/cmd/util/init.go b/pkg/commands/util/init.go similarity index 100% rename from pkg/cmd/util/init.go rename to pkg/commands/util/init.go diff --git a/pkg/cmd/workloads.go b/pkg/commands/workloads.go similarity index 93% rename from pkg/cmd/workloads.go rename to pkg/commands/workloads.go index 71d99c082..0c4d72e6e 100644 --- a/pkg/cmd/workloads.go +++ b/pkg/commands/workloads.go @@ -1,10 +1,10 @@ -package cmd +package commands import ( "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" ) diff --git a/pkg/oam/application.go b/pkg/oam/application.go index 1bec2e93c..5c998398c 100644 --- a/pkg/oam/application.go +++ b/pkg/oam/application.go @@ -8,7 +8,7 @@ import ( "github.com/oam-dev/kubevela/api/types" "github.com/oam-dev/kubevela/pkg/application" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/server/apis" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" diff --git a/pkg/oam/capability.go b/pkg/oam/capability.go index 73c4d3c3e..6a9c4015e 100644 --- a/pkg/oam/capability.go +++ b/pkg/oam/capability.go @@ -9,19 +9,18 @@ import ( "path/filepath" "strings" - "github.com/oam-dev/kubevela/pkg/server/apis" - - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - - "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" apierrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/utils/system" ) func AddCapabilityCenter(capName, capURL, capToken string) error { diff --git a/pkg/oam/env.go b/pkg/oam/env.go index 84f5b58b7..5cf22d212 100644 --- a/pkg/oam/env.go +++ b/pkg/oam/env.go @@ -9,11 +9,9 @@ import ( "os" "path/filepath" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/oam-dev/kubevela/api/types" diff --git a/pkg/oam/system.go b/pkg/oam/system.go index e9a2b9fbb..a990e1eae 100644 --- a/pkg/oam/system.go +++ b/pkg/oam/system.go @@ -7,24 +7,18 @@ import ( "os" "strings" + "github.com/pkg/errors" + "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" - - "helm.sh/helm/v3/pkg/release" - - "helm.sh/helm/v3/pkg/getter" - "helm.sh/helm/v3/pkg/cli" - + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/kube" + "helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/repo" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/pkg/errors" - "github.com/oam-dev/kubevela/api/types" - "helm.sh/helm/v3/pkg/kube" - - "helm.sh/helm/v3/pkg/action" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) var ( @@ -43,7 +37,7 @@ func HelmInstall(ioStreams cmdutil.IOStreams, repoName, repoURL, chartName, vers return nil } - chartClient, err := NewHelmInstall(version, releaseName, ioStreams) + chartClient, err := NewHelmInstall(version, releaseName) if err != nil { return err } @@ -75,7 +69,7 @@ func HelmUninstall(ioStreams cmdutil.IOStreams, chartName, releaseName string) e return nil } -func NewHelmInstall(version, releaseName string, ioStreams cmdutil.IOStreams) (*action.Install, error) { +func NewHelmInstall(version, releaseName string) (*action.Install, error) { actionConfig := new(action.Configuration) if err := actionConfig.Init( kube.GetConfig(cmdutil.GetKubeConfig(), "", types.DefaultOAMNS), diff --git a/pkg/oam/trait.go b/pkg/oam/trait.go index ba01c4b52..84d798b67 100644 --- a/pkg/oam/trait.go +++ b/pkg/oam/trait.go @@ -4,43 +4,23 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" - "os" - "path/filepath" "strconv" "strings" - "github.com/gin-gonic/gin" - "cuelang.org/go/cue" - "github.com/oam-dev/kubevela/pkg/application" - "github.com/spf13/pflag" - - "github.com/oam-dev/kubevela/pkg/server/apis" - - "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/oam-dev/kubevela/pkg/utils/system" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - plur "github.com/gertd/go-pluralize" + "github.com/gin-gonic/gin" + "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" -) -func GetGVKFromRawExtension(extension runtime.RawExtension) (string, string, string) { - if extension.Object != nil { - gvk := extension.Object.GetObjectKind().GroupVersionKind() - return gvk.Group, gvk.Version, gvk.Kind - } - var data map[string]interface{} - // leverage Admission Controller to do the check - _ = json.Unmarshal(extension.Raw, &data) - obj := unstructured.Unstructured{Object: data} - gvk := obj.GroupVersionKind() - return gvk.Group, gvk.Version, gvk.Kind -} + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/server/apis" +) func GetTraitDefNameFromRaw(extension runtime.RawExtension) string { if extension.Raw == nil { @@ -65,48 +45,6 @@ func GetTraitAliasByComponentTraitList(componentTraitList []corev1alpha2.Compone return traitAlias } -func GetTraitAliasByKind(ctx context.Context, c client.Client, traitKind string) string { - var traitAlias string - t, err := GetTraitDefinitionByKind(ctx, c, traitKind) - if err != nil { - return traitKind - } - - if traitAlias, err = GetTraitAliasByTraitDefinition(t); err != nil { - return traitKind - } - - return traitAlias -} -func GetTraitAliasByTraitDefinition(traitDefinition corev1alpha2.TraitDefinition) (string, error) { - velaApplicationFolder := filepath.Join("~/.vela", "applications") - if _, err := system.CreateIfNotExist(velaApplicationFolder); err != nil { - return "", nil - } - - d, _ := ioutil.TempDir(velaApplicationFolder, "cue") - defer os.RemoveAll(d) - template, err := plugins.HandleTemplate(traitDefinition.Spec.Extension, traitDefinition.Name, d) - if err != nil { - return "", nil - } - return template.Name, nil -} - -func GetTraitDefinitionByKind(ctx context.Context, c client.Client, traitKind string) (corev1alpha2.TraitDefinition, error) { - var traitDefinitionList corev1alpha2.TraitDefinitionList - var traitDefinition corev1alpha2.TraitDefinition - if err := c.List(ctx, &traitDefinitionList); err != nil { - return traitDefinition, err - } - for _, t := range traitDefinitionList.Items { - if t.Annotations[types.AnnKind] == traitKind { - return t, nil - } - } - return traitDefinition, fmt.Errorf("could not find TraitDefinition by kind %s", traitKind) -} - func ListTraitDefinitions(workloadName *string) ([]types.Capability, error) { var traitList []types.Capability traits, err := plugins.LoadInstalledCapabilityWithType(types.TypeTrait) diff --git a/pkg/oam/workload.go b/pkg/oam/workload.go index 403f6afd8..0943d46eb 100644 --- a/pkg/oam/workload.go +++ b/pkg/oam/workload.go @@ -6,16 +6,14 @@ import ( "strconv" "strings" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/spf13/pflag" - - "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/cmd/util" - "sigs.k8s.io/controller-runtime/pkg/client" - "cuelang.org/go/cue" - "github.com/oam-dev/kubevela/pkg/application" + "github.com/spf13/pflag" + "sigs.k8s.io/controller-runtime/pkg/client" ) type RunOptions struct { diff --git a/pkg/plugins/capcenter.go b/pkg/plugins/capcenter.go index 825b5d2c2..b8f38a649 100644 --- a/pkg/plugins/capcenter.go +++ b/pkg/plugins/capcenter.go @@ -12,15 +12,13 @@ import ( "path/filepath" "strings" - "golang.org/x/oauth2" - - "github.com/google/go-github/v32/github" - "github.com/oam-dev/kubevela/api/types" - "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/oam-dev/kubevela/pkg/utils/system" + + "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" + "github.com/google/go-github/v32/github" + "golang.org/x/oauth2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/plugins/cluster.go b/pkg/plugins/cluster.go index dbc9bc42f..e97f867d9 100644 --- a/pkg/plugins/cluster.go +++ b/pkg/plugins/cluster.go @@ -7,18 +7,14 @@ import ( "io/ioutil" "path/filepath" - cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" + "github.com/oam-dev/kubevela/pkg/cue" "github.com/oam-dev/kubevela/pkg/utils/system" - "k8s.io/apimachinery/pkg/labels" - - "k8s.io/apimachinery/pkg/runtime" - - "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/cue" - corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/plugins/suit_test.go b/pkg/plugins/suit_test.go index 87132382f..38fc6419d 100644 --- a/pkg/plugins/suit_test.go +++ b/pkg/plugins/suit_test.go @@ -7,23 +7,19 @@ import ( "path/filepath" "testing" - "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/ghodss/yaml" - "github.com/oam-dev/kubevela/pkg/utils/system" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" - - "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util" - corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core" - + "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" + "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util" + "github.com/ghodss/yaml" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + corev1 "k8s.io/api/core/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" diff --git a/pkg/server/apis/types.go b/pkg/server/apis/types.go index e7623c8bd..876acb41e 100644 --- a/pkg/server/apis/types.go +++ b/pkg/server/apis/types.go @@ -1,9 +1,10 @@ package apis import ( - "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "k8s.io/apimachinery/pkg/runtime" + + "github.com/oam-dev/kubevela/api/types" ) type Environment struct { diff --git a/pkg/server/handler/appHandlers.go b/pkg/server/handler/appHandlers.go index 88a223951..09a2db903 100644 --- a/pkg/server/handler/appHandlers.go +++ b/pkg/server/handler/appHandlers.go @@ -5,8 +5,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/pkg/oam" "github.com/gin-gonic/gin" + "github.com/oam-dev/kubevela/pkg/oam" ) func UpdateApps(c *gin.Context) { diff --git a/pkg/server/handler/capabilityHandlers.go b/pkg/server/handler/capabilityHandlers.go index aaf421a5d..6e5996d88 100644 --- a/pkg/server/handler/capabilityHandlers.go +++ b/pkg/server/handler/capabilityHandlers.go @@ -4,6 +4,7 @@ import ( "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/server/util" + "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/envHandlers.go b/pkg/server/handler/envHandlers.go index c406f039b..f1663e14e 100644 --- a/pkg/server/handler/envHandlers.go +++ b/pkg/server/handler/envHandlers.go @@ -1,12 +1,11 @@ package handler import ( - "github.com/oam-dev/kubevela/pkg/oam" - "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/oam-dev/kubevela/pkg/server/util" ) diff --git a/pkg/server/handler/miscHandlers.go b/pkg/server/handler/miscHandlers.go index b28fc914e..a918ca164 100644 --- a/pkg/server/handler/miscHandlers.go +++ b/pkg/server/handler/miscHandlers.go @@ -1,6 +1,17 @@ package handler -import "github.com/gin-gonic/gin" +import ( + "net/http" + + "github.com/gin-gonic/gin" + + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/version" +) func GetVersion(c *gin.Context) { + c.JSON(http.StatusOK, apis.Response{ + Code: http.StatusOK, + Data: map[string]string{"version": version.VelaVersion}, + }) } diff --git a/pkg/server/handler/traitHandler.go b/pkg/server/handler/traitHandler.go index 3828c6ee7..6101b6654 100644 --- a/pkg/server/handler/traitHandler.go +++ b/pkg/server/handler/traitHandler.go @@ -3,12 +3,13 @@ package handler import ( "strconv" + "github.com/gin-gonic/gin" + ctrl "sigs.k8s.io/controller-runtime" + "github.com/oam-dev/kubevela/api/types" "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/oam-dev/kubevela/pkg/server/util" - "github.com/gin-gonic/gin" - ctrl "sigs.k8s.io/controller-runtime" ) // Trait related handlers diff --git a/pkg/server/handler/workloadHandler.go b/pkg/server/handler/workloadHandler.go index afe9e7eb9..babf8be23 100644 --- a/pkg/server/handler/workloadHandler.go +++ b/pkg/server/handler/workloadHandler.go @@ -1,15 +1,15 @@ package handler import ( - "github.com/oam-dev/kubevela/api/types" - "github.com/oam-dev/kubevela/pkg/oam" - "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/gin-gonic/gin" "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/oam-dev/kubevela/pkg/server/util" - "github.com/gin-gonic/gin" ) // Workload related handlers diff --git a/pkg/server/route.go b/pkg/server/route.go index 231301165..203c05bcf 100644 --- a/pkg/server/route.go +++ b/pkg/server/route.go @@ -6,7 +6,6 @@ import ( "os" "github.com/gin-contrib/static" - "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/utils/logs/logs.go b/pkg/utils/logs/logs.go deleted file mode 100644 index 3e1f231ae..000000000 --- a/pkg/utils/logs/logs.go +++ /dev/null @@ -1,61 +0,0 @@ -/* - Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package logs - -import ( - "flag" - "io/ioutil" - "log" - "time" - - "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" -) - -func init() { - klog.InitFlags(flag.CommandLine) - _ = flag.Set("logtostderr", "true") -} - -// KlogWriter serves as a bridge between the standard log package and the glog package. -type KlogWriter struct{} - -// Write implements the io.Writer interface. -func (writer KlogWriter) Write(data []byte) (n int, err error) { - klog.InfoDepth(1, string(data)) - return len(data), nil -} - -// InitLogs initializes logs the way we want for kubernetes. -func InitLogs() { - log.SetOutput(ioutil.Discard) - klog.SetOutput(ioutil.Discard) - log.SetFlags(-1) - - // The default glog flush interval is one second. - go wait.Until(klog.Flush, time.Second, wait.NeverStop) -} - -// FlushLogs flushes logs immediately. -func FlushLogs() { - klog.Flush() -} - -// NewLogger creates a new log.Logger which sends logs to klog.Info. -func NewLogger(prefix string) *log.Logger { - return log.New(KlogWriter{}, prefix, 0) -} diff --git a/pkg/webhook/containerized/containerized_suite_test.go b/pkg/webhook/containerized/containerized_suite_test.go deleted file mode 100644 index 27fa8035d..000000000 --- a/pkg/webhook/containerized/containerized_suite_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package containerized_test - -import ( - "testing" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -func TestContainerized(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Containerized Suite") -} diff --git a/pkg/webhook/containerized/containerized_test.go b/pkg/webhook/containerized/containerized_test.go index 46f65c308..82d9b8dc0 100644 --- a/pkg/webhook/containerized/containerized_test.go +++ b/pkg/webhook/containerized/containerized_test.go @@ -1,6 +1,8 @@ -package containerized_test +package containerized import ( + "testing" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" @@ -8,9 +10,13 @@ import ( "k8s.io/utils/pointer" "github.com/oam-dev/kubevela/api/v1alpha1" - . "github.com/oam-dev/kubevela/pkg/webhook/containerized" ) +func TestContainerized(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Containerized Suite") +} + var _ = Describe("Containerized", func() { var baseCase v1alpha1.Containerized @@ -27,7 +33,7 @@ var _ = Describe("Containerized", func() { cw := baseCase want := baseCase want.Spec.Replicas = pointer.Int32Ptr(1) - Default(&cw) + DefaultContainerized(&cw) Expect(cw).Should(BeEquivalentTo(want)) }) @@ -35,7 +41,7 @@ var _ = Describe("Containerized", func() { cw := baseCase cw.Spec.Replicas = pointer.Int32Ptr(10) want := cw - Default(&cw) + DefaultContainerized(&cw) Expect(cw).Should(BeEquivalentTo(want)) }) diff --git a/pkg/webhook/containerized/mutating_handler.go b/pkg/webhook/containerized/mutating_handler.go index ec12101e2..41106222b 100644 --- a/pkg/webhook/containerized/mutating_handler.go +++ b/pkg/webhook/containerized/mutating_handler.go @@ -53,7 +53,7 @@ func (h *MutatingHandler) Handle(ctx context.Context, req admission.Request) adm if err != nil { return admission.Errored(http.StatusBadRequest, err) } - Default(obj) + DefaultContainerized(obj) marshalled, err := json.Marshal(obj) if err != nil { @@ -67,7 +67,7 @@ func (h *MutatingHandler) Handle(ctx context.Context, req admission.Request) adm } // Default sets all the default value for the Containerized -func Default(obj *v1alpha1.Containerized) { +func DefaultContainerized(obj *v1alpha1.Containerized) { mutatelog.Info("default", "name", obj.Name) if obj.Spec.Replicas == nil { mutatelog.Info("default replicas as 1") diff --git a/pkg/webhook/metrics/metrics_suite_test.go b/pkg/webhook/metrics/metrics_suite_test.go deleted file mode 100644 index e8c099427..000000000 --- a/pkg/webhook/metrics/metrics_suite_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package metrics_test - -import ( - "testing" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -func TestMetrics(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Metrics Suite") -} diff --git a/pkg/webhook/metrics/metrics_test.go b/pkg/webhook/metrics/metrics_test.go index 458625b8e..2579d4602 100644 --- a/pkg/webhook/metrics/metrics_test.go +++ b/pkg/webhook/metrics/metrics_test.go @@ -1,6 +1,8 @@ -package metrics_test +package metrics import ( + "testing" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -8,9 +10,13 @@ import ( "k8s.io/utils/pointer" "github.com/oam-dev/kubevela/api/v1alpha1" - . "github.com/oam-dev/kubevela/pkg/webhook/metrics" ) +func TestMetrics(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Metrics Suite") +} + var _ = Describe("Metrics Admission controller Test", func() { var traitBase v1alpha1.MetricsTrait @@ -35,7 +41,7 @@ var _ = Describe("Metrics Admission controller Test", func() { want.Spec.ScrapeService.Scheme = SupportedScheme want.Spec.ScrapeService.Path = DefaultMetricsPath want.Spec.ScrapeService.Enabled = pointer.BoolPtr(true) - Default(&trait) + DefaultMetrics(&trait) Expect(trait).Should(BeEquivalentTo(want)) }) @@ -46,7 +52,7 @@ var _ = Describe("Metrics Admission controller Test", func() { want.Spec.ScrapeService.Format = SupportedFormat want.Spec.ScrapeService.Scheme = SupportedScheme want.Spec.ScrapeService.Enabled = pointer.BoolPtr(true) - Default(&trait) + DefaultMetrics(&trait) Expect(trait).Should(BeEquivalentTo(want)) }) @@ -58,7 +64,7 @@ var _ = Describe("Metrics Admission controller Test", func() { want.Spec.ScrapeService.Scheme = SupportedScheme want.Spec.ScrapeService.Path = DefaultMetricsPath want.Spec.ScrapeService.Enabled = pointer.BoolPtr(false) - Default(&trait) + DefaultMetrics(&trait) Expect(trait).Should(BeEquivalentTo(want)) }) diff --git a/pkg/webhook/metrics/mutating_handler.go b/pkg/webhook/metrics/mutating_handler.go index a56c169b6..8265fbf03 100644 --- a/pkg/webhook/metrics/mutating_handler.go +++ b/pkg/webhook/metrics/mutating_handler.go @@ -64,7 +64,7 @@ func (h *MutatingHandler) Handle(ctx context.Context, req admission.Request) adm if err != nil { return admission.Errored(http.StatusBadRequest, err) } - Default(obj) + DefaultMetrics(obj) marshalled, err := json.Marshal(obj) if err != nil { @@ -77,8 +77,8 @@ func (h *MutatingHandler) Handle(ctx context.Context, req admission.Request) adm return resp } -// Default sets all the default value for the metricsTrait -func Default(obj *v1alpha1.MetricsTrait) { +// DefaultMetrics sets all the default value for the metricsTrait +func DefaultMetrics(obj *v1alpha1.MetricsTrait) { mutatelog.Info("default", "name", obj.Name) if len(obj.Spec.ScrapeService.Format) == 0 { mutatelog.Info("default format as prometheus") From 5328a7d6b94b79371f41bf034878daa6ed370935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= Date: Fri, 11 Sep 2020 18:15:38 +0800 Subject: [PATCH 3/3] update readme --- .github/workflows/release.yml | 9 +++++--- README.md | 43 ++++++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3fd2348d..f4247a321 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,24 +38,27 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - name: Upload Linux uses: actions/upload-release-asset@v1.0.2 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./bin/vela-linux-amd64 - asset_name: vela-${{ github.ref }}-linux-amd64 + asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64 asset_content_type: binary/octet-stream - name: Upload MacOS uses: actions/upload-release-asset@v1.0.2 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./bin/vela-darwin-amd64 - asset_name: vela-${{ github.ref }}-darwin-amd64 + asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64 asset_content_type: binary/octet-stream - name: Upload Windows uses: actions/upload-release-asset@v1.0.2 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./bin/vela-windows-amd64.exe - asset_name: vela-${{ github.ref }}-windows-amd64.exe + asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.exe asset_content_type: binary/octet-stream \ No newline at end of file diff --git a/README.md b/README.md index b2c90a57b..15adca4fa 100644 --- a/README.md +++ b/README.md @@ -2,21 +2,42 @@ The Open Application Platform based on Kubernetes and OAM. -## Get `vela` binary - -```shell script -curl https://github.com/oam-dev/kubevela/releases/download/v0.0.1.2/vela-refs.tags.v0.0.1.2-darwin-amd64 -chmod a+x vela-refs.tags.v0.0.1.2-darwin-amd64 -mv vela-refs.tags.v0.0.1.2-darwin-amd64 /usr/local/bin/vela -``` - ## Install -```shell script -vela install +### Prerequisites +- Kubernetes cluster running Kubernetes v1.15.0 or greater +- kubectl current context is configured for the target cluster install + - ```kubectl config current-context``` + +### Get the Vela CLI + +Download the `vela` binary from the [Releases page](https://github.com/oam-dev/kubevela/releases). Change file mod and add it to `$PATH` to get started. + +For exmaple: +```shell +chmod a+x vela-v0.0.2-darwin-amd64 +sudo mv ./vela-v0.0.2-darwin-amd64 /usr/local/bin/vela ``` -#### env +### Install Vela Core + +```shell script +$ vela install +- Installing Vela Core: +- Installing builtin capabilities: +Successful applied 4 kinds of Workloads and Traits: deployments.apps,containerizedworkloads.core.oam.dev,manualscalertraits.core.oam.dev,simplerollouttraits.extend.oam.dev. +syncing workload definitions from cluster... +[WARN]handle template task: #Template.metadata.name: reference "task" not found +get 5 workload definitions from cluster, syncing...5 workload definitions successfully synced +syncing trait definitions from cluster... +[WARN]handle template metricstraits.standard.oam.dev: #Template.metadata.name: reference "metricstraits" not found +get 2 trait definitions from cluster, syncing...2 trait definitions successfully synced +- Finished. +``` + +## Demos + +#### Create ENV ``` $ vela env init test --namespace test