From 8595802eb37c4f72212c5c93d999aa82f5f1a265 Mon Sep 17 00:00:00 2001 From: Ivan Mikheykin Date: Wed, 20 Jan 2021 12:18:14 +0300 Subject: [PATCH] chore: update shell-operator to v1.0.0-rc1 --- go.mod | 5 ++--- go.sum | 33 ++++++--------------------------- shell-operator | 2 +- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index ea9905a7..4b7b4e43 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/davecgh/go-spew v1.1.1 github.com/evanphx/json-patch v4.9.0+incompatible - github.com/flant/shell-operator v1.0.0-beta.13.0.20201214204115-463c4ecd8214 // branch: master + github.com/flant/shell-operator v1.0.0-rc.1 // tag: v1.0.0-rc.1 github.com/go-chi/chi v4.0.3+incompatible github.com/go-openapi/spec v0.19.3 github.com/go-openapi/strfmt v0.19.3 @@ -13,7 +13,6 @@ require ( github.com/go-openapi/validate v0.19.7 github.com/hashicorp/go-multierror v1.0.0 github.com/kennygrant/sanitize v1.2.4 - github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.9.0 github.com/peterbourgon/mergemap v0.0.0-20130613134717-e21c03b7a721 github.com/prometheus/client_golang v1.0.0 @@ -28,7 +27,7 @@ require ( k8s.io/api v0.17.0 k8s.io/apimachinery v0.17.0 k8s.io/client-go v0.17.0 - sigs.k8s.io/yaml v1.1.1-0.20191128155103-745ef44e09d6 // branch master, commit 745ef44e09d6, with fixes in yaml.v2.2.7 + sigs.k8s.io/yaml v1.2.0 ) replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.4-0.20200313141509-0c0fba4d39e1 // branch: fix_in_body_0_19_7 diff --git a/go.sum b/go.sum index c0ab48a3..bf5d480f 100644 --- a/go.sum +++ b/go.sum @@ -58,25 +58,8 @@ github.com/flant/go-openapi-validate v0.19.4-0.20200313141509-0c0fba4d39e1 h1:Td github.com/flant/go-openapi-validate v0.19.4-0.20200313141509-0c0fba4d39e1/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/flant/libjq-go v1.6.2-0.20200616114952-907039e8a02a h1:PlStPekqPtTSWDDKFlwgETsT1OiXD1gZtRHcNxAs1lc= github.com/flant/libjq-go v1.6.2-0.20200616114952-907039e8a02a/go.mod h1:+SYqi5wsNjtQVlkPg0Ep5IOuN+ydg79Jo/gk4/PuS8c= -github.com/flant/shell-operator v1.0.0-beta.10.0.20200708094531-126d47838bc0 h1:nZEAyOeooHEUDFhS46DRj7apE8jdxNTK85pS3mWnANA= -github.com/flant/shell-operator v1.0.0-beta.10.0.20200708094531-126d47838bc0/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.11 h1:16OSOtaNcryrrhIB4fnBOit5qFFuDVNTvefhf7sonvQ= -github.com/flant/shell-operator v1.0.0-beta.11.0.20200814110804-eb5e60516b10 h1:NDo9A9E3i+hX3oLvhm3BMyA/FbYOWSDmK63E9geEbV0= -github.com/flant/shell-operator v1.0.0-beta.11.0.20200814110804-eb5e60516b10/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.12.0.20200903102652-4e8b8ad0bb3e h1:kjPh6PcytSkq5eDnvA9ZOcSlaS+G/4Le8dQOXk1I+3Y= -github.com/flant/shell-operator v1.0.0-beta.12.0.20200903102652-4e8b8ad0bb3e/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13 h1:DBKUfuu9/v1rgNwecJQHQCopfIDqOgGhTiShDXPYd9c= -github.com/flant/shell-operator v1.0.0-beta.13/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201207080005-7055a68b74df h1:9zNzI9CAnQzwiLPlWHXHbxSMoC+U4A43Nb/COWVFY/I= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201207080005-7055a68b74df/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201211130042-631a26610bc4 h1:yf94SVktkxMJHfcCCcKiZFoFzmbfnJpz0GwBJP8z078= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201211130042-631a26610bc4/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201212193842-f2aff1cda725 h1:wQd14I04/Qt64lniHgkMurOwdVdctqODy+Zd2a3yTg8= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201212193842-f2aff1cda725/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201213124752-17d64f6e61d1 h1:Rl9oq7JNM22SRW8tCR1vq/T3T277TUEV0udWE+CN4Ik= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201213124752-17d64f6e61d1/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201214204115-463c4ecd8214 h1:2qimaaTJpBxfMbxxSQD4r0Yb6PD38IMc0id2yq8U+oo= -github.com/flant/shell-operator v1.0.0-beta.13.0.20201214204115-463c4ecd8214/go.mod h1:+a3IijbQpjr8zBudwk4Y4GkS1Hx+xUjaKr9Mx/H6Nsw= +github.com/flant/shell-operator v1.0.0-rc.1 h1:zY0kzu8v6xLxNVZ+YvyXdSYVMlDD1527+4sH1T3dQwU= +github.com/flant/shell-operator v1.0.0-rc.1/go.mod h1:jpl6p0jtq7dghWA/EhrDyz/s9vPZgQr+0AAiWcTJ/64= 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/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -286,18 +269,12 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tidwall/gjson v1.3.4 h1:On5waDnyKKk3SWE4EthbjjirAWXp43xx5cKCUZY1eZw= github.com/tidwall/gjson v1.3.4/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= -github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc= -github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8= -github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/sjson v1.0.4 h1:UcdIRXff12Lpnu3OLtZvnc03g4vH2suXDXhBwBqmzYg= github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y= -github.com/tidwall/sjson v1.1.1 h1:7h1vk049Jnd5EH9NyzNiEuwYW4b5qgreBbqRC19AS3U= -github.com/tidwall/sjson v1.1.1/go.mod h1:yvVuSnpEQv5cYIrO+AT6kw4QVfd5SDZoGIS7/5+fZFs= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -413,6 +390,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= 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= gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 h1:XZx7nhd5GMaZpmDaEHFVafUZC7ya0fuo7cSJ3UCKYmM= gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -438,5 +417,5 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.1.1-0.20191128155103-745ef44e09d6 h1:CxbKZzQCneWbuKHPtMF3rxWzMq8dAjXuH5gF63mRuH0= -sigs.k8s.io/yaml v1.1.1-0.20191128155103-745ef44e09d6/go.mod h1:lmqJX76E7IeysRh7rkvzR6NeY8NsXX2tWMCS9WtUQgM= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/shell-operator b/shell-operator index 66231aad..51b75bf4 160000 --- a/shell-operator +++ b/shell-operator @@ -1 +1 @@ -Subproject commit 66231aad5edf5683d34e7a3812b8dee784c68bd3 +Subproject commit 51b75bf4674bc29cf17b220f5431195b79b5e6c6