diff --git a/go.mod b/go.mod index ab116e98e..080876810 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,6 @@ require ( github.com/mattn/go-colorable v0.1.8 github.com/mattn/go-isatty v0.0.12 github.com/mattn/go-runewidth v0.0.10 - github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/termenv v0.8.1 @@ -33,9 +32,10 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 - golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 golang.org/x/term v0.0.0-20210422114643-f5beecf764ed + golang.org/x/text v0.3.4 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 4f78fa7a8..aad4401e7 100644 --- a/go.sum +++ b/go.sum @@ -75,7 +75,6 @@ github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -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/gabriel-vasile/mimetype v1.1.2 h1:gaPnPcNor5aZSVCJVSGipcpbgMWiAAj9z182ocSGbHU= github.com/gabriel-vasile/mimetype v1.1.2/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To= @@ -94,20 +93,12 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.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/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -152,7 +143,6 @@ github.com/henvic/httpretty v0.0.6 h1:JdzGzKZBajBfnvlMALXXMVQWxWMF/ofTy8C3/OSUTx github.com/henvic/httpretty v0.0.6/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3 h1:l7vogWrq+zj8v5t/G69/eT13nAGs2H7cq+CI2nlnKdk= @@ -173,6 +163,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/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= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ= @@ -195,8 +186,6 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1 h1:hZD/8vBuw7x1WqRXD/WGjVjipbbo/HcDBgySYYbrUSk= -github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1/go.mod h1:DK1Cjkc0E49ShgRVs5jy5ASrM15svSnem3K/hiSGD8o= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= @@ -219,19 +208,9 @@ github.com/muesli/reflow v0.2.0/go.mod h1:qT22vjVmM9MIUeLgsVYe/Ye7eZlbv9dZjL3dVh github.com/muesli/termenv v0.8.1 h1:9q230czSP3DHVpkaPDXGp0TOfAwyjyYwXlUCQxQSaBk= github.com/muesli/termenv v0.8.1/go.mod h1:kzt/D/4a88RoheZmwfqorY3A+tnsSMA9HJC/fQSFKo0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug= -github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -258,8 +237,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR 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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= -github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= @@ -309,7 +286,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -331,11 +307,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -349,8 +322,6 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c h1:KHUzaHIpjWVlVVNh65G3hhuj3KB1HnjY6Cq5cTvRQT8= golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -361,13 +332,11 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -380,17 +349,13 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -401,8 +366,8 @@ golang.org/x/text v0.3.0/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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -422,14 +387,9 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= 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= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -452,28 +412,16 @@ google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvx google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -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.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -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/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= diff --git a/pkg/cmd/repo/sync/git.go b/pkg/cmd/repo/sync/git.go index 0932fd926..2d0148d67 100644 --- a/pkg/cmd/repo/sync/git.go +++ b/pkg/cmd/repo/sync/git.go @@ -7,7 +7,6 @@ import ( "github.com/cli/cli/internal/run" ) -//counterfeiter:generate . gitClient type gitClient interface { Checkout([]string) error CurrentBranch() (string, error) diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go index 7d2261a64..5836666b4 100644 --- a/pkg/cmd/repo/sync/sync.go +++ b/pkg/cmd/repo/sync/sync.go @@ -1,7 +1,5 @@ package sync -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate - import ( "errors" "fmt" diff --git a/pkg/cmd/repo/sync/syncfakes/fake_git_client.go b/pkg/cmd/repo/sync/syncfakes/fake_git_client.go deleted file mode 100644 index 0cc7b280c..000000000 --- a/pkg/cmd/repo/sync/syncfakes/fake_git_client.go +++ /dev/null @@ -1,731 +0,0 @@ -// Code generated by counterfeiter. DO NOT EDIT. -package syncfakes - -import ( - "sync" -) - -type FakeGitClient struct { - CheckoutStub func([]string) error - checkoutMutex sync.RWMutex - checkoutArgsForCall []struct { - arg1 []string - } - checkoutReturns struct { - result1 error - } - checkoutReturnsOnCall map[int]struct { - result1 error - } - CurrentBranchStub func() (string, error) - currentBranchMutex sync.RWMutex - currentBranchArgsForCall []struct { - } - currentBranchReturns struct { - result1 string - result2 error - } - currentBranchReturnsOnCall map[int]struct { - result1 string - result2 error - } - FetchStub func([]string) error - fetchMutex sync.RWMutex - fetchArgsForCall []struct { - arg1 []string - } - fetchReturns struct { - result1 error - } - fetchReturnsOnCall map[int]struct { - result1 error - } - HasLocalBranchStub func([]string) bool - hasLocalBranchMutex sync.RWMutex - hasLocalBranchArgsForCall []struct { - arg1 []string - } - hasLocalBranchReturns struct { - result1 bool - } - hasLocalBranchReturnsOnCall map[int]struct { - result1 bool - } - IsAncestorStub func([]string) (bool, error) - isAncestorMutex sync.RWMutex - isAncestorArgsForCall []struct { - arg1 []string - } - isAncestorReturns struct { - result1 bool - result2 error - } - isAncestorReturnsOnCall map[int]struct { - result1 bool - result2 error - } - IsDirtyStub func() (bool, error) - isDirtyMutex sync.RWMutex - isDirtyArgsForCall []struct { - } - isDirtyReturns struct { - result1 bool - result2 error - } - isDirtyReturnsOnCall map[int]struct { - result1 bool - result2 error - } - MergeStub func([]string) error - mergeMutex sync.RWMutex - mergeArgsForCall []struct { - arg1 []string - } - mergeReturns struct { - result1 error - } - mergeReturnsOnCall map[int]struct { - result1 error - } - ResetStub func([]string) error - resetMutex sync.RWMutex - resetArgsForCall []struct { - arg1 []string - } - resetReturns struct { - result1 error - } - resetReturnsOnCall map[int]struct { - result1 error - } - StashStub func([]string) error - stashMutex sync.RWMutex - stashArgsForCall []struct { - arg1 []string - } - stashReturns struct { - result1 error - } - stashReturnsOnCall map[int]struct { - result1 error - } - invocations map[string][][]interface{} - invocationsMutex sync.RWMutex -} - -func (fake *FakeGitClient) Checkout(arg1 []string) error { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.checkoutMutex.Lock() - ret, specificReturn := fake.checkoutReturnsOnCall[len(fake.checkoutArgsForCall)] - fake.checkoutArgsForCall = append(fake.checkoutArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.CheckoutStub - fakeReturns := fake.checkoutReturns - fake.recordInvocation("Checkout", []interface{}{arg1Copy}) - fake.checkoutMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) CheckoutCallCount() int { - fake.checkoutMutex.RLock() - defer fake.checkoutMutex.RUnlock() - return len(fake.checkoutArgsForCall) -} - -func (fake *FakeGitClient) CheckoutCalls(stub func([]string) error) { - fake.checkoutMutex.Lock() - defer fake.checkoutMutex.Unlock() - fake.CheckoutStub = stub -} - -func (fake *FakeGitClient) CheckoutArgsForCall(i int) []string { - fake.checkoutMutex.RLock() - defer fake.checkoutMutex.RUnlock() - argsForCall := fake.checkoutArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) CheckoutReturns(result1 error) { - fake.checkoutMutex.Lock() - defer fake.checkoutMutex.Unlock() - fake.CheckoutStub = nil - fake.checkoutReturns = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) CheckoutReturnsOnCall(i int, result1 error) { - fake.checkoutMutex.Lock() - defer fake.checkoutMutex.Unlock() - fake.CheckoutStub = nil - if fake.checkoutReturnsOnCall == nil { - fake.checkoutReturnsOnCall = make(map[int]struct { - result1 error - }) - } - fake.checkoutReturnsOnCall[i] = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) CurrentBranch() (string, error) { - fake.currentBranchMutex.Lock() - ret, specificReturn := fake.currentBranchReturnsOnCall[len(fake.currentBranchArgsForCall)] - fake.currentBranchArgsForCall = append(fake.currentBranchArgsForCall, struct { - }{}) - stub := fake.CurrentBranchStub - fakeReturns := fake.currentBranchReturns - fake.recordInvocation("CurrentBranch", []interface{}{}) - fake.currentBranchMutex.Unlock() - if stub != nil { - return stub() - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeGitClient) CurrentBranchCallCount() int { - fake.currentBranchMutex.RLock() - defer fake.currentBranchMutex.RUnlock() - return len(fake.currentBranchArgsForCall) -} - -func (fake *FakeGitClient) CurrentBranchCalls(stub func() (string, error)) { - fake.currentBranchMutex.Lock() - defer fake.currentBranchMutex.Unlock() - fake.CurrentBranchStub = stub -} - -func (fake *FakeGitClient) CurrentBranchReturns(result1 string, result2 error) { - fake.currentBranchMutex.Lock() - defer fake.currentBranchMutex.Unlock() - fake.CurrentBranchStub = nil - fake.currentBranchReturns = struct { - result1 string - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) CurrentBranchReturnsOnCall(i int, result1 string, result2 error) { - fake.currentBranchMutex.Lock() - defer fake.currentBranchMutex.Unlock() - fake.CurrentBranchStub = nil - if fake.currentBranchReturnsOnCall == nil { - fake.currentBranchReturnsOnCall = make(map[int]struct { - result1 string - result2 error - }) - } - fake.currentBranchReturnsOnCall[i] = struct { - result1 string - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) Fetch(arg1 []string) error { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.fetchMutex.Lock() - ret, specificReturn := fake.fetchReturnsOnCall[len(fake.fetchArgsForCall)] - fake.fetchArgsForCall = append(fake.fetchArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.FetchStub - fakeReturns := fake.fetchReturns - fake.recordInvocation("Fetch", []interface{}{arg1Copy}) - fake.fetchMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) FetchCallCount() int { - fake.fetchMutex.RLock() - defer fake.fetchMutex.RUnlock() - return len(fake.fetchArgsForCall) -} - -func (fake *FakeGitClient) FetchCalls(stub func([]string) error) { - fake.fetchMutex.Lock() - defer fake.fetchMutex.Unlock() - fake.FetchStub = stub -} - -func (fake *FakeGitClient) FetchArgsForCall(i int) []string { - fake.fetchMutex.RLock() - defer fake.fetchMutex.RUnlock() - argsForCall := fake.fetchArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) FetchReturns(result1 error) { - fake.fetchMutex.Lock() - defer fake.fetchMutex.Unlock() - fake.FetchStub = nil - fake.fetchReturns = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) FetchReturnsOnCall(i int, result1 error) { - fake.fetchMutex.Lock() - defer fake.fetchMutex.Unlock() - fake.FetchStub = nil - if fake.fetchReturnsOnCall == nil { - fake.fetchReturnsOnCall = make(map[int]struct { - result1 error - }) - } - fake.fetchReturnsOnCall[i] = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) HasLocalBranch(arg1 []string) bool { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.hasLocalBranchMutex.Lock() - ret, specificReturn := fake.hasLocalBranchReturnsOnCall[len(fake.hasLocalBranchArgsForCall)] - fake.hasLocalBranchArgsForCall = append(fake.hasLocalBranchArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.HasLocalBranchStub - fakeReturns := fake.hasLocalBranchReturns - fake.recordInvocation("HasLocalBranch", []interface{}{arg1Copy}) - fake.hasLocalBranchMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) HasLocalBranchCallCount() int { - fake.hasLocalBranchMutex.RLock() - defer fake.hasLocalBranchMutex.RUnlock() - return len(fake.hasLocalBranchArgsForCall) -} - -func (fake *FakeGitClient) HasLocalBranchCalls(stub func([]string) bool) { - fake.hasLocalBranchMutex.Lock() - defer fake.hasLocalBranchMutex.Unlock() - fake.HasLocalBranchStub = stub -} - -func (fake *FakeGitClient) HasLocalBranchArgsForCall(i int) []string { - fake.hasLocalBranchMutex.RLock() - defer fake.hasLocalBranchMutex.RUnlock() - argsForCall := fake.hasLocalBranchArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) HasLocalBranchReturns(result1 bool) { - fake.hasLocalBranchMutex.Lock() - defer fake.hasLocalBranchMutex.Unlock() - fake.HasLocalBranchStub = nil - fake.hasLocalBranchReturns = struct { - result1 bool - }{result1} -} - -func (fake *FakeGitClient) HasLocalBranchReturnsOnCall(i int, result1 bool) { - fake.hasLocalBranchMutex.Lock() - defer fake.hasLocalBranchMutex.Unlock() - fake.HasLocalBranchStub = nil - if fake.hasLocalBranchReturnsOnCall == nil { - fake.hasLocalBranchReturnsOnCall = make(map[int]struct { - result1 bool - }) - } - fake.hasLocalBranchReturnsOnCall[i] = struct { - result1 bool - }{result1} -} - -func (fake *FakeGitClient) IsAncestor(arg1 []string) (bool, error) { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.isAncestorMutex.Lock() - ret, specificReturn := fake.isAncestorReturnsOnCall[len(fake.isAncestorArgsForCall)] - fake.isAncestorArgsForCall = append(fake.isAncestorArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.IsAncestorStub - fakeReturns := fake.isAncestorReturns - fake.recordInvocation("IsAncestor", []interface{}{arg1Copy}) - fake.isAncestorMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeGitClient) IsAncestorCallCount() int { - fake.isAncestorMutex.RLock() - defer fake.isAncestorMutex.RUnlock() - return len(fake.isAncestorArgsForCall) -} - -func (fake *FakeGitClient) IsAncestorCalls(stub func([]string) (bool, error)) { - fake.isAncestorMutex.Lock() - defer fake.isAncestorMutex.Unlock() - fake.IsAncestorStub = stub -} - -func (fake *FakeGitClient) IsAncestorArgsForCall(i int) []string { - fake.isAncestorMutex.RLock() - defer fake.isAncestorMutex.RUnlock() - argsForCall := fake.isAncestorArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) IsAncestorReturns(result1 bool, result2 error) { - fake.isAncestorMutex.Lock() - defer fake.isAncestorMutex.Unlock() - fake.IsAncestorStub = nil - fake.isAncestorReturns = struct { - result1 bool - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) IsAncestorReturnsOnCall(i int, result1 bool, result2 error) { - fake.isAncestorMutex.Lock() - defer fake.isAncestorMutex.Unlock() - fake.IsAncestorStub = nil - if fake.isAncestorReturnsOnCall == nil { - fake.isAncestorReturnsOnCall = make(map[int]struct { - result1 bool - result2 error - }) - } - fake.isAncestorReturnsOnCall[i] = struct { - result1 bool - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) IsDirty() (bool, error) { - fake.isDirtyMutex.Lock() - ret, specificReturn := fake.isDirtyReturnsOnCall[len(fake.isDirtyArgsForCall)] - fake.isDirtyArgsForCall = append(fake.isDirtyArgsForCall, struct { - }{}) - stub := fake.IsDirtyStub - fakeReturns := fake.isDirtyReturns - fake.recordInvocation("IsDirty", []interface{}{}) - fake.isDirtyMutex.Unlock() - if stub != nil { - return stub() - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeGitClient) IsDirtyCallCount() int { - fake.isDirtyMutex.RLock() - defer fake.isDirtyMutex.RUnlock() - return len(fake.isDirtyArgsForCall) -} - -func (fake *FakeGitClient) IsDirtyCalls(stub func() (bool, error)) { - fake.isDirtyMutex.Lock() - defer fake.isDirtyMutex.Unlock() - fake.IsDirtyStub = stub -} - -func (fake *FakeGitClient) IsDirtyReturns(result1 bool, result2 error) { - fake.isDirtyMutex.Lock() - defer fake.isDirtyMutex.Unlock() - fake.IsDirtyStub = nil - fake.isDirtyReturns = struct { - result1 bool - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) IsDirtyReturnsOnCall(i int, result1 bool, result2 error) { - fake.isDirtyMutex.Lock() - defer fake.isDirtyMutex.Unlock() - fake.IsDirtyStub = nil - if fake.isDirtyReturnsOnCall == nil { - fake.isDirtyReturnsOnCall = make(map[int]struct { - result1 bool - result2 error - }) - } - fake.isDirtyReturnsOnCall[i] = struct { - result1 bool - result2 error - }{result1, result2} -} - -func (fake *FakeGitClient) Merge(arg1 []string) error { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.mergeMutex.Lock() - ret, specificReturn := fake.mergeReturnsOnCall[len(fake.mergeArgsForCall)] - fake.mergeArgsForCall = append(fake.mergeArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.MergeStub - fakeReturns := fake.mergeReturns - fake.recordInvocation("Merge", []interface{}{arg1Copy}) - fake.mergeMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) MergeCallCount() int { - fake.mergeMutex.RLock() - defer fake.mergeMutex.RUnlock() - return len(fake.mergeArgsForCall) -} - -func (fake *FakeGitClient) MergeCalls(stub func([]string) error) { - fake.mergeMutex.Lock() - defer fake.mergeMutex.Unlock() - fake.MergeStub = stub -} - -func (fake *FakeGitClient) MergeArgsForCall(i int) []string { - fake.mergeMutex.RLock() - defer fake.mergeMutex.RUnlock() - argsForCall := fake.mergeArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) MergeReturns(result1 error) { - fake.mergeMutex.Lock() - defer fake.mergeMutex.Unlock() - fake.MergeStub = nil - fake.mergeReturns = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) MergeReturnsOnCall(i int, result1 error) { - fake.mergeMutex.Lock() - defer fake.mergeMutex.Unlock() - fake.MergeStub = nil - if fake.mergeReturnsOnCall == nil { - fake.mergeReturnsOnCall = make(map[int]struct { - result1 error - }) - } - fake.mergeReturnsOnCall[i] = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) Reset(arg1 []string) error { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.resetMutex.Lock() - ret, specificReturn := fake.resetReturnsOnCall[len(fake.resetArgsForCall)] - fake.resetArgsForCall = append(fake.resetArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.ResetStub - fakeReturns := fake.resetReturns - fake.recordInvocation("Reset", []interface{}{arg1Copy}) - fake.resetMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) ResetCallCount() int { - fake.resetMutex.RLock() - defer fake.resetMutex.RUnlock() - return len(fake.resetArgsForCall) -} - -func (fake *FakeGitClient) ResetCalls(stub func([]string) error) { - fake.resetMutex.Lock() - defer fake.resetMutex.Unlock() - fake.ResetStub = stub -} - -func (fake *FakeGitClient) ResetArgsForCall(i int) []string { - fake.resetMutex.RLock() - defer fake.resetMutex.RUnlock() - argsForCall := fake.resetArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) ResetReturns(result1 error) { - fake.resetMutex.Lock() - defer fake.resetMutex.Unlock() - fake.ResetStub = nil - fake.resetReturns = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) ResetReturnsOnCall(i int, result1 error) { - fake.resetMutex.Lock() - defer fake.resetMutex.Unlock() - fake.ResetStub = nil - if fake.resetReturnsOnCall == nil { - fake.resetReturnsOnCall = make(map[int]struct { - result1 error - }) - } - fake.resetReturnsOnCall[i] = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) Stash(arg1 []string) error { - var arg1Copy []string - if arg1 != nil { - arg1Copy = make([]string, len(arg1)) - copy(arg1Copy, arg1) - } - fake.stashMutex.Lock() - ret, specificReturn := fake.stashReturnsOnCall[len(fake.stashArgsForCall)] - fake.stashArgsForCall = append(fake.stashArgsForCall, struct { - arg1 []string - }{arg1Copy}) - stub := fake.StashStub - fakeReturns := fake.stashReturns - fake.recordInvocation("Stash", []interface{}{arg1Copy}) - fake.stashMutex.Unlock() - if stub != nil { - return stub(arg1) - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeGitClient) StashCallCount() int { - fake.stashMutex.RLock() - defer fake.stashMutex.RUnlock() - return len(fake.stashArgsForCall) -} - -func (fake *FakeGitClient) StashCalls(stub func([]string) error) { - fake.stashMutex.Lock() - defer fake.stashMutex.Unlock() - fake.StashStub = stub -} - -func (fake *FakeGitClient) StashArgsForCall(i int) []string { - fake.stashMutex.RLock() - defer fake.stashMutex.RUnlock() - argsForCall := fake.stashArgsForCall[i] - return argsForCall.arg1 -} - -func (fake *FakeGitClient) StashReturns(result1 error) { - fake.stashMutex.Lock() - defer fake.stashMutex.Unlock() - fake.StashStub = nil - fake.stashReturns = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) StashReturnsOnCall(i int, result1 error) { - fake.stashMutex.Lock() - defer fake.stashMutex.Unlock() - fake.StashStub = nil - if fake.stashReturnsOnCall == nil { - fake.stashReturnsOnCall = make(map[int]struct { - result1 error - }) - } - fake.stashReturnsOnCall[i] = struct { - result1 error - }{result1} -} - -func (fake *FakeGitClient) Invocations() map[string][][]interface{} { - fake.invocationsMutex.RLock() - defer fake.invocationsMutex.RUnlock() - fake.checkoutMutex.RLock() - defer fake.checkoutMutex.RUnlock() - fake.currentBranchMutex.RLock() - defer fake.currentBranchMutex.RUnlock() - fake.fetchMutex.RLock() - defer fake.fetchMutex.RUnlock() - fake.hasLocalBranchMutex.RLock() - defer fake.hasLocalBranchMutex.RUnlock() - fake.isAncestorMutex.RLock() - defer fake.isAncestorMutex.RUnlock() - fake.isDirtyMutex.RLock() - defer fake.isDirtyMutex.RUnlock() - fake.mergeMutex.RLock() - defer fake.mergeMutex.RUnlock() - fake.resetMutex.RLock() - defer fake.resetMutex.RUnlock() - fake.stashMutex.RLock() - defer fake.stashMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations -} - -func (fake *FakeGitClient) recordInvocation(key string, args []interface{}) { - fake.invocationsMutex.Lock() - defer fake.invocationsMutex.Unlock() - if fake.invocations == nil { - fake.invocations = map[string][][]interface{}{} - } - if fake.invocations[key] == nil { - fake.invocations[key] = [][]interface{}{} - } - fake.invocations[key] = append(fake.invocations[key], args) -} diff --git a/tools/tools.go b/tools/tools.go deleted file mode 100644 index 0b54e9ba3..000000000 --- a/tools/tools.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build tools - -package tools - -// This file imports packages that are used when running go generate, or used -// during the development process but not otherwise depended on by built code -import ( - _ "github.com/maxbrunsfeld/counterfeiter/v6" -)