summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-05-29 10:30:49 -0700
committerTim Smith <tsmith84@gmail.com>2020-05-29 10:30:49 -0700
commita5c3951fa017c18ce4a5e12f14e9b77d141ae329 (patch)
tree2f4ef9b49b309489062a7524fa98251d0051ee41
parentc46961dce646c184a4e96eda15c1127a2bd406f5 (diff)
downloadchef-a5c3951fa017c18ce4a5e12f14e9b77d141ae329.tar.gz
Update chef-telemetry to 1.0.8 and InSpec to 4.19dep_bumps
Pin chef-telemetry since we want to avoid the dep on http Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock31
-rw-r--r--omnibus/Gemfile.lock30
3 files changed, 23 insertions, 41 deletions
diff --git a/Gemfile b/Gemfile
index 8201fceb69..ad965e6e24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,8 +22,7 @@ end
gem "cheffish", ">= 14"
-# avoid bringing in the new http 4 gem that comes with other ffi baggage which breaks builds
-gem "chef-telemetry", "=1.0.3"
+gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
group(:omnibus_package) do
gem "appbundler"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2bed172f8c..b4130fd14b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,11 +147,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- chef-telemetry (1.0.3)
+ chef-telemetry (1.0.8)
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- http (~> 2.2)
chef-vault (4.0.1)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
@@ -168,8 +167,6 @@ GEM
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
diff-lcs (1.3)
- domain_name (0.5.20190701)
- unf (>= 0.0.5, < 1.0.0)
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
@@ -178,7 +175,7 @@ GEM
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
- fauxhai-ng (8.1.0)
+ fauxhai-ng (8.2.0)
net-ssh
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
@@ -199,18 +196,9 @@ GEM
hashie (3.6.0)
highline (2.0.3)
htmlentities (4.3.4)
- http (2.2.2)
- addressable (~> 2.3)
- http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
- http_parser.rb (~> 0.6.0)
- http-cookie (1.0.3)
- domain_name (~> 0.5)
- http-form_data (1.0.3)
- http_parser.rb (0.6.0)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.18.114)
+ inspec-core (4.19.0)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
@@ -235,8 +223,8 @@ GEM
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.18.114)
- inspec-core (= 4.18.114)
+ inspec-core-bin (4.19.0)
+ inspec-core (= 4.19.0)
ipaddress (0.8.3)
iso8601 (0.12.1)
json (2.3.0)
@@ -384,18 +372,13 @@ GEM
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
- tty-screen (0.7.1)
+ tty-screen (0.8.0)
tty-table (0.11.0)
equatable (~> 0.6)
necromancer (~> 0.5)
pastel (~> 0.7.2)
strings (~> 0.1.5)
tty-screen (~> 0.7)
- unf (0.1.4)
- unf_ext
- unf_ext (0.0.7.7)
- unf_ext (0.0.7.7-x64-mingw32)
- unf_ext (0.0.7.7-x86-mingw32)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uri_template (0.7.0)
@@ -457,7 +440,7 @@ DEPENDENCIES
chef!
chef-bin!
chef-config!
- chef-telemetry (= 1.0.3)
+ chef-telemetry (>= 1.0.8)
chef-utils!
chef-vault
cheffish (>= 14)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index eadbb55f4b..934e9fe2d2 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,20 +32,20 @@ GEM
artifactory (3.0.13)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.321.0)
- aws-sdk-core (3.96.1)
+ aws-partitions (1.322.0)
+ aws-sdk-core (3.97.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.31.0)
+ aws-sdk-kms (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.66.0)
+ aws-sdk-s3 (1.67.0)
aws-sdk-core (~> 3, >= 3.96.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.1.3)
+ aws-sigv4 (1.1.4)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt_pbkdf (1.1.0.rc1)
bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.1.0)
+ chef (16.1.16)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.1.0)
- chef-utils (= 16.1.0)
+ chef-config (= 16.1.16)
+ chef-utils (= 16.1.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -98,12 +98,12 @@ GEM
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.1.0-universal-mingw32)
+ chef (16.1.16-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.1.0)
- chef-utils (= 16.1.0)
+ chef-config (= 16.1.16)
+ chef-utils (= 16.1.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -145,15 +145,15 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.1.0)
+ chef-config (16.1.16)
addressable
- chef-utils (= 16.1.0)
+ chef-utils (= 16.1.16)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.9)
- chef-utils (16.1.0)
+ chef-utils (16.1.16)
chef-vault (4.0.1)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
@@ -335,7 +335,7 @@ GEM
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
- tty-screen (0.7.1)
+ tty-screen (0.8.0)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)