Merge pull request #9 from snohio/0.5.1-Chrome-Tweaks

0.5.1 chrome tweaks

.github/workflows/ci.yml

@@ -56,6 +56,19 @@
             CHEF_LICENSE: accept-no-persist
             KITCHEN_LOCAL_YAML: kitchen.azure.yml
             AZURE_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }}
+            AZURE_TAGS: ${{ vars.AZURE_TAGS }}
+        - name: Test-Kitchen Converge Again
+          if: always()
+          uses: actionshub/test-kitchen@main
+          with:
+            suite: ${{ matrix.suite }}
+            os: ${{ matrix.os }}
+            action: converge
+          env:
+            CHEF_LICENSE: accept-no-persist
+            KITCHEN_LOCAL_YAML: kitchen.azure.yml
+            AZURE_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }}
+            AZURE_TAGS: ${{ vars.AZURE_TAGS }}
         - name: Test-Kitchen Verify
           uses: actionshub/test-kitchen@main
           with:
@@ -93,4 +106,4 @@
             allowed-failures: 
             allowed-skips: 
             jobs: ${{ toJSON(needs) }}
-
+

CHANGELOG.md

@@ -2,59 +2,63 @@
 
 This file is used to list changes made in each version of the win_choco cookbook.
 
+## 0.5.1
+
+* Chrome is now installed by tag and the version check removed.
+
 ## 0.5.0
 
-* Updating and Testing with Chocolatey 2.0
-* Removed Edge and added Chrome support (Edge is pretty much defacto standard)
-* Updated Inspec tests with new versions
+* Updating and Testing with Chocolatey 2.0.
+* Removed Edge and added Chrome support (Edge is pretty much defacto standard.)
+* Updated Inspec tests with new versions.
 
 ## 0.4.3
 
-* Adding ci.yml and git actions to perform cookstyle and kitchen tests
+* Adding ci.yml and git actions to perform cookstyle and kitchen tests.
 
 ## 0.4.2
 
-* Fixed some Inspec checks to validate workstation installed
+* Fixed some Inspec checks to validate workstation installed.
 
 ## 0.4.0
 
 * Created a software package for chef_developers tag.
 
 ## 0.3.0
 
-* Validate working with Client 18
-* No changes were needed
+* Validate working with Client 18.
+* No changes were needed.
 
 ## 0.2.1
 
-* Added OpenJDK
+* Added OpenJDK.
 
 ## 0.1.6
 
-* Updated the Profile Description
+* Updated the Profile Description.
 
 ## 0.1.5
 
-* Added NodeJS
-* Added Adobe Acrobat Reader
-* Added VSCode if Node Attribute
+* Added NodeJS.
+* Added Adobe Acrobat Reader.
+* Added VSCode if Node Attribute.
 
 ## 0.1.3
 
-* Installs and Validates *Microsoft Edge*
+* Installs and Validates *Microsoft Edge*.
 
 ## 0.1.2
 
-* Updated Kitchen.yml to use latest Chef Client that allows for Compliance Phase when running -z
-* Fixed Compliance Profile to send to chef-server-automate (and CLI)
-* The Compliance phase requires Client 17 (metadata.rb)
+* Updated Kitchen.yml to use latest Chef Client that allows for Compliance Phase when running -z.
+* Fixed Compliance Profile to send to chef-server-automate (and CLI.)
+* The Compliance phase requires Client 17 (metadata.rb).
 
 ## 0.1.0
 
 Initial release.
 
-* Installs Choco
-* Installs Git
+* Installs Choco.
+* Installs Git.
 * Compliance Profile is built in.
 
 The check sometimes needs to run twice because the path does not get updated during the run to be able to run the choco list commands.

compliance/profiles/win_apps/controls/default.rb

@@ -13,10 +13,6 @@
     it { should be_installed }
     its('version') { should cmp >= '23.1' }
   end
-  describe chocolatey_package('GoogleChrome') do
-    it { should be_installed }
-    its('version') { should cmp >= '118.0.5993.89' }
-  end
 end
 
 control 'win-vscode' do

compliance/profiles/win_apps/inspec.yml

@@ -1,10 +1,10 @@
-name: win_apps
-title: Windows Choco Application Profile
-maintainer: Mike Butler
-copyright: Progress
-copyright_email: michael.butler@optum.com 
-license: Apache-2.0
-summary: Chocolatey Application Compliance Profile
-version: 0.5.0
-supports:
+name: win_apps
+title: Windows Choco Application Profile
+maintainer: Mike Butler
+copyright: Progress
+copyright_email: michael.butler@optum.com 
+license: Apache-2.0
+summary: Chocolatey Application Compliance Profile
+version: 0.5.1
+supports:
   platform: windows

kitchen.azure.yml

@@ -5,8 +5,7 @@ driver:
   location: 'East US'
   machine_size: 'Standard_D2s_v3'
   azure_resource_group_prefix: 'ga-win_choco-'
-  resource_group_tags:
-   X-TTL: '2'
+  resource_group_tags: <%= ENV["AZURE_TAGS"] %>
 
 provisioner:
   name: chef_infra
@@ -72,9 +71,9 @@ suites:
       audit:
         reporter: 'cli'
         compliance_phase: true
-      software:
+#      software:
 #       adobereader: true
-      tags:
-        - chrome
+#      tags:
+#        - chrome
 #        - chef_developer
 #        - choco_openjdk

kitchen.yml

@@ -1,54 +1,54 @@
----
-driver:
-  name: vagrant
-  box_auto_update: true
-  box_auto_prune: true
-
-provisioner:
-  name: chef_zero
-  always_update_cookbooks: true
-  product_name: chef
-  product_version: 17.8
-  channel: stable
-
-### Uncomment this setting to have Test Kitchen fail on any deprecation warning; useful in advance of a new chef-client release
-  # deprecations_as_errors: true
-
-verifier:
-  name: inspec
-
-platforms:
-
-- name: almalinux-8.5
-  driver:
-    linked_clone: true
-  customize:
-    cpus: 2
-    memory: 2048
-
-- name: stromweld/windows-2022
-  os_type: windows
-  transport:
-    name: winrm
-    elevated: true
-    elevated_username: vagrant
-    elevated_password: vagrant
-  driver:
-    box_name: windows-2022
-    customize:
-      cpus: 2
-      memory: 2048
-
-
-suites:
-  - name: default
-    run_list:
-      - recipe[chef-client::default]
-    verifier:
-      inspec_tests:
-        - compliance/profiles/client-run/controls
-    attributes:
-      audit:
-        reporter: 'cli'
-#      chef:
-#        filepath: = 'c:\Users\vagrant\AppData\Local\Temp\kitchen\client.pem'
+---
+driver:
+  name: vagrant
+  box_auto_update: true
+  box_auto_prune: true
+
+provisioner:
+  name: chef_zero
+  always_update_cookbooks: true
+  product_name: chef
+  product_version: 17.8
+  channel: stable
+
+### Uncomment this setting to have Test Kitchen fail on any deprecation warning; useful in advance of a new chef-client release
+  # deprecations_as_errors: true
+
+verifier:
+  name: inspec
+
+platforms:
+
+- name: almalinux-8.5
+  driver:
+    linked_clone: true
+  customize:
+    cpus: 2
+    memory: 2048
+
+- name: stromweld/windows-2022
+  os_type: windows
+  transport:
+    name: winrm
+    elevated: true
+    elevated_username: vagrant
+    elevated_password: vagrant
+  driver:
+    box_name: windows-2022
+    customize:
+      cpus: 2
+      memory: 2048
+
+
+suites:
+  - name: default
+    run_list:
+      - recipe[chef-client::default]
+    verifier:
+      inspec_tests:
+        - compliance/profiles/client-run/controls
+    attributes:
+      audit:
+        reporter: 'cli'
+#      chef:
+#        filepath: = 'c:\Users\vagrant\AppData\Local\Temp\kitchen\client.pem'