Merge branch 'master' into more_cleanup

CHANGELOG.md

@@ -1,15 +1,22 @@
 <!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
-<!-- latest_release 20.7.102 -->
-## [20.7.102](https://github.com/chef/chef-workstation/tree/20.7.102) (2020-07-31)
+<!-- latest_release 20.8.109 -->
+## [20.8.109](https://github.com/chef/chef-workstation/tree/20.8.109) (2020-08-04)
 
 #### Merged Pull Requests
-- Reduce the size of the Chef Workstation package / install [#1386](https://github.com/chef/chef-workstation/pull/1386) ([tas50](https://github.com/tas50))
+- Update chef-run cookbook search preference [#1383](https://github.com/chef/chef-workstation/pull/1383) ([mudash](https://github.com/mudash))
 <!-- latest_release -->
 
 <!-- release_rollup since=20.7.81 -->
 ### Changes since 20.7.81 release
 
 #### Merged Pull Requests
+- Update chef-run cookbook search preference [#1383](https://github.com/chef/chef-workstation/pull/1383) ([mudash](https://github.com/mudash)) <!-- 20.8.109 -->
+- Spellcheck fixes to various components [#1381](https://github.com/chef/chef-workstation/pull/1381) ([tas50](https://github.com/tas50)) <!-- 20.8.108 -->
+- Bump  to 16.3.45 [#1378](https://github.com/chef/chef-workstation/pull/1378) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.8.107 -->
+- Bump chef-analyze CLI to 0.1.99 [#1371](https://github.com/chef/chef-workstation/pull/1371) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.8.106 -->
+- add gcc &amp; make in docker image [#1361](https://github.com/chef/chef-workstation/pull/1361) ([Wing924](https://github.com/Wing924)) <!-- 20.8.105 -->
+- Update cookstyle, kichen/knife vmware plugins, knife-opc, and test kitchen [#1389](https://github.com/chef/chef-workstation/pull/1389) ([tas50](https://github.com/tas50)) <!-- 20.8.104 -->
+- Move more of the omnibus cleanup to omnibus-software [#1366](https://github.com/chef/chef-workstation/pull/1366) ([tas50](https://github.com/tas50)) <!-- 20.7.103 -->
 - Reduce the size of the Chef Workstation package / install [#1386](https://github.com/chef/chef-workstation/pull/1386) ([tas50](https://github.com/tas50)) <!-- 20.7.102 -->
 - Make sure macOS detection works even if the string changes [#1384](https://github.com/chef/chef-workstation/pull/1384) ([tas50](https://github.com/tas50)) <!-- 20.7.101 -->
 - Update default_version of habitat during build [#1363](https://github.com/chef/chef-workstation/pull/1363) ([marcparadise](https://github.com/marcparadise)) <!-- 20.7.100 -->

Dockerfile

@@ -24,7 +24,7 @@ ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
 RUN apt-get update && \
-    apt-get install -y git graphviz rsync ssh vim-tiny wget && \
+    apt-get install -y gcc git graphviz make rsync ssh vim-tiny wget && \
     ln -s /usr/bin/vi /usr/bin/vim && \
     wget --content-disposition "http://packages.chef.io/files/${CHANNEL}/chef-workstation/${VERSION}/ubuntu/18.04/chef-workstation_${VERSION}-1_amd64.deb" -O /tmp/chef-workstation.deb && \
     dpkg -i /tmp/chef-workstation.deb && \

VERSION

@@ -1 +1 @@
-20.7.102
+20.8.109

components/gems/Gemfile

@@ -48,8 +48,8 @@ group(:omnibus_package) do
   # gems to Rubygems now, so letting this float on latest should always give us the latest
   # stable release. May have to re-pin around major version bumping time, or during patch
   # fixes.
-  gem "chef", "= 16.3.38"
-  gem "chef-bin", "= 16.3.38"
+  gem "chef", "= 16.3.45"
+  gem "chef-bin", "= 16.3.45"
   gem "ohai", ">= 16.2"
   gem "cheffish", ">= 15.0.0"
 

components/gems/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     artifactory (3.0.15)
     ast (2.4.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.345.0)
+    aws-partitions (1.349.0)
     aws-sdk-apigateway (1.48.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
@@ -33,7 +33,7 @@ GEM
     aws-sdk-cloudformation (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.35.0)
+    aws-sdk-cloudfront (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudhsm (1.24.0)
@@ -74,10 +74,10 @@ GEM
     aws-sdk-dynamodb (1.51.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.178.0)
+    aws-sdk-ec2 (1.182.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.34.0)
+    aws-sdk-ecr (1.35.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecs (1.67.0)
@@ -104,13 +104,13 @@ GEM
     aws-sdk-elasticsearchservice (1.39.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.31.0)
+    aws-sdk-firehose (1.32.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.43.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.23.0)
+    aws-sdk-kafka (1.24.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kinesis (1.26.0)
@@ -125,7 +125,7 @@ GEM
     aws-sdk-organizations (1.17.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.94.0)
+    aws-sdk-rds (1.95.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-redshift (1.46.0)
@@ -144,7 +144,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.104.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.29.0)
+    aws-sdk-securityhub (1.30.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ses (1.33.0)
@@ -159,7 +159,7 @@ GEM
     aws-sdk-sqs (1.30.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.84.0)
+    aws-sdk-ssm (1.85.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.1)
@@ -202,12 +202,12 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     byebug (11.1.3)
-    chef (16.3.38)
+    chef (16.3.45)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.3.38)
-      chef-utils (= 16.3.38)
+      chef-config (= 16.3.45)
+      chef-utils (= 16.3.45)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -237,12 +237,12 @@ GEM
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (16.3.38-universal-mingw32)
+    chef (16.3.45-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.3.38)
-      chef-utils (= 16.3.38)
+      chef-config (= 16.3.45)
+      chef-utils (= 16.3.45)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -302,9 +302,9 @@ GEM
       train-core (~> 3.0)
       train-winrm
       tty-spinner
-    chef-bin (16.3.38)
-      chef (= 16.3.38)
-    chef-cli (3.0.11)
+    chef-bin (16.3.45)
+      chef (= 16.3.45)
+    chef-cli (3.0.14)
       addressable (>= 2.3.5, < 2.8)
       chef (>= 15.0)
       cookbook-omnifetch (~> 0.5)
@@ -316,9 +316,9 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       paint (>= 1, < 3)
       solve (> 2.0, < 5.0)
-    chef-config (16.3.38)
+    chef-config (16.3.45)
       addressable
-      chef-utils (= 16.3.38)
+      chef-utils (= 16.3.45)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -327,7 +327,7 @@ GEM
       chef-config
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
-    chef-utils (16.3.38)
+    chef-utils (16.3.45)
     chef-vault (4.0.1)
     chef-zero (15.0.0)
       ffi-yajl (~> 2.2)
@@ -353,7 +353,7 @@ GEM
     concurrent-ruby (1.1.6)
     cookbook-omnifetch (0.10.0)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (6.13.3)
+    cookstyle (6.14.7)
       rubocop (= 0.88.0)
     debug_inspector (0.0.3)
     declarative (0.0.20)
@@ -547,8 +547,8 @@ GEM
       test-kitchen (>= 1.4.1, < 3)
     kitchen-vagrant (1.6.1)
       test-kitchen (>= 1.4, < 3)
-    kitchen-vcenter (2.7.6)
-      rbvmomi (>= 1.11, < 3.0)
+    kitchen-vcenter (2.7.8)
+      rbvmomi (>= 1.11, < 4.0)
       test-kitchen (>= 1.16, < 3.0)
       vsphere-automation-sdk (~> 0.4)
     knife-azure (3.0.1)
@@ -574,23 +574,23 @@ GEM
       gcewinpass (~> 1.1)
       google-api-client (>= 0.23.9, < 0.43.0)
       knife-cloud (>= 4.0.0)
-    knife-opc (0.4.4)
+    knife-opc (0.4.6)
     knife-push (2.0.0)
       addressable
       chef (>= 15.0)
     knife-tidy (2.1.0)
-    knife-vcenter (5.0.2)
+    knife-vcenter (5.0.4)
       chef (>= 15.11)
       knife-cloud (>= 4.0)
       rb-readline (~> 0.5)
-      rbvmomi (>= 1.11, < 3.0)
+      rbvmomi (>= 1.11, < 4.0)
       vsphere-automation-sdk (~> 0.4)
-    knife-vsphere (4.1.3)
+    knife-vsphere (4.1.4)
       chef (>= 15.1)
       chef-vault (>= 2.6.0)
       filesize (>= 0.1.1, < 0.3.0)
       netaddr (~> 1.5)
-      rbvmomi (>= 1.8, < 3.0)
+      rbvmomi (>= 1.8, < 4.0)
     knife-windows (4.0.2)
       chef (>= 15.11)
       winrm (~> 2.1)
@@ -613,7 +613,7 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    lumberjack (1.2.6)
+    lumberjack (1.2.7)
     mdl (0.9.0)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
@@ -686,7 +686,7 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (16.3.0)
+    ohai (16.3.2)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -740,10 +740,10 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    rbvmomi (2.4.1)
-      builder (~> 3.0)
-      json (>= 1.8)
-      nokogiri (~> 1.5)
+    rbvmomi (3.0.0)
+      builder (~> 3.2)
+      json (~> 2.3)
+      nokogiri (~> 1.10)
       optimist (~> 3.0)
     rdp-ruby-wmi (0.3.1)
     regexp_parser (1.7.1)
@@ -820,7 +820,7 @@ GEM
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (2.5.3)
+    test-kitchen (2.5.4)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
@@ -1039,9 +1039,9 @@ DEPENDENCIES
   artifactory
   bcrypt_pbkdf (>= 1.1.0.rc1)
   berkshelf (>= 7.0.10)
-  chef (= 16.3.38)
+  chef (= 16.3.45)
   chef-apply (>= 0.4.16)
-  chef-bin (= 16.3.38)
+  chef-bin (= 16.3.45)
   chef-cli (>= 3.0.4)
   chef-telemetry (>= 1.0.8)
   cheffish (>= 15.0.0)

docs/Chef-CLI-Catalog.md

@@ -57,7 +57,7 @@ give that time back to our users.
 
     As a Chef Operator,
     I need a unified Command Line Interface (CLI) that lets me interact with every Chef product,
-    so I can easly discover the capabilities of the Chef ecosystem.
+    so I can easily discover the capabilities of the Chef ecosystem.
 
     As a Chef Developer,
     I need to be able to gather information about how our users consume and interact with our tools,
@@ -225,7 +225,7 @@ can control the "Usage" message of sub-binaries. Currently, the `chef-analyze`
 binary displays the usage message `chef-analyze [command]` when it is run directly
 and also when it is run from the `chef` catalog. We would like the usage message
 to be consistent with the way users execute the commands so if you run `chef analyze`
-the usage sould be `chef analyze [command]`; and if you run `chef-analyze` the
+the usage should be `chef analyze [command]`; and if you run `chef-analyze` the
 usage should continue to be `chef-analyze [command]`.
 
 ## Open points for further discussion:

docs/Where-Do-Cookbooks-Come-From.md

@@ -31,7 +31,7 @@ There are three methods for getting cookbooks onto the server:
 - policy is assigned to a node(s) by updating the nodes to reference the policy group and file.
 - Policy lock is uploaded to the server for the nodes; all cb versions are uploaded. At
   run-time, chef-client still uses the cookbook server for download; but it does not send a run list
-  to the server for resolution. Instead, it downloads the CB versions specfied in the lock file.
+  to the server for resolution. Instead, it downloads the CB versions specified in the lock file.
 
 ## Supported Cookbook Sources
 
@@ -45,14 +45,14 @@ This includes any case where a node's runlist is managed in absense of policy gr
  - run list is expanded and merged in client:
    - starts from run list saved to node;  OR override run-list from the CLI
    - roles are resolved to the recipes they contain and added to the run list
-   - environment run lists are expaneded as above, and added to the run list.
+   - environment run lists are expanded as above, and added to the run list.
    - No dependency eval is done by the client.
  - client posts the expanded run list to the server for dependency resolution.
    - endpoint: `environments/$/run_list`
-   - server evaulates the run list against the full list of available cookbooks for the org
+   - server evaluates the run list against the full list of available cookbooks for the org
      including dependencies
       * replies with the cookbooks & versions needed to solve the expanded run list, respecting
-        version constraintsa
+        version constraints
       * this reply becomes node["cookbooks"] and represents the cookbooks required for the expanded run list
         it is a full snapshot of cookbooks in use by the node as of most recent converge.  (Saved when converge is complete)
  - client downloads cookbooks into client cache at the version provided in the runlist.
@@ -70,4 +70,3 @@ This includes any case where a node's runlist is managed in absense of policy gr
 
  - this follows the same path as policyfile, except that the chef-server used to fetch cookbooks
    is chef-zero.
-

docs/architecture/sd1.wsd

@@ -46,7 +46,7 @@ ConvergeCommand -> ConvergeCommand: rescue, print stack trace
 
 == Program End ==
 
-' ConvergeCommand will be responsible for outputting information to CLIOutputter and logger to do any end of program stuff, CLI is only resonsible for exiting
+' ConvergeCommand will be responsible for outputting information to CLIOutputter and logger to do any end of program stuff, CLI is only responsible for exiting
 ConvergeCommand --> CLI: status
 <-- CLI: exit(status)
 @enduml

docs/architecture/telemetry.md

@@ -66,7 +66,7 @@ or the request will be dropped.
 `$CONFIG_PATH/telemetry/token` will be initialized with a new GUID if missing by the client library.
 The server and client will both read this file with every request.
 
-This method relies on the browser keeping the local filesytem secure from an attacker seeking the
+This method relies on the browser keeping the local filesystem secure from an attacker seeking the
 content of specific files (such as the telemetry token).
 
 ## Sequence Diagram
@@ -277,7 +277,7 @@ Exposing a local REST API interface opens the door to future user experience enh
 #### Advantages
 
 * Clean separation of domains along process boundaries
-* potentially begins to move away from ruby depenency
+* potentially begins to move away from ruby dependency
 * We can ensure it is always running via system service management, vs CWA which the user
   can terminate at any time from the tray/menu.
   * NOTE: it came out in subsequent discussion that electron/nodejs may also make this possible.
@@ -286,4 +286,3 @@ Exposing a local REST API interface opens the door to future user experience enh
 
 * Expands language footprint, associated learning curve
 * Another new component to be built and managed  with limited resources
-

omnibus/README.md

@@ -17,7 +17,7 @@ The build pipeline generally looks like the following:
 1. To promote to the `stable` channel (also called 'releasing') we use Expeditor.
 1.1. `/expeditor promote chef/chef-workstation:master 1.0.2` would promote a 1.0.2 build from current to stable.
 1. Packages are available via...
-1.1. mixlib-install, omnitruck, downloads.chef.io, Habitat Depot, Dockerhub
+1.1. mixlib-install, omnitruck, downloads.chef.io, Habitat Depot, Docker Hub
 1. Come to `#releng-support` if any of these things cause issues
 
 ## Installation

omnibus/config/projects/chef-workstation.rb

@@ -40,7 +40,7 @@
 build_version IO.read(version_file).strip
 build_iteration 1
 
-# In order to prevent unecessary cache expiration,
+# In order to prevent unnecessary cache expiration,
 # package and package version overrides, build_version
 # and build_iteration are kept in <project-root>/omnibus_overrides.rb
 overrides_path = File.expand_path("../../../../omnibus_overrides.rb", __FILE__)