From 789fd34c4ae4ffe35f5bc8d9639bbb1241bcae0e Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Tue, 7 Jul 2020 10:02:54 +0300 Subject: [PATCH 1/3] Update fluxcd/pkg to v0.0.2 --- go.mod | 13 +++++----- go.sum | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index c358691d..e3b01380 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,10 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible - github.com/fluxcd/kustomize-controller v0.0.1 - github.com/fluxcd/pkg v0.0.1 - github.com/fluxcd/source-controller v0.0.1 + github.com/fluxcd/kustomize-controller v0.0.2 + github.com/fluxcd/pkg v0.0.2 + github.com/fluxcd/source-controller v0.0.2 github.com/golang/protobuf v1.4.2 // indirect - github.com/hashicorp/go-retryablehttp v0.6.6 // indirect github.com/manifoldco/promptui v0.7.0 github.com/spf13/cobra v1.0.0 golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect @@ -16,9 +15,9 @@ require ( golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect google.golang.org/appengine v1.6.6 // indirect google.golang.org/protobuf v1.24.0 // indirect - k8s.io/api v0.18.2 - k8s.io/apimachinery v0.18.2 - k8s.io/client-go v0.18.2 + k8s.io/api v0.18.4 + k8s.io/apimachinery v0.18.4 + k8s.io/client-go v0.18.4 sigs.k8s.io/controller-runtime v0.6.0 sigs.k8s.io/kustomize/api v0.4.1 sigs.k8s.io/yaml v1.2.0 diff --git a/go.sum b/go.sum index 20f5fb89..921c4525 100644 --- a/go.sum +++ b/go.sum @@ -25,12 +25,16 @@ github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VY github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= 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/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver/v3 v3.0.3 h1:znjIyLfpXEDQjOIEWh+ehwpTU14UzUPub3c3sm36u14= github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig/v3 v3.0.2/go.mod h1:oesJ8kPONMONaZgtiHNzUShJbksypC5kWczhZAf6+aU= +github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA= +github.com/Masterminds/squirrel v1.2.0/go.mod h1:yaPeOnPG5ZRwL9oKdTsO/prlkPbXWZlRVMQ/gGlzIuA= github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= @@ -57,6 +61,7 @@ github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9Pq github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= @@ -128,6 +133,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= github.com/deislabs/oras v0.8.1 h1:If674KraJVpujYR00rzdi0QAmW4BxzMJPVAZJKuhQ0c= github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC4G4As= +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= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= @@ -168,12 +174,14 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwC github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/kustomize-controller v0.0.1 h1:F2wg9c5nMUEnPHgs44HMY1/2UAXXaYcmpj7WeOzf9p0= -github.com/fluxcd/kustomize-controller v0.0.1/go.mod h1:sSIy+Y924OGHW2anzZvD53BbgjSOO4mONTTG2+UTEhM= -github.com/fluxcd/pkg v0.0.1 h1:yECp5SBjX7vUBOjd3KYBoVQwt22A0u1SZJjYV4PduAk= -github.com/fluxcd/pkg v0.0.1/go.mod h1:3DgEcVmkVYrA/BDb/fyDIJllxK++c/ovLCMPRlkAp9Y= +github.com/fluxcd/kustomize-controller v0.0.2 h1:A7/tNbv4vIv0WGC56xh+NqgD4mqLG5nqARxTfYhhk70= +github.com/fluxcd/kustomize-controller v0.0.2/go.mod h1:4fS7ytYGlesqi3lT0wBbWGNH1boQIn5tYPV8Kd6Txmw= +github.com/fluxcd/pkg v0.0.2 h1:e2ekyxBNZg0phh3adSxCsaGcozGyy/FQwhD2LtA+Y0Q= +github.com/fluxcd/pkg v0.0.2/go.mod h1:rtlppQU+9DNikyDZptLdOeTf+wBvQQiQQ/J113FPoeU= github.com/fluxcd/source-controller v0.0.1 h1:17/b/Zcb3OUkUoo03W+L7TGwkCKG23K9HrgL+d5WMXE= github.com/fluxcd/source-controller v0.0.1/go.mod h1:tmscNdCxEt7+Xt2g1+bI38hMPw2leYMFAaCn4UlMGuw= +github.com/fluxcd/source-controller v0.0.2 h1:nLGQul2v7zktIV3R/f7GYSLrwYuokPf4ThzSgLfiVlE= +github.com/fluxcd/source-controller v0.0.2/go.mod h1:imUfOckTJBn3L0Xcc5RsZeuM+OkQdSkVr6O1qF1BLzA= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= @@ -260,6 +268,8 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= 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= @@ -274,6 +284,11 @@ github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoM 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/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= +github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= +github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= @@ -284,6 +299,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -371,6 +387,7 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= @@ -378,6 +395,7 @@ github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= 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-retryablehttp v0.6.4 h1:BbgctKO892xEyOXnGiaAwIoSq1QZ/SS4AhjoAh9DnfY= github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM= @@ -393,11 +411,13 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T 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.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -407,6 +427,8 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= 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/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -429,6 +451,7 @@ github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM52 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= 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/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= @@ -439,7 +462,11 @@ 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 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= +github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= @@ -462,15 +489,21 @@ github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRU github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.9/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= 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/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -503,6 +536,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -537,6 +572,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -566,7 +602,11 @@ github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4do github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +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= @@ -596,6 +636,7 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= @@ -621,6 +662,8 @@ github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnR github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= 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= @@ -658,6 +701,7 @@ github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYU 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/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= +github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -683,9 +727,11 @@ golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= 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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= @@ -694,6 +740,7 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947 golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/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-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -754,6 +801,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -772,6 +820,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -824,6 +873,7 @@ golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDq golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -841,6 +891,7 @@ google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= @@ -886,6 +937,7 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= @@ -899,6 +951,7 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -907,34 +960,49 @@ gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= helm.sh/helm/v3 v3.1.2 h1:VpNzaNv2DX4aRnOCcV7v5Of+XT2SZrJ8iOQ25AGKOos= helm.sh/helm/v3 v3.1.2/go.mod h1:WYsFJuMASa/4XUqLyv54s0U/f3mlAaRErGmyy4z921g= +helm.sh/helm/v3 v3.2.4/go.mod h1:ZaXz/vzktgwjyGGFbUWtIQkscfE7WYoRGP2szqAFHR0= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= +k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= +k8s.io/api v0.18.4 h1:8x49nBRxuXGUlDlwlWd3RMY1SayZrzFfxea3UZSkFw4= +k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= k8s.io/apiextensions-apiserver v0.17.2 h1:cP579D2hSZNuO/rZj9XFRzwJNYb41DbNANJb6Kolpss= k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs= +k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= k8s.io/apiextensions-apiserver v0.18.2 h1:I4v3/jAuQC+89L3Z7dDgAiN4EOjN6sbm6iBqQwHTah8= k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= +k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/apimachinery v0.18.4 h1:ST2beySjhqwJoIFk6p7Hp5v5O0hYY6Gngq/gUYXTPIA= +k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= +k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= k8s.io/cli-runtime v0.17.2 h1:YH4txSplyGudvxjhAJeHEtXc7Tr/16clKGfN076ydGk= k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= +k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k= k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= +k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= k8s.io/client-go v0.18.2 h1:aLB0iaD4nmwh7arT2wIn+lMnAq7OswjaejkQ8p9bBYE= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= +k8s.io/client-go v0.18.4 h1:un55V1Q/B3JO3A76eS0kUSywgGK/WR3BQ8fHQjNa6Zc= +k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= +k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/component-base v0.17.2 h1:0XHf+cerTvL9I5Xwn9v+0jmqzGAZI7zNydv4tL6Cw6A= k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= +k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -946,10 +1014,14 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kubectl v0.17.2 h1:QZR8Q6lWiVRjwKslekdbN5WPMp53dS/17j5e+oi5XVU= k8s.io/kubectl v0.17.2/go.mod h1:y4rfLV0n6aPmvbRCqZQjvOp3ezxsFgpqL+zF5jH/lxk= +k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.17.2/go.mod h1:3TkNHET4ROd+NfzNxkjoVfQ0Ob4iZnaHmSEA4vYpwLw= +k8s.io/metrics v0.18.0/go.mod h1:8aYTW18koXqjLVKL7Ds05RPMX9ipJZI3mywYvBOxXd4= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= From ad655183e03ade0fee703bb0f331edd0316304e4 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Tue, 7 Jul 2020 10:03:34 +0300 Subject: [PATCH 2/3] Update notification-controller to v0.0.1 --- .github/workflows/docs.yaml | 1 + docs/_files/notification-controller.png | Bin 0 -> 44094 bytes docs/components/notification/controller.md | 15 ++++++++------- docs/guides/notifications.md | 4 ++-- docs/index.md | 3 ++- .../notification-controller/kustomization.yaml | 4 ++-- mkdocs.yml | 1 + 7 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 docs/_files/notification-controller.png diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 8e6b2594..9915d0a6 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -24,6 +24,7 @@ jobs: curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/event.md > docs/components/notification/event.md curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/alert.md > docs/components/notification/alert.md curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/provider.md > docs/components/notification/provider.md + curl https://raw.githubusercontent.com/fluxcd/notification-controller/master/docs/spec/v1alpha1/receiver.md > docs/components/notification/receiver.md - name: Deploy docs uses: mhausenblas/mkdocs-deploy-gh-pages@master env: diff --git a/docs/_files/notification-controller.png b/docs/_files/notification-controller.png new file mode 100644 index 0000000000000000000000000000000000000000..f1a0f5c5027f490616cd233b254b522e63ed9ff5 GIT binary patch literal 44094 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 Ae*gdg literal 0 HcmV?d00001 diff --git a/docs/components/notification/controller.md b/docs/components/notification/controller.md index 6d5fac41..672f89fa 100644 --- a/docs/components/notification/controller.md +++ b/docs/components/notification/controller.md @@ -1,14 +1,15 @@ # Notification Controller -The Notification Controller is a Kubernetes operator, -specialized in dispatching events to external systems such as -Slack, Microsoft Teams, Discord and Rocket chat. +The Notification Controller is a Kubernetes operator, specialized in handling inbound and outbound events. -The controller receives events via HTTP and dispatch them to external -webhooks based on event severity and involved objects. +![](../../_files/notification-controller.png) -The controller can be configured with Kubernetes custom resources that -define how events are processed and where to dispatch them. +The controller handles events coming from external systems (GitHub, GitLab, Bitbucket, Harbour, Jenkins, etc) +and notifies the GitOps toolkit controllers about source changes. + +The controller handles events emitted by the GitOps toolkit controllers (source, kustomize, helm) +and dispatches them to external systems (Slack, Microsoft Teams, Discord, Rocker) +based on event severity and involved objects. Links: diff --git a/docs/guides/notifications.md b/docs/guides/notifications.md index 4fb116de..0030cd9d 100644 --- a/docs/guides/notifications.md +++ b/docs/guides/notifications.md @@ -42,9 +42,9 @@ spec: name: slack-url ``` -The provider type can be `slack`, `msteams`, `discord`, `rocket` or `webhook`. +The provider type can be `slack`, `msteams`, `discord`, `rocket` or `generic`. -When type `webhook` is specified, the notification controller will post the incoming +When type `generic` is specified, the notification controller will post the incoming [event](../components/notification/event.md) in JSON format to the webhook address. This way you can create custom handlers that can store the events in Elasticsearch, CloudWatch, Stackdriver, etc. diff --git a/docs/index.md b/docs/index.md index b66b709b..4bb25998 100644 --- a/docs/index.md +++ b/docs/index.md @@ -29,7 +29,7 @@ Target features: - External events handling (webhook receivers) - Source write-back (automated patching) - Policy driven validation (OPA, admission controllers) -- Seamless integration with Git providers (GitHub, GitLab, BitBucket) +- Seamless integration with Git providers (GitHub, GitLab, Bitbucket) - Interoperability with workflow providers (GitHub Actions, Tekton, Argo) - Interoperability with CAPI providers @@ -44,6 +44,7 @@ Components: - [Notification Controller](components/notification/controller.md) - [Provider CRD](components/notification/provider.md) - [Alert CRD](components/notification/alert.md) + - [Receiver CRD](components/notification/receiver.md) - Helm Controller (TBA) To get started with the toolkit please follow this [guide](get-started/index.md). diff --git a/manifests/bases/notification-controller/kustomization.yaml b/manifests/bases/notification-controller/kustomization.yaml index 4f111dc8..61527286 100644 --- a/manifests/bases/notification-controller/kustomization.yaml +++ b/manifests/bases/notification-controller/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.1-beta.1 -- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.1-beta.1 +- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.1 +- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.1 diff --git a/mkdocs.yml b/mkdocs.yml index daed97b2..0950ec4c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -56,6 +56,7 @@ nav: - Provider CRD: components/notification/provider.md - Alert CRD: components/notification/alert.md - Event: components/notification/event.md + - Webhook Receiver: components/notification/receiver.md - Notification API Reference: components/notification/api.md - Toolkit CLI: - Overview: cmd/tk.md From e95b137011d094a81dbf9ee7fb405c9d45d48778 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Tue, 7 Jul 2020 10:04:42 +0300 Subject: [PATCH 3/3] Mark events forwarding task as completed --- docs/roadmap/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/roadmap/index.md b/docs/roadmap/index.md index dff5ec19..340c96c0 100644 --- a/docs/roadmap/index.md +++ b/docs/roadmap/index.md @@ -18,7 +18,7 @@ Goals - Offer an in-place migration tool for those that are using Flux in read-only mode to synchronize plain manifests - Offer a migration guide for those that are using Flux in read-only mode to synchronize Kustomize overlays -- Offer a dedicated component for forwarding events to external messaging platforms +- ~~Offer a dedicated component for forwarding events to external messaging platforms~~ Non-Goals @@ -27,13 +27,13 @@ Non-Goals Tasks -- Review the git source and kustomize APIs - ~~Design the events API~~ -- Implement events in source and kustomize controllers -- Implement Prometheus metrics in source and kustomize controllers -- Make the kustomize-controller apply/gc events on-par with Flux v1 apply events +- ~~Implement events in source and kustomize controllers~~ +- ~~Make the kustomize-controller apply/gc events on-par with Flux v1 apply events~~ - ~~Design the notifications and events filtering API~~ - ~~Implement a notification controller for Slack, MS Teams, Discord, Rocket~~ +- Implement Prometheus metrics in source and kustomize controllers +- Review the git source and kustomize APIs - Implement the migration command in tk - Create a migration guide for `flux.yaml` kustomize users