Merge branch 'master' into im/buildfuture

chef · May 27, 2020 · 60d1c47 · 60d1c47
2 parents f6e1398 + ff5d5c0
commit 60d1c47
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 62 deletions.
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -30,6 +30,7 @@ github:
 # https://expeditor.chef.io/docs/getting-started/subscriptions/#merge-actions
 # The `merge_actions` key is a shortcut for the
 # `pull_request_merged:<GITHUB_REPO>:<RELEASE_BRANCH>:*` subscription.
+#
 merge_actions:
   - bash:.expeditor/determine_version.sh:
       ignore_labels:
@@ -39,6 +40,10 @@ merge_actions:
       ignore_labels:
         - "Expeditor: Skip Changelog"
         - "Expeditor: Skip All"
+  # The git commit happens here
+  - bash:.expeditor/push-git-tag.sh:
+      only_if: bash:.expeditor/determine_version.sh
+      post_commit: true
   - trigger_pipeline:omnibus/release:
       ignore_labels:
         - "Expeditor: Skip Omnibus"
@@ -126,7 +131,7 @@ subscriptions:
   - workload: ruby_gem_published:cookstyle-*
     actions:
        - bash:.expeditor/update_dep.sh
-  - workload: ruby_gem_published:fauxhai-*
+  - workload: ruby_gem_published:fauxhai-ng-*
     actions:
        - bash:.expeditor/update_dep.sh
   - workload: ruby_gem_published:ffi-yajl-*

diff --git a/.expeditor/push-git-tag.sh b/.expeditor/push-git-tag.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This gets run as a post-commit hook after merge to add the version tag so it
+# is easy to determine what changes are in a particular build.
+#
+# https://expeditor.chef.io/docs/reference/action-filters/#post-commit
+
+
+VERSION=`cat VERSION`
+
+git tag $VERSION
+git push origin $VERSION
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,24 @@
 <!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
-<!-- latest_release 20.5.38 -->
-## [20.5.38](https://github.com/chef/chef-workstation/tree/20.5.38) (2020-05-15)
+<!-- latest_release 20.5.47 -->
+## [20.5.47](https://github.com/chef/chef-workstation/tree/20.5.47) (2020-05-27)
 
 #### Merged Pull Requests
-- Update Chef Infra Client to 16.1 [#1201](https://github.com/chef/chef-workstation/pull/1201) ([tas50](https://github.com/tas50))
+- Bump chef-analyze CLI to 0.1.91 [#1227](https://github.com/chef/chef-workstation/pull/1227) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
 <!-- latest_release -->
 
 <!-- release_rollup since=0.17.5 -->
 ### Changes since 0.17.5 release
 
 #### Merged Pull Requests
+- Bump chef-analyze CLI to 0.1.91 [#1227](https://github.com/chef/chef-workstation/pull/1227) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.5.47 -->
+- Pin pry-stack_explorer to &gt;= 0.5.1 [#1225](https://github.com/chef/chef-workstation/pull/1225) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 20.5.46 -->
+- Remove Upgrade Lab feature flag from usage and config docs [#1219](https://github.com/chef/chef-workstation/pull/1219) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 20.5.45 -->
+- Update Cookstyle to 6.5 [#1218](https://github.com/chef/chef-workstation/pull/1218) ([tas50](https://github.com/tas50)) <!-- 20.5.44 -->
+- Update kitchen-digitalocean to 0.11 [#1213](https://github.com/chef/chef-workstation/pull/1213) ([tas50](https://github.com/tas50)) <!-- 20.5.43 -->
+- Push a git tag after a VERSION change [#1209](https://github.com/chef/chef-workstation/pull/1209) ([btm](https://github.com/btm)) <!-- 20.5.42 -->
+- Update knife-windows to 3.0.17 [#1208](https://github.com/chef/chef-workstation/pull/1208) ([tas50](https://github.com/tas50)) <!-- 20.5.41 -->
+- Update Fauxhai to 8.2 [#1207](https://github.com/chef/chef-workstation/pull/1207) ([tas50](https://github.com/tas50)) <!-- 20.5.40 -->
+- Update Test Kitchen, kitchen-ec2, and kitchen-hyperv [#1206](https://github.com/chef/chef-workstation/pull/1206) ([tas50](https://github.com/tas50)) <!-- 20.5.39 -->
 - Update Chef Infra Client to 16.1 [#1201](https://github.com/chef/chef-workstation/pull/1201) ([tas50](https://github.com/tas50)) <!-- 20.5.38 -->
 - Bump chef-analyze CLI to 0.1.89 [#1197](https://github.com/chef/chef-workstation/pull/1197) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.5.37 -->
 - Pin chef-telemetry to avoid extra http deps [#1198](https://github.com/chef/chef-workstation/pull/1198) ([tas50](https://github.com/tas50)) <!-- 20.5.36 -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-20.5.38
+20.5.47
diff --git a/components/gems/Gemfile b/components/gems/Gemfile
@@ -112,7 +112,8 @@ group(:omnibus_package) do
   gem "nokogiri", "= 1.11.0.rc2" # Pinning until 1.11 is released and builds correctly
   gem "pry-byebug"
   gem "pry-remote"
-  gem "pry-stack_explorer"
+  # pry-stack_explorer 0.4.9.3 emits warnings under 2.7 under inspec shell
+  gem "pry-stack_explorer", ">= 0.5.1"
   gem "rb-readline"
   gem "winrm-fs"
   gem "winrm-elevated"

diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -14,7 +14,7 @@ GEM
     artifactory (3.0.13)
     ast (2.4.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.316.0)
+    aws-partitions (1.319.0)
     aws-sdk-apigateway (1.40.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
@@ -51,7 +51,7 @@ GEM
     aws-sdk-codecommit (1.32.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.29.0)
+    aws-sdk-codedeploy (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-codepipeline (1.30.0)
@@ -60,24 +60,24 @@ GEM
     aws-sdk-configservice (1.44.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.96.0)
+    aws-sdk-core (3.96.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-costandusagereportservice (1.20.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.46.1)
+    aws-sdk-dynamodb (1.47.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.159.0)
+    aws-sdk-ec2 (1.162.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.29.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.61.0)
+    aws-sdk-ecs (1.62.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-efs (1.28.0)
@@ -137,11 +137,11 @@ GEM
     aws-sdk-route53resolver (1.13.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.64.0)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.24.0)
+    aws-sdk-securityhub (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ses (1.29.0)
@@ -171,15 +171,15 @@ GEM
       ms_rest_azure (~> 0.11.1)
     azure_mgmt_key_vault (0.17.5)
       ms_rest_azure (~> 0.11.1)
-    azure_mgmt_network (0.23.2)
+    azure_mgmt_network (0.23.3)
       ms_rest_azure (~> 0.11.1)
     azure_mgmt_resources (0.17.8)
       ms_rest_azure (~> 0.11.1)
     azure_mgmt_security (0.18.0)
       ms_rest_azure (~> 0.11.1)
     azure_mgmt_storage (0.21.0)
       ms_rest_azure (~> 0.11.1)
-    backports (3.17.1)
+    backports (3.17.2)
     bcrypt_pbkdf (1.1.0.rc1)
     bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
     bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
@@ -350,7 +350,7 @@ GEM
     concurrent-ruby (1.1.6)
     cookbook-omnifetch (0.9.1)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (6.4.4)
+    cookstyle (6.5.3)
       rubocop (= 0.83.0)
     cucumber-core (3.2.1)
       backports (>= 3.8.0)
@@ -372,8 +372,8 @@ GEM
       multi_json
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    droplet_kit (3.7.0)
-      faraday (~> 0.15)
+    droplet_kit (3.8.0)
+      faraday (>= 0.15)
       kartograph (~> 0.2.3)
       resource_kit (~> 0.1.5)
       virtus (~> 1.0.3)
@@ -392,7 +392,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fauxhai-ng (8.1.0)
+    fauxhai-ng (8.2.0)
       net-ssh
     ffi (1.12.2)
     ffi (1.12.2-x64-mingw32)
@@ -416,7 +416,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (1.0.10)
+    fog-openstack (1.0.11)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -531,14 +531,14 @@ GEM
       inifile (~> 3.0, >= 3.0.0)
       sshkey (>= 1.0.0, < 3)
       test-kitchen (>= 1.20, < 3.0)
-    kitchen-digitalocean (0.10.6)
-      droplet_kit (>= 2.8, < 4.0)
+    kitchen-digitalocean (0.11.0)
+      droplet_kit (>= 3.7, < 4.0)
       test-kitchen (>= 1.17, < 3)
     kitchen-dokken (2.9.0)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)
-    kitchen-ec2 (3.5.0)
+    kitchen-ec2 (3.6.0)
       aws-sdk-ec2 (~> 1.0)
       excon
       multi_json
@@ -548,7 +548,7 @@ GEM
       gcewinpass (~> 1.1)
       google-api-client (>= 0.23.9, < 0.36.0)
       test-kitchen
-    kitchen-hyperv (0.5.4)
+    kitchen-hyperv (0.5.5)
       test-kitchen (>= 1.4, < 3)
     kitchen-inspec (1.3.2)
       hashie (~> 3.4)
@@ -574,17 +574,17 @@ GEM
       ipaddress
       listen (~> 3.1)
       nokogiri (>= 1.5.5)
-    knife-cloud (3.0.1)
+    knife-cloud (3.0.3)
       chef (>= 15.0)
       excon (>= 0.50)
       mixlib-shellout
     knife-ec2 (1.0.36)
       aws-sdk-ec2 (~> 1.95)
       aws-sdk-s3 (~> 1.43)
       chef (>= 15.1)
-    knife-google (4.2.8)
+    knife-google (4.2.14)
       gcewinpass (~> 1.1)
-      google-api-client (>= 0.23.9, < 0.37.0)
+      google-api-client (>= 0.23.9, < 0.39.0)
       knife-cloud (>= 2.0.0)
     knife-opc (0.4.4)
     knife-push (1.1.5)
@@ -601,7 +601,7 @@ GEM
       filesize (>= 0.1.1, < 0.3.0)
       netaddr (~> 1.5)
       rbvmomi (>= 1.8, < 3.0)
-    knife-windows (3.0.16)
+    knife-windows (3.0.17)
       chef (>= 15.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.0)
@@ -637,7 +637,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitar (0.9)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mixlib-archive (1.0.5)
       mixlib-log
     mixlib-archive (1.0.5-universal-mingw32)
@@ -733,9 +733,9 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.3)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
+    pry-stack_explorer (0.5.1)
+      binding_of_caller (~> 0.7)
+      pry (~> 0.13)
     public_suffix (4.0.5)
     r18n-core (4.0.0)
     r18n-desktop (4.0.0)
@@ -823,7 +823,7 @@ GEM
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (2.5.0)
+    test-kitchen (2.5.1)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
@@ -1092,7 +1092,7 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-remote
-  pry-stack_explorer
+  pry-stack_explorer (>= 0.5.1)
   rake (>= 13.0.1)
   rb-readline
   rdp-ruby-wmi

diff --git a/components/main-chef-wrapper/main.go b/components/main-chef-wrapper/main.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 
 	"github.com/chef/chef-workstation/components/main-chef-wrapper/dist"
-	"github.com/chef/go-libs/featflag"
 )
 
 func main() {
@@ -39,18 +38,8 @@ func main() {
 
 	switch subCommand {
 	case "report", "capture":
-		if featflag.ChefFeatAnalyze.Enabled() {
+		cmd = exec.Command(dist.AnalyzeExec, allArgs...)
 
-			cmd = exec.Command(dist.AnalyzeExec, allArgs...)
-
-		} else {
-			fmt.Printf("`%s` is experimental and in development.\n\n", featflag.ChefFeatAnalyze.Key())
-			fmt.Printf("Temporarily enable `%s` with the environment variable:\n", featflag.ChefFeatAnalyze.Key())
-			fmt.Printf("\t%s=true\n\n", featflag.ChefFeatAnalyze.Env())
-			fmt.Printf("Or, permanently by modifying $HOME/.chef-workstation/config.toml with:\n")
-			fmt.Printf("\t[features]\n\t%s = true\n", featflag.ChefFeatAnalyze.Key())
-			os.Exit(0)
-		}
 	case "help", "-h", "--help":
 		usage()
 		os.Exit(0)
@@ -111,16 +100,9 @@ Available Commands:
     delete-policy           Delete all revisions of a policy on the Chef Infra Server
     undelete                Undo a delete command
     describe-cookbook       Prints cookbook checksum information used for cookbook identifier
-`
-
-	if featflag.ChefFeatAnalyze.Enabled() {
-		// add the experimental section to the usage message
-		msg = msg + `
-Experimental Commands:
     report                  Report on the state of existing infrastructure from a Chef Infra Server
     capture                 Copy the state of an existing node locally for testing and verification
 `
-	}
 	fmt.Printf(msg)
 }
 

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 74e9d02cf7f9b164d67789a0a0a7e167143db6fb
+  revision: 1193dc710f66809eb4abd69ea29b23234527acc5
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -295,7 +295,7 @@ GEM
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (2.5.0)
+    test-kitchen (2.5.1)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)

diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
@@ -4,9 +4,9 @@
 # Expeditor takes that version, runs a script to replace it here and pushes a new
 # commit / build through.
 
-override "chef-analyze", version: "0.1.89"
+override "chef-analyze", version: "0.1.91"
 override "delivery-cli", version: "0.0.54"
-override "chef-workstation-app", version: "v0.1.78"
+override "chef-workstation-app", version: "v0.1.79"
 # /DO NOT MODIFY
 
 override "libarchive", version: "3.4.2"

diff --git a/www/content/workstation/config.md b/www/content/workstation/config.md
@@ -393,11 +393,11 @@ Enable and disable experimental features for Chef Workstation.
 
 ```toml
 [features]
-analyze = true
+example = true
 ```
 
 Description
-: List of experimental features. Features are not enabled by default. Enable the feature with `name = true` and disable with `name = false`. The above example enables one feature, which is the `analyze` feature. You can also enable or disable any feature from the command line using an environment variable. For example, setting `CHEF_FEAT_ANALYZE=true` from the command line enables the `analyze` feature for the duration of your terminal session.
+: List of experimental features. Boolean. Default: none. Enable the feature with `feature = true` and disable with `feature = false`.  `example = true` enables one feature, which is the `example` feature. You can also enable or disable any feature from the command line using an environment variable. For example, setting `CHEF_FEAT_EXAMPLE=true` from the command line enables the `example` feature for the duration of your terminal session.
 
 Values
 : `name = true`, `name = false`