Pull in latest from Facebook

.cookstyle.yml

@@ -5,7 +5,11 @@ AllCops:
   # new cops and make upgrades easier (ie not dealing with a bunch of noise
   # each Cookstyle update)
   DisabledByDefault: true
-  TargetChefVersion: 13.10.0
+  TargetChefVersion: 16.18.0
+
+# NOTE: this is also handled in regular RuboCop. T114949895
+Lint/Syntax:
+  Enabled: true
 
 Chef/Correctness/BlockGuardWithOnlyString:
   Enabled: true
@@ -19,6 +23,8 @@ Chef/Correctness/DnfPackageAllowDowngrades:
   Enabled: true
 Chef/Correctness/IncorrectLibraryInjection:
   Enabled: true
+Chef/Correctness/InvalidCookbookName:
+  Enabled: true
 Chef/Correctness/InvalidDefaultAction:
   Enabled: true
 Chef/Correctness/InvalidNotificationTiming:
@@ -43,8 +49,12 @@ Chef/Correctness/MacosUserdefaultsInvalidType:
   Enabled: true
 Chef/Correctness/MalformedPlatformValueForPlatformHelper:
   Enabled: true
+Chef/Correctness/MetadataMalformedDepends:
+  Enabled: true
 Chef/Correctness/MetadataMissingName:
   Enabled: true
+Chef/Correctness/MetadataMissingVersion:
+  Enabled: true
 Chef/Correctness/NodeNormal:
   Enabled: true
 Chef/Correctness/NodeNormalUnless:
@@ -55,6 +65,8 @@ Chef/Correctness/OctalModeAsString:
   Enabled: true
 Chef/Correctness/OpenSSLPasswordHelpers:
   Enabled: true
+Chef/Correctness/PowershellFileExists:
+  Enabled: true
 Chef/Correctness/PowershellScriptDeleteFile:
   Enabled: true
 Chef/Correctness/ResourceSetsInternalProperties:
@@ -86,6 +98,8 @@ Chef/Deprecations/ChefSpecCoverageReport:
   Enabled: true
 Chef/Deprecations/ChefSpecLegacyRunner:
   Enabled: true
+Chef/Deprecations/ChefSugarHelpers:
+  Enabled: true
 Chef/Deprecations/ChefWindowsPlatformHelper:
   Enabled: true
 Chef/Deprecations/Cheffile:
@@ -100,10 +114,18 @@ Chef/Deprecations/CookbookDependsOnPoise:
   Enabled: true
 Chef/Deprecations/CookbooksDependsOnSelf:
   Enabled: true
+Chef/Deprecations/DependsOnChefNginxCookbook:
+  Enabled: true
+Chef/Deprecations/DependsOnChefReportingCookbook:
+  Enabled: true
+Chef/Deprecations/DependsOnOmnibusUpdaterCookbook:
+  Enabled: true
 Chef/Deprecations/DeprecatedPlatformMethods:
   Enabled: true
 Chef/Deprecations/DeprecatedShelloutMethods:
   Enabled: true
+Chef/Deprecations/DeprecatedSudoActions:
+  Enabled: true
 Chef/Deprecations/DeprecatedWindowsVersionCheck:
   Enabled: true
 Chef/Deprecations/DeprecatedYumRepositoryProperties:
@@ -120,8 +142,12 @@ Chef/Deprecations/ExecutePathProperty:
   Enabled: true
 Chef/Deprecations/ExecuteRelativeCreatesWithoutCwd:
   Enabled: true
+Chef/Deprecations/FoodcriticFile:
+  Enabled: true
 Chef/Deprecations/HWRPWithoutProvides:
   Enabled: true
+Chef/Deprecations/HWRPWithoutUnifiedTrue:
+  Enabled: true
 Chef/Deprecations/IncludingXMLRubyRecipe:
   Enabled: true
 Chef/Deprecations/IncludingYumDNFCompatRecipe:
@@ -137,7 +163,7 @@ Chef/Deprecations/LibrarianChefSpec:
 Chef/Deprecations/LocaleDeprecatedLcAllProperty:
   Enabled: true
 Chef/Deprecations/LogResourceNotifications:
-  Enabled: true
+  Enabled: false # TODO(T158851402) ratchet back in
 Chef/Deprecations/MacosUserdefaultsGlobalProperty:
   Enabled: true
 Chef/Deprecations/NamePropertyWithDefaultValue:
@@ -156,6 +182,8 @@ Chef/Deprecations/PartialSearchHelperUsage:
   Enabled: true
 Chef/Deprecations/PoiseArchiveUsage:
   Enabled: true
+Chef/Deprecations/PolicyfileCommunitySource:
+  Enabled: true
 Chef/Deprecations/PowershellCookbookHelpers:
   Enabled: true
 Chef/Deprecations/RequireRecipe:
@@ -201,6 +229,27 @@ Chef/Deprecations/WindowsTaskChangeAction:
 Chef/Deprecations/WindowsVersionHelpers:
   Enabled: true
 
+# These cookbooks don't follow the Effortless Pattern
+# See https://docs.chef.io/effortless/
+Chef/Effortless/Berksfile:
+  Enabled: false
+Chef/Effortless/ChefVaultUsed:
+  Enabled: false
+Chef/Effortless/CookbookUsesDatabags:
+  Enabled: false
+Chef/Effortless/CookbookUsesEnvironments:
+  Enabled: false
+Chef/Effortless/CookbookUsesPolicygroups:
+  Enabled: false
+Chef/Effortless/CookbookUsesRoles:
+  Enabled: false
+Chef/Effortless/CookbookUsesSearch:
+  Enabled: false
+Chef/Effortless/DependsChefVault:
+  Enabled: false
+Chef/Effortless/SearchForEnvironmentsOrRoles:
+  Enabled: false
+
 Chef/Modernize/ActionMethodInResource:
   Enabled: true
 Chef/Modernize/AllowedActionsFromInitialize:
@@ -217,10 +266,26 @@ Chef/Modernize/CustomResourceWithAttributes:
   Enabled: true
 Chef/Modernize/DatabagHelpers:
   Enabled: true
+Chef/Modernize/DeclareActionClass:
+  Enabled: true
 Chef/Modernize/DefaultActionFromInitialize:
   Enabled: true
 Chef/Modernize/Definitions:
   Enabled: true
+Chef/Modernize/DependsOnChefVaultCookbook:
+  Enabled: true
+Chef/Modernize/DependsOnChocolateyCookbooks:
+  Enabled: true
+Chef/Modernize/DependsOnKernelModuleCookbook:
+  Enabled: true
+Chef/Modernize/DependsOnLocaleCookbook:
+  Enabled: true
+Chef/Modernize/DependsOnOpensslCookbook:
+  Enabled: true
+Chef/Modernize/DependsOnTimezoneLwrpCookbook:
+  Enabled: true
+Chef/Modernize/DependsOnWindowsFirewallCookbook:
+  Enabled: true
 Chef/Modernize/DependsOnZypperCookbook:
   Enabled: true
 Chef/Modernize/DslIncludeInResource:
@@ -237,6 +302,8 @@ Chef/Modernize/ExecuteSysctl:
   Enabled: true
 Chef/Modernize/ExecuteTzUtil:
   Enabled: true
+Chef/Modernize/FoodcriticComments:
+  Enabled: true
 Chef/Modernize/IfProvidesDefaultAction:
   Enabled: true
 Chef/Modernize/IncludingAptDefaultRecipe:
@@ -295,10 +362,16 @@ Chef/Modernize/SysctlParamResource:
   Enabled: true
 Chef/Modernize/UnnecessaryDependsChef14:
   Enabled: true
+Chef/Modernize/UnnecessaryDependsChef15:
+  Enabled: true
 Chef/Modernize/UnnecessaryMixlibShelloutRequire:
   Enabled: true
 Chef/Modernize/UseBuildEssentialResource:
   Enabled: true
+Chef/Modernize/UseChefLanguageEnvHelpers:
+  Enabled: true
+Chef/Modernize/UseChefLanguageSystemdHelper:
+  Enabled: true
 Chef/Modernize/UseMultipackageInstalls:
   Enabled: true
 Chef/Modernize/UseRequireRelative:
@@ -361,25 +434,34 @@ Chef/RedundantCode/UnnecessaryNameProperty:
 Chef/RedundantCode/UseCreateIfMissing:
   Enabled: true
 
+Chef/Security/SshPrivateKey:
+  Enabled: true
+
 Chef/Sharing/DefaultMetadataMaintainer:
   Enabled: true
 Chef/Sharing/EmptyMetadataField:
   Enabled: true
 Chef/Sharing/IncludePropertyDescriptions:
-  Enabled: true
+  Enabled: false # TODO(T158836638) ratchet back in
 Chef/Sharing/IncludeResourceDescriptions:
-  Enabled: true
+  Enabled: false # TODO(T158836638) ratchet back in
 Chef/Sharing/IncludeResourceExamples:
-  Enabled: true
+  Enabled: false # TODO(T158836638) ratchet back in
 Chef/Sharing/InsecureCookbookURL:
   Enabled: true
 Chef/Sharing/InvalidLicenseString:
   Enabled: true
 
 Chef/Style/AttributeKeys:
   Enabled: true
+Chef/Style/ChefWhaaat:
+  Enabled: false # Turned off intentionally, too opinionated/noisy
+Chef/Style/CommentFormat:
+  Enabled: false # Turned off intentionally, too opinionated/noisy
 Chef/Style/CommentSentenceSpacing:
-  Enabled: true
+  Enabled: false # Turned off intentionally, too opinionated/noisy
+Chef/Style/CopyrightCommentFormat:
+  Enabled: false # Turned off intentionally, too opinionated/noisy
 Chef/Style/DefaultCopyrightComments:
   Enabled: true
 Chef/Style/FileMode:

.cookstyle_combined.yml

@@ -0,0 +1,5 @@
+# Combine the RuboCop and Cookstyle specific rules here (as opposed to directly
+# including .rubocop.yml into .cookstyle.yml)
+inherit_from:
+  - .rubocop.yml
+  - .cookstyle.yml

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.4, 2.5, 2.6]
+        ruby: ['2.7', '3.0', '3.1']
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -21,8 +21,6 @@ jobs:
       run: bundle install
     - name: Run rspec
       run: ./scripts/run_chefspec
-    - name: Run rubocop
-      run: ./scripts/run_rubocop .rubocop.yml
     - name: Run cookstyle
       run: ./scripts/run_cookstyle
   kitchen:
@@ -39,24 +37,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Install Chef
-      uses: actionshub/chef-install@1.1.0
+      uses: actionshub/chef-install@2.0.4
       with:
         project: chef-workstation
         version: 20.11.180
     - name: Run Kitchen
-      uses: actionshub/test-kitchen@2.0.0
+      uses: actionshub/test-kitchen@2.1.0
       with:
         suite: default
         os: ${{ matrix.os }}
       env:
         CHEF_LICENSE: accept-no-persist
-        CHEF_VERSION: 14.15.6
+        CHEF_VERSION: 16.18.0
   shellcheck:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run Shellcheck
-        uses: ludeeus/action-shellcheck@0.3.0
+        uses: ludeeus/action-shellcheck@2.0.0

.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   DisabledByDefault: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     # template files named `rb` instead of `erb` are a sin against ruby-nature.
     - '**/templates/**/*.rb'#
@@ -325,19 +325,15 @@ Lint/AmbiguousOperator:
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
-  # TODO re-enable autocorrection on RuboCop >= v1.19 see https://github.com/rubocop/rubocop/issues/10002
-  AutoCorrect: false
 
 Lint/AssignmentInCondition:
   Enabled: true
 
 Lint/BigDecimalNew:
   Enabled: true
 
-# TODO move exception to file after chef-workstation upgrade
 Lint/BinaryOperatorWithIdenticalOperands:
-  Exclude:
-  - cookbooks/fb_helpers/spec/version_spec.rb
+  Enabled: true
 
 Lint/BooleanSymbol:
   Enabled: true