chef-dk 3.9.0 → 3.10.1

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

@@ -1,56 +1,56 @@
-# Data Bags
-
-This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
-
-For example, in this directory you'll find an example data bag directory called `example`, which contains an item definition called `example_item.json`
-
-Before uploading this item to the server, we must first create the data bag on the Chef Server.
-
-    knife data bag create example
-
-Then we can upload the items in the data bag's directory to the Chef Server.
-
-    knife data bag from file example example_item.json
-
-For more information on data bags, see the Chef wiki page:
-
-https://docs.chef.io/data_bags.html
-
-# Encrypted Data Bags
-
-Encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
-
-    openssl rand -base64 512 > secret_key
-
-You may use this secret_key to add items to a data bag during a create.
-
-    knife data bag create --secret-file secret_key passwords mysql
-
-You may also use it when adding ITEMs from files,
-
-    knife data bag create passwords
-    knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
-
-The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example,
-
-    {
-      "id": "mysql",
-      "password": "abc123"
-    }
-
-Without the secret_key, the contents are encrypted.
-
-    knife data bag show passwords mysql
-    id:        mysql
-    password:  2I0XUUve1TXEojEyeGsjhw==
-
-Use the secret_key to view the contents.
-
-    knife data bag show passwords mysql --secret-file secret_key
-    id:        mysql
-    password:  abc123
-
-
-For more information on encrypted data bags, see the Chef wiki page:
-
-https://docs.chef.io/data_bags.html
+# Data Bags
+
+This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
+
+For example, in this directory you'll find an example data bag directory called `example`, which contains an item definition called `example_item.json`
+
+Before uploading this item to the server, we must first create the data bag on the Chef Server.
+
+    knife data bag create example
+
+Then we can upload the items in the data bag's directory to the Chef Server.
+
+    knife data bag from file example example_item.json
+
+For more information on data bags, see the Chef wiki page:
+
+https://docs.chef.io/data_bags.html
+
+# Encrypted Data Bags
+
+Encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
+
+    openssl rand -base64 512 > secret_key
+
+You may use this secret_key to add items to a data bag during a create.
+
+    knife data bag create --secret-file secret_key passwords mysql
+
+You may also use it when adding ITEMs from files,
+
+    knife data bag create passwords
+    knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
+
+The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example,
+
+    {
+      "id": "mysql",
+      "password": "abc123"
+    }
+
+Without the secret_key, the contents are encrypted.
+
+    knife data bag show passwords mysql
+    id:        mysql
+    password:  2I0XUUve1TXEojEyeGsjhw==
+
+Use the secret_key to view the contents.
+
+    knife data bag show passwords mysql --secret-file secret_key
+    id:        mysql
+    password:  abc123
+
+
+For more information on encrypted data bags, see the Chef wiki page:
+
+https://docs.chef.io/data_bags.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json

@@ -1,4 +1,4 @@
-{
-    "id": "example_item",
-    "key": "value"
+{
+    "id": "example_item",
+    "key": "value"
 }

data/lib/chef-dk/skeletons/code_generator/files/default/repo/dot-chef-repo.txt

@@ -1,6 +1,6 @@
-.chef-repo.txt
-==============
-
-This file gives ChefDK's generators a hint that you are using a Chef Repo and
-this is the root directory of your Chef Repo. ChefDK's generators use this to
-generate code that is designed to work with the Chef Repo workflow.
+.chef-repo.txt
+==============
+
+This file gives ChefDK's generators a hint that you are using a Chef Repo and
+this is the root directory of your Chef Repo. ChefDK's generators use this to
+generate code that is designed to work with the Chef Repo workflow.

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

@@ -1,9 +1,9 @@
-Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
-
-For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
-
-    knife environment from file environments/example.json
-
-For more information on environments, see the Chef wiki page:
-
-https://docs.chef.io/environments.html
+Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
+
+For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
+
+    knife environment from file environments/example.json
+
+For more information on environments, see the Chef wiki page:
+
+https://docs.chef.io/environments.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json

@@ -1,13 +1,13 @@
-{
-    "name": "example",
-    "description": "This is an example environment defined as JSON",
-    "chef_type": "environment",
-    "json_class": "Chef::Environment",
-    "default_attributes": {
-    },
-    "override_attributes": {
-    },
-    "cookbook_versions": {
-        "example": "= 1.0.0"
-    }
+{
+    "name": "example",
+    "description": "This is an example environment defined as JSON",
+    "chef_type": "environment",
+    "json_class": "Chef::Environment",
+    "default_attributes": {
+    },
+    "override_attributes": {
+    },
+    "cookbook_versions": {
+        "example": "= 1.0.0"
+    }
 }

data/lib/chef-dk/skeletons/code_generator/files/default/repo/policyfiles/README.md

@@ -1,24 +1,24 @@
-Create policyfiles here. When using a chef-repo, give your policyfiles
-the same filename as the name set in the policyfile itself, and use the
-`.rb` file extension.
-
-Compile the policy with a command like this:
-
-```
-chef install policyfiles/my-app-frontend.rb
-```
-
-This will create a lockfile `policyfiles/my-app-frontend.lock.json`.
-
-To update locked dependencies, run `chef update` like this:
-
-```
-chef update policyfiles/my-app-frontend.rb
-```
-
-You can upload the policy (with associated cookbooks) to the server
-using a command like:
-
-```
-chef push staging policyfiles/my-app-frontend.rb
-```
+Create policyfiles here. When using a chef-repo, give your policyfiles
+the same filename as the name set in the policyfile itself, and use the
+`.rb` file extension.
+
+Compile the policy with a command like this:
+
+```
+chef install policyfiles/my-app-frontend.rb
+```
+
+This will create a lockfile `policyfiles/my-app-frontend.lock.json`.
+
+To update locked dependencies, run `chef update` like this:
+
+```
+chef update policyfiles/my-app-frontend.rb
+```
+
+You can upload the policy (with associated cookbooks) to the server
+using a command like:
+
+```
+chef push staging policyfiles/my-app-frontend.rb
+```

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

@@ -1,9 +1,9 @@
-Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
-
-For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
-
-    knife role from file roles/example.json
-
-For more information on roles, see the Chef wiki page:
-
-https://docs.chef.io/roles.html
+Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
+
+For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
+
+    knife role from file roles/example.json
+
+For more information on roles, see the Chef wiki page:
+
+https://docs.chef.io/roles.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json

@@ -1,13 +1,13 @@
-{
-    "name": "example",
-    "description": "This is an example role defined as JSON",
-    "chef_type": "role",
-    "json_class": "Chef::Role",
-    "default_attributes": {
-    },
-    "override_attributes": {
-    },
-    "run_list": [
-        "recipe[example]"
-    ]
+{
+    "name": "example",
+    "description": "This is an example role defined as JSON",
+    "chef_type": "role",
+    "json_class": "Chef::Role",
+    "default_attributes": {
+    },
+    "override_attributes": {
+    },
+    "run_list": [
+        "recipe[example]"
+    ]
 }

data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb

@@ -1,3 +1,3 @@
-# frozen_string_literal: true
-require 'chefspec'
-require 'chefspec/berkshelf'
+# frozen_string_literal: true
+require 'chefspec'
+require 'chefspec/berkshelf'

data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb

@@ -1,3 +1,3 @@
-# frozen_string_literal: true
-require 'chefspec'
-require 'chefspec/policyfile'
+# frozen_string_literal: true
+require 'chefspec'
+require 'chefspec/policyfile'

data/lib/chef-dk/skeletons/code_generator/metadata.rb

@@ -1,8 +1,8 @@
-# frozen_string_literal: true
-name             'code_generator'
-maintainer       'Chef Software, Inc.'
-maintainer_email 'dev@chef.io'
-license          'Apache-2.0'
-description      'Generates Chef code for Chef DK'
-version          '0.1.0'
-chef_version     '>= 13.0'
+# frozen_string_literal: true
+name             'code_generator'
+maintainer       'Chef Software, Inc.'
+maintainer_email 'dev@chef.io'
+license          'Apache-2.0'
+description      'Generates Chef code for Chef DK'
+version          '0.1.0'
+chef_version     '>= 13.0'

data/lib/chef-dk/skeletons/code_generator/recipes/app.rb

@@ -1,89 +1,89 @@
-# frozen_string_literal: true
-
-context = ChefDK::Generator.context
-app_dir = File.join(context.app_root, context.app_name)
-cookbooks_dir = context.cookbook_root
-cookbook_dir = File.join(cookbooks_dir, context.cookbook_name)
-
-# app root dir
-directory app_dir
-
-# Top level files
-
-# Test Kitchen
-template "#{app_dir}/.kitchen.yml" do
-  source 'kitchen.yml.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Inspec
-directory "#{app_dir}/test/integration/default" do
-  recursive true
-end
-
-template "#{app_dir}/test/integration/default/default_test.rb" do
-  source 'inspec_default_test.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# README
-template "#{app_dir}/README.md" do
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Generated Cookbook:
-
-# cookbook collection dir
-directory cookbooks_dir
-
-# cookbook collection dir
-directory cookbook_dir
-
-# metadata.rb
-template "#{cookbook_dir}/metadata.rb" do
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# chefignore
-cookbook_file "#{cookbook_dir}/chefignore"
-
-# Berks
-cookbook_file "#{cookbook_dir}/Berksfile"
-
-# Recipes
-
-directory "#{cookbook_dir}/recipes"
-
-template "#{cookbook_dir}/recipes/default.rb" do
-  source 'recipe.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Chefspec
-directory "#{cookbook_dir}/spec/unit/recipes" do
-  recursive true
-end
-
-cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-  action :create_if_missing
-end
-
-template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
-  source 'recipe_spec.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# git
-if context.have_git
-  unless context.skip_git_init
-    execute('initialize-git') do
-      command('git init .')
-      cwd app_dir
-    end
-  end
-  cookbook_file "#{app_dir}/.gitignore" do
-    source 'gitignore'
-  end
-end
+# frozen_string_literal: true
+
+context = ChefDK::Generator.context
+app_dir = File.join(context.app_root, context.app_name)
+cookbooks_dir = context.cookbook_root
+cookbook_dir = File.join(cookbooks_dir, context.cookbook_name)
+
+# app root dir
+directory app_dir
+
+# Top level files
+
+# Test Kitchen
+template "#{app_dir}/.kitchen.yml" do
+  source 'kitchen.yml.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Inspec
+directory "#{app_dir}/test/integration/default" do
+  recursive true
+end
+
+template "#{app_dir}/test/integration/default/default_test.rb" do
+  source 'inspec_default_test.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# README
+template "#{app_dir}/README.md" do
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Generated Cookbook:
+
+# cookbook collection dir
+directory cookbooks_dir
+
+# cookbook collection dir
+directory cookbook_dir
+
+# metadata.rb
+template "#{cookbook_dir}/metadata.rb" do
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# chefignore
+cookbook_file "#{cookbook_dir}/chefignore"
+
+# Berks
+cookbook_file "#{cookbook_dir}/Berksfile"
+
+# Recipes
+
+directory "#{cookbook_dir}/recipes"
+
+template "#{cookbook_dir}/recipes/default.rb" do
+  source 'recipe.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+  action :create_if_missing
+end
+
+template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
+  source 'recipe_spec.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# git
+if context.have_git
+  unless context.skip_git_init
+    execute('initialize-git') do
+      command('git init .')
+      cwd app_dir
+    end
+  end
+  cookbook_file "#{app_dir}/.gitignore" do
+    source 'gitignore'
+  end
+end