knife 18.6.2 → 18.7.9

data/lib/chef/utils/licensing_config.rb

@@ -1,9 +1,9 @@
-require "chef-licensing"
-
-ChefLicensing.configure do |config|
-  config.chef_product_name    = "Knife"
-  config.chef_entitlement_id  = "x6f3bc76-a94f-4b6c-bc97-4b7ed2b045c0"
-  config.chef_executable_name = "knife"
-  config.license_server_url   = "https://services.chef.io/licensing"
-end
-
+require "chef-licensing"
+
+ChefLicensing.configure do |config|
+  config.chef_product_name    = "Knife"
+  config.chef_entitlement_id  = "x6f3bc76-a94f-4b6c-bc97-4b7ed2b045c0"
+  config.chef_executable_name = "knife"
+  config.license_server_url   = "https://services.chef.io/licensing"
+end
+

data/lib/chef/utils/licensing_handler.rb

@@ -1,46 +1,72 @@
-require_relative "licensing_config"
-
-class Chef
-  class Utils
-    class LicensingHandler
-      LEGACY_OMNITRUCK_URL = "https://omnitruck.chef.io".freeze
-
-      OMNITRUCK_URLS = {
-        "free"       => "https://chefdownload-trial.chef.io",
-        "trial"      => "https://chefdownload-trial.chef.io",
-        "commercial" => "https://chefdownload-commerical.chef.io",
-      }.freeze
-
-      attr_reader :license_key, :license_type
-
-      def initialize(key, type)
-        @license_key = key
-        @license_type = type
-      end
-
-      def omnitruck_url
-        url = OMNITRUCK_URLS[license_type] || LEGACY_OMNITRUCK_URL
-
-        "#{url}/%s#{license_key ? "?license_id=#{license_key}" : ""}"
-      end
-
-      def install_sh_url
-        format(omnitruck_url, "install.sh")
-      end
-
-      class << self
-        def validate!
-          license_keys = ChefLicensing::LicenseKeyFetcher.fetch
-
-          return new(nil, nil) if license_keys.blank?
-
-          licenses_metadata = ChefLicensing::Api::Describe.list({
-            license_keys: license_keys,
-          })
-
-          new(licenses_metadata.last.id, licenses_metadata.last.license_type)
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "licensing_config"
+
+class Chef
+  class Utils
+    class LicensingHandler
+      LEGACY_OMNITRUCK_URL = "https://omnitruck.chef.io".freeze
+
+      OMNITRUCK_URLS = {
+        "free"       => "https://chefdownload-trial.chef.io",
+        "trial"      => "https://chefdownload-trial.chef.io",
+        "commercial" => "https://chefdownload-commerical.chef.io",
+      }.freeze
+
+      attr_reader :license_key, :license_type
+
+      def initialize(key, type)
+        @license_key = key
+        @license_type = type
+      end
+
+      def omnitruck_url
+        url = OMNITRUCK_URLS[license_type]
+        is_legacy = url.nil?
+        url ||= LEGACY_OMNITRUCK_URL
+
+        "#{url}/%s#{is_legacy ? "" : "?license_id=#{license_key}"}"
+      end
+
+      def install_sh_url
+        format(omnitruck_url, "install.sh")
+      end
+
+      class << self
+        def validate!
+          license_keys = begin
+                           ChefLicensing::LicenseKeyFetcher.fetch
+                         # If the env is airgapped or the local licensing service is unreachable,
+                         # the licensing gem will raise ChefLicensing::RestfulClientConnectionError.
+                         # In such cases, we are assuming the license is not available.
+                         rescue ChefLicensing::RestfulClientConnectionError
+                           []
+                         end
+
+          return new(nil, nil) if license_keys&.empty?
+
+          licenses_metadata = ChefLicensing::Api::Describe.list({
+            license_keys: license_keys,
+          })
+
+          new(licenses_metadata.last.id, licenses_metadata.last.license_type)
+        end
+      end
+    end
+  end
+end

data/spec/data/apt/chef-integration-test-1.0/debian/changelog

@@ -1,5 +1,5 @@
-chef-integration-test (1.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #CHEF-1718)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.0/debian/compat

@@ -1 +1 @@
-7
+7

data/spec/data/apt/chef-integration-test-1.0/debian/control

@@ -1,13 +1,13 @@
-Source: chef-integration-test
-Section: ruby
-Priority: extra
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: http://tickets.opscode.com
-
-Package: chef-integration-test
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.0/debian/copyright

@@ -1,34 +1,34 @@
-This work was packaged by:
-
-    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
-
-Upstream Author(s):
-
-    Opscode, Inc.
-
-Copyright:
-
-    Copyright 2010-2016, Chef Software Inc.
-
-License:
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-The Debian packaging is:
-
-    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
-
-
-and is licensed under the Apache 2.0 license.
-
-See "/usr/share/common-licenses/Apache-2.0"
+This work was packaged by:
+
+    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
+
+Upstream Author(s):
+
+    Opscode, Inc.
+
+Copyright:
+
+    Copyright 2010-2016, Chef Software Inc.
+
+License:
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+The Debian packaging is:
+
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
+
+
+and is licensed under the Apache 2.0 license.
+
+See "/usr/share/common-licenses/Apache-2.0"

data/spec/data/apt/chef-integration-test-1.0/debian/files

@@ -1 +1 @@
-chef-integration-test_1.0-1_amd64.deb ruby extra
+chef-integration-test_1.0-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.0/debian/rules

@@ -1,13 +1,13 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.0/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (quilt)

data/spec/data/apt/chef-integration-test-1.1/debian/changelog

@@ -1,11 +1,11 @@
-chef-integration-test (1.1-1) unstable; urgency=low
-
-  * New upstream release (1.1)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 10:09:34 -0600
-
-chef-integration-test (1.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #CHEF-1718)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600
+chef-integration-test (1.1-1) unstable; urgency=low
+
+  * New upstream release (1.1)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 10:09:34 -0600
+
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.1/debian/compat

@@ -1 +1 @@
-7
+7

data/spec/data/apt/chef-integration-test-1.1/debian/control

@@ -1,13 +1,13 @@
-Source: chef-integration-test
-Section: ruby
-Priority: extra
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: http://tickets.opscode.com
-
-Package: chef-integration-test
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.1/debian/copyright

@@ -1,34 +1,34 @@
-This work was packaged by:
-
-    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
-
-Upstream Author(s):
-
-    Opscode, Inc.
-
-Copyright:
-
-    Copyright 2010-2016, Chef Software Inc.
-
-License:
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-The Debian packaging is:
-
-    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
-
-
-and is licensed under the Apache 2.0 license.
-
-See "/usr/share/common-licenses/Apache-2.0"
+This work was packaged by:
+
+    Joshua Timberman <Joshua Timberman <joshua@opscode.com>> on Thu, 30 Sep 2010 09:53:45 -0600
+
+Upstream Author(s):
+
+    Opscode, Inc.
+
+Copyright:
+
+    Copyright 2010-2016, Chef Software Inc.
+
+License:
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+The Debian packaging is:
+
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
+
+
+and is licensed under the Apache 2.0 license.
+
+See "/usr/share/common-licenses/Apache-2.0"

data/spec/data/apt/chef-integration-test-1.1/debian/files

@@ -1 +1 @@
-chef-integration-test_1.1-1_amd64.deb ruby extra
+chef-integration-test_1.1-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.1/debian/rules

@@ -1,13 +1,13 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.1/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (quilt)

data/spec/data/apt/chef-integration-test2-1.0/debian/changelog

@@ -1,5 +1,5 @@
-chef-integration-test2 (1.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #CHEF-1718)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600
+chef-integration-test2 (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/conffiles

@@ -1 +1 @@
-/usr/share/doc/chef-integration-test2/copyright
+/usr/share/doc/chef-integration-test2/copyright

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/control

@@ -1,10 +1,10 @@
-Package: chef-integration-test2
-Version: 1.0-1
-Architecture: amd64
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Installed-Size: 36
-Section: ruby
-Priority: extra
-Homepage: http://tickets.opscode.com
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Package: chef-integration-test2
+Version: 1.0-1
+Architecture: amd64
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Installed-Size: 36
+Section: ruby
+Priority: extra
+Homepage: http://tickets.opscode.com
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/md5sums

@@ -1 +1 @@
-8b3b9ff6cdfe7d7b2b8b8d4f7b9e381f  usr/share/doc/chef-integration-test2/changelog.Debian.gz
+8b3b9ff6cdfe7d7b2b8b8d4f7b9e381f  usr/share/doc/chef-integration-test2/changelog.Debian.gz

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.debhelper.log

@@ -1,45 +1,45 @@
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-dh_auto_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_pysupport
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_bugfiles
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_usrlocal
-dh_link
-dh_compress
-dh_fixperms
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
+dh_auto_configure
+dh_auto_build
+dh_auto_test
+dh_prep
+dh_installdirs
+dh_auto_install
+dh_install
+dh_installdocs
+dh_installchangelogs
+dh_installexamples
+dh_installman
+dh_installcatalogs
+dh_installcron
+dh_installdebconf
+dh_installemacsen
+dh_installifupdown
+dh_installinfo
+dh_pysupport
+dh_installinit
+dh_installmenu
+dh_installmime
+dh_installmodules
+dh_installlogcheck
+dh_installlogrotate
+dh_installpam
+dh_installppp
+dh_installudev
+dh_installwm
+dh_installxfonts
+dh_bugfiles
+dh_lintian
+dh_gconf
+dh_icons
+dh_perl
+dh_usrlocal
+dh_link
+dh_compress
+dh_fixperms
+dh_strip
+dh_makeshlibs
+dh_shlibdeps
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb

data/spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.substvars

@@ -1 +1 @@
-misc:Depends=
+misc:Depends=

data/spec/data/apt/chef-integration-test2-1.0/debian/compat

@@ -1 +1 @@
-7
+7

data/spec/data/apt/chef-integration-test2-1.0/debian/conffiles

@@ -1 +1 @@
-/usr/share/doc/chef-integration-test2/copyright
+/usr/share/doc/chef-integration-test2/copyright

data/spec/data/apt/chef-integration-test2-1.0/debian/control

@@ -1,13 +1,13 @@
-Source: chef-integration-test2
-Section: ruby
-Priority: extra
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: http://tickets.opscode.com
-
-Package: chef-integration-test2
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Source: chef-integration-test2
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.