Merge pull request #1033 from chef/bundle_pin

More work to prepare for 0.17 release
chef · Mar 10, 2020 · ee9bcbe · ee9bcbe
2 parents 502f6cc + 53a4d51
commit ee9bcbe
Show file tree

Hide file tree

Showing 21 changed files with 316 additions and 70 deletions.
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
@@ -25,10 +25,10 @@ sleep 120
 gem install $EXPEDITOR_GEM_NAME
 
 pushd components/gems
-bundle install
+bundle _1.17.3_ install
 tries=12
 for (( i=1; i<=$tries; i+=1 )); do
-  bundle exec rake update
+  bundle _1.17.3_ exec rake update
   new_gem_included && break || sleep 20
   if [ $i -eq $tries ]; then
     echo "Searching for '${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})' ${i} times and did not find it"

diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
@@ -624,7 +624,7 @@ GEM
     mixlib-cli (2.1.5)
     mixlib-config (3.0.6)
       tomlrb
-    mixlib-install (3.11.28)
+    mixlib-install (3.11.29)
       mixlib-shellout
       mixlib-versioning
       thor

diff --git a/components/main-chef-wrapper/go.mod b/components/main-chef-wrapper/go.mod
@@ -2,4 +2,7 @@ module github.com/chef/chef-workstation/components/main-chef-wrapper
 
 go 1.13
 
-require github.com/chef/go-libs v0.0.0-20191216182352-aa2fc405b05f
+require (
+	github.com/chef/go-libs v0.2.0
+	github.com/pkg/errors v0.9.1 // indirect
+)
diff --git a/components/main-chef-wrapper/go.sum b/components/main-chef-wrapper/go.sum
@@ -8,8 +8,10 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/chef/go-libs v0.0.0-20191216182352-aa2fc405b05f h1:kBujwkOBM7smuh1xCKHrUTdkZbNC0IH30zzDmTNYp8U=
-github.com/chef/go-libs v0.0.0-20191216182352-aa2fc405b05f/go.mod h1:aGHwP5PXYdD0hVq+jodILnSqB/b04EhS/XCoqhE2PrA=
+github.com/chef/go-libs v0.1.0 h1:ljwMsGhp0tjnsjn7g9aZSTQgjzjn+vfVZpkzJh0wmOQ=
+github.com/chef/go-libs v0.1.0/go.mod h1:aGHwP5PXYdD0hVq+jodILnSqB/b04EhS/XCoqhE2PrA=
+github.com/chef/go-libs v0.2.0 h1:9/YU0CFKpN8PvlVJGo8E3XfzPc+AU3lpmm/ziR54FrQ=
+github.com/chef/go-libs v0.2.0/go.mod h1:aGHwP5PXYdD0hVq+jodILnSqB/b04EhS/XCoqhE2PrA=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -65,6 +67,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/config.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/config.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/dist_gen.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/dist_gen.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/errors.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/errors.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/finder.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/finder.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/global.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/global.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/workstation.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/config/workstation.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/dist_gen.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/dist_gen.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/features.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/features.go
diff --git a/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/global.go b/components/main-chef-wrapper/vendor/github.com/chef/go-libs/featflag/global.go
diff --git a/components/main-chef-wrapper/vendor/github.com/pkg/errors/.travis.yml b/components/main-chef-wrapper/vendor/github.com/pkg/errors/.travis.yml
diff --git a/components/main-chef-wrapper/vendor/github.com/pkg/errors/Makefile b/components/main-chef-wrapper/vendor/github.com/pkg/errors/Makefile
diff --git a/components/main-chef-wrapper/vendor/github.com/pkg/errors/README.md b/components/main-chef-wrapper/vendor/github.com/pkg/errors/README.md