Generate cookbooks with Chef Infra Client 16 in the examples

.gitignore

@@ -13,7 +13,6 @@ gem_graph.png
 .bundle
 
 # ignore some common Bundler 'binstubs' directory names
-# http://gembundler.com/man/bundle-exec.1.html
 b/
 binstubs/
 vendor/

lib/chef-cli/command/clean_policy_cookbooks.rb

@@ -37,7 +37,7 @@ class CleanPolicyCookbooks < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/clean_policy_revisions.rb

@@ -36,7 +36,7 @@ class CleanPolicyRevisions < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/delete_policy.rb

@@ -36,7 +36,7 @@ class DeletePolicy < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/delete_policy_group.rb

@@ -36,7 +36,7 @@ class DeletePolicyGroup < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/export.rb

@@ -41,7 +41,7 @@ class Export < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/generator_commands/cookbook.rb

@@ -216,7 +216,7 @@ def read_and_validate_params
           if !@cookbook_name_or_path
             @params_valid = false
           elsif /-/ =~ File.basename(@cookbook_name_or_path)
-            msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information.")
+            msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information.")
           end
 
           if config[:berks] && config[:policy]

lib/chef-cli/command/install.rb

@@ -40,7 +40,7 @@ class Install < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/push.rb

@@ -38,7 +38,7 @@ class Push < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/push_archive.rb

@@ -38,7 +38,7 @@ class PushArchive < Base
 
         For more information about Policyfiles, see our detailed README:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
       E

lib/chef-cli/command/show_policy.rb

@@ -40,7 +40,7 @@ class ShowPolicy < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/undelete.rb

@@ -47,7 +47,7 @@ class Undelete < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/command/update.rb

@@ -43,7 +43,7 @@ class Update < Base
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

lib/chef-cli/generator.rb

@@ -150,7 +150,7 @@ def license_description(comment = nil)
             along with this program.  If not, see <http://www.gnu.org/licenses/>.
           EOH
         else
-          raise ArgumentError, "Invalid generator.license setting: #{license}.  See available licenses at https://docs.chef.io/ctl_chef.html#chef-generate-cookbook"
+          raise ArgumentError, "Invalid generator.license setting: #{license}. See available licenses at https://docs.chef.io/ctl_chef/#chef-generate-cookbook"
         end
         if comment
           # Ensure there's no trailing whitespace

lib/chef-cli/skeletons/code_generator/files/default/repo/README.md

@@ -13,7 +13,7 @@ This repository contains several directories, and each directory contains a READ
 
 # Configuration
 
-The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/knife.html
+The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/workstation/knife/
 
 # Next Steps
 

lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb

@@ -4,4 +4,4 @@
 # Set a default name
 default['example']['name'] = 'Sam Doe'
 
-# For further information, see the Chef documentation (https://docs.chef.io/attributes.html).
+# For further information, see the Chef Infra documentation (https://docs.chef.io/attributes/).

lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -5,4 +5,4 @@
   level :info
 end
 
-# For more information, see the documentation: https://docs.chef.io/recipes.html
+# For more information, see the documentation: https://docs.chef.io/recipes

lib/chef-cli/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -12,9 +12,9 @@ Then we can upload the items in the data bag's directory to the Chef Infra Serve
 
     knife data bag from file example example_item.json
 
-For more information on data bags, see the Chef docs site:
+For more information on data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/
 
 # Encrypted Data Bags
 
@@ -51,6 +51,6 @@ Use the secret_key to view the contents.
     password:  abc123
 
 
-For more information on encrypted data bags, see the Chef docs site:
+For more information on encrypted data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/

lib/chef-cli/skeletons/code_generator/files/default/repo/environments/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example environment file called `
 
     knife environment from file environments/example.json
 
-For more information on environments, see the Chef docs site:
+For more information on environments, see the Chef Infra docs site:
 
-https://docs.chef.io/environments.html
+https://docs.chef.io/environments/

lib/chef-cli/skeletons/code_generator/files/default/repo/roles/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example role file called `example
 
     knife role from file roles/example.json
 
-For more information on roles, see the Chef docs site:
+For more information on roles, see the Chef Infra docs site:
 
-https://docs.chef.io/roles.html
+https://docs.chef.io/roles/

lib/chef-cli/skeletons/code_generator/templates/default/Policyfile.rb.erb

@@ -1,7 +1,7 @@
 # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
 #
 # For more information on the Policyfile feature, visit
-# https://docs.chef.io/policyfile.html
+# https://docs.chef.io/policyfile/
 
 # A name that describes what the system you're building with Chef does.
 name '<%= policy_name %>'

lib/chef-cli/skeletons/code_generator/templates/default/helpers.rb.erb

@@ -1,6 +1,6 @@
 #
-# Chef Documentation
-# https://docs.chef.io/libraries.html
+# Chef Infra Documentation
+# https://docs.chef.io/libraries/
 #
 
 #

lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -17,9 +17,9 @@ provisioner:
   always_update_cookbooks: true
 
   ## product_name and product_version specifies a specific Chef product and version to install.
-  ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+  ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
   #  product_name: chef
-  #  product_version: 15
+  #  product_version: 16
 
 verifier:
   name: inspec

lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -13,9 +13,9 @@ provisioner:
   name: chef_zero
 
   ## product_name and product_version specifies a specific Chef product and version to install.
-  ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+  ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
   #  product_name: chef
-  #  product_version: 15
+  #  product_version: 16
 
 verifier:
   name: inspec

lib/chef-cli/skeletons/code_generator/templates/default/resource.rb.erb

@@ -1 +1 @@
-# To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html
+# To learn more about Custom Resources, see https://docs.chef.io/custom_resources/

spec/unit/command/generator_commands/cookbook_spec.rb

@@ -129,7 +129,7 @@ def with_argv(argv)
 
     it "warns if a hyphenated cookbook name is passed" do
       expect(with_argv(%w{my-cookbook}).run).to eq(0)
-      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information."
+      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information."
       expect(stdout_io.string).to include(message)
     end
 
@@ -523,7 +523,7 @@ def with_argv(argv)
             # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
             #
             # For more information on the Policyfile feature, visit
-            # https://docs.chef.io/policyfile.html
+            # https://docs.chef.io/policyfile/
 
             # A name that describes what the system you're building with Chef does.
             name 'new_cookbook'
@@ -571,9 +571,9 @@ def with_argv(argv)
               name: chef_zero
 
               ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec
@@ -658,9 +658,9 @@ def with_argv(argv)
               always_update_cookbooks: true
 
               ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec

spec/unit/command/generator_commands/policyfile_spec.rb

@@ -118,7 +118,7 @@ def generator_context
         # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
         #
         # For more information on the Policyfile feature, visit
-        # https://docs.chef.io/policyfile.html
+        # https://docs.chef.io/policyfile/
 
         # A name that describes what the system you're building with Chef does.
         name 'my-app-frontend'

spec/unit/command/generator_commands/repo_spec.rb

@@ -331,9 +331,9 @@ def generator_context
 
                     knife role from file roles/example.json
 
-                For more information on roles, see the Chef docs site:
+                For more information on roles, see the Chef Infra docs site:
 
-                https://docs.chef.io/roles.html
+                https://docs.chef.io/roles/
               README
             end
 
@@ -355,9 +355,9 @@ def generator_context
 
                     knife environment from file environments/example.json
 
-                For more information on environments, see the Chef docs site:
+                For more information on environments, see the Chef Infra docs site:
 
-                https://docs.chef.io/environments.html
+                https://docs.chef.io/environments/
               README
             end