chef 12.21.12 → 12.21.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a9cfce3a9c74e84ffa685e513386db548002580
-  data.tar.gz: 11180225a5ac33925b6746cd85c3cd8a253091ae
+  metadata.gz: badf5e8bd4f99974685e95fb2456c1448eb8847f
+  data.tar.gz: c84f02357be9848521807397383bb5e98f5674c1
 SHA512:
-  metadata.gz: 5d89f801502474f4360bfc0df5a8da84f7ef4c1ad1cd22b3bbcec2b972f6e18f0c108efa7c3f0ce01846ad1bf9e862123ac942bcdc7cb17aa31d9f7aa999ba78
-  data.tar.gz: 2bf71ae0ce47fc9b3b6288e3ad0e5a8f6006e0a697dd66f4023c7571daa53e0e116fa874b6cac628336a3cc736f93727a9266dc87600c5f4be3a241090e3d85d
+  metadata.gz: 8d08b95da842e485c54b2a5d8c7aab24e170eda8b485a16232eed37da82f7eb8ad05ea5ec2a2ac28b854619cb4de23f1e04bbac1b5b0e5b258dc1daccdee8423
+  data.tar.gz: 8a997e21ae9f177c00fd4d46d139b0dd9d8562d7c92feb55dcd9a21df38320743cf3e3c28b0fbf99e315035ecda5f4884437bcef45a9f36e775d18b994131ba3

data/VERSION

@@ -1 +1 @@
-12.21.12
+12.21.14

data/lib/chef/provider/apt_repository.rb

@@ -31,6 +31,9 @@ class Chef
       include Chef::Mixin::ShellOut
       extend Chef::Mixin::Which
 
+      LIST_APT_KEYS = "apt-key list".freeze
+      LIST_APT_KEY_FINGERPRINTS = "apt-key adv --list-public-keys --with-fingerprint --with-colons".freeze
+
       provides :apt_repository do
         which("apt-get")
       end
@@ -149,7 +152,7 @@ class Chef
       def no_new_keys?(file)
         # Now we are using the option --with-colons that works across old os versions
         # as well as the latest (16.10). This for both `apt-key` and `gpg` commands
-        installed_keys = extract_fingerprints_from_cmd("apt-key adv --list-public-keys --with-fingerprint --with-colons")
+        installed_keys = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS)
         proposed_keys = extract_fingerprints_from_cmd("gpg --with-fingerprint --with-colons #{file}")
         (installed_keys & proposed_keys).sort == proposed_keys.sort
       end
@@ -200,15 +203,15 @@ class Chef
           command cmd
           sensitive new_resource.sensitive
           not_if do
-            present = extract_fingerprints_from_cmd("apt-key finger").any? do |fp|
+            present = extract_fingerprints_from_cmd(LIST_APT_KEY_FINGERPRINTS).any? do |fp|
               fp.end_with? key.upcase
             end
-            present && key_is_valid?("apt-key list", key.upcase)
+            present && key_is_valid?(LIST_APT_KEYS, key.upcase)
           end
           notifies :run, "execute[apt-cache gencaches]", :immediately
         end
 
-        raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?("apt-key list", key.upcase)
+        raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(LIST_APT_KEYS, key.upcase)
       end
 
       def install_ppa_key(owner, repo)

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.21.12"
+  VERSION = "12.21.14"
 end
 
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.21.12
+  version: 12.21.14
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.21.12
+        version: 12.21.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.21.12
+        version: 12.21.14
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement