diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index a88b99c..56b38d5 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -1,81 +1,81 @@
 name: "Auto release"
 
 on:
   schedule:
     - cron: '0 3 * * 6'
   workflow_dispatch:
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
   HONEYCOMB_DATASET: litmus tests
   CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   auto_release:
     name: "Automatic release prep"
     runs-on: ubuntu-20.04
 
     steps:
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
 
     - name: "Honeycomb: start first step"
       run: |
         echo STEP_ID="auto-release" >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: "Checkout Source"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
         persist-credentials: false
 
     - name: "PDK Release prep"
       uses: docker://puppet/pdk:nightly
       with:
         args: 'release prep --force'
       env:
         CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: "Get Version"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       id: gv
       run: |
-        echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
+        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
 
     - name: "Commit changes"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
-        git config --local user.email "action@github.com"
+        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
         git config --local user.name "GitHub Action"
         git add .
         git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
 
     - name: Create Pull Request
       id: cpr
       uses: puppetlabs/peter-evans-create-pull-request@v3
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
         branch: "release-prep"
         delete-branch: true
         title: "Release prep v${{ steps.gv.outputs.ver }}"
-        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
+        body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
         labels: "maintenance"
 
     - name: PR outputs
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
         echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
 
     - name: "Honeycomb: Record finish step"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 0c1fd28..abf8e7d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,194 +1,197 @@
 name: "nightly"
 
 on:
   schedule:
     - cron: '0 0 * * *'
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
 jobs:
   setup_matrix:
     name: "Setup Test Matrix"
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
     steps:
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
 
     - name: "Honeycomb: Start first step"
       run: |
         echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
       uses: actions/checkout@v2
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
       uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
         bundler-cache: true
 
     - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
         echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
         else
           echo  "::set-output name=matrix::{}"
         fi
 
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
       - setup_matrix
 
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
 
     env:
       BUILDEVENT_FILE: '../buildevents.txt'
 
     steps:
     - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+
 
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
 
     - name: "Honeycomb: start first step"
       run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
         bundler-cache: true
 
     - name: Print bundle environment
       run: |
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
         echo ::endgroup::
         echo ::group::=== INVENTORY ===
         sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
         echo ::endgroup::
 
     - name: Install agent
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
     - name: Install module
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
     - name: "Honeycomb: Record deployment times"
       if: ${{ always() }}
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
     - name: Run acceptance tests
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
 
     - name: "Honeycomb: Record acceptance testing times"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
       continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
           echo ::group::=== REQUEST ===
           cat request.json || true
           echo
           echo ::endgroup::
         fi
 
     - name: "Honeycomb: Record removal times"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
 
   slack-workflow-status:
     if: always()
     name: Post Workflow Status To Slack
     needs:
       - Acceptance
     runs-on: ubuntu-20.04
     steps:
       - name: Slack Workflow Notification
         uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
         with:
           # Required Input
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
           # Optional Input
           channel: '#team-ia-bots'
           name: 'GABot'
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 207dfca..fb9ff97 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -1,175 +1,177 @@
 name: "PR Testing"
 
 on: [pull_request]
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
 jobs:
   setup_matrix:
     name: "Setup Test Matrix"
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
     steps:
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
 
     - name: "Honeycomb: Start first step"
       run: |
         echo STEP_ID=setup-environment >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
       uses: actions/checkout@v2
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
     - name: Activate Ruby 2.7
       uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
         ruby-version: "2.7"
         bundler-cache: true
 
     - name: Print bundle environment
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
         echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
         else
           echo  "::set-output name=matrix::{}"
         fi
 
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
 
   Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
     needs:
       - setup_matrix
     if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
 
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
 
     env:
       BUILDEVENT_FILE: '../buildevents.txt'
 
     steps:
     - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
       uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
         job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
 
     - name: "Honeycomb: start first step"
       run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Checkout Source
       uses: actions/checkout@v2
 
     - name: Activate Ruby 2.7
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: "2.7"
         bundler-cache: true
 
     - name: Print bundle environment
       run: |
         echo ::group::bundler environment
         buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
         echo ::endgroup::
 
     - name: "Honeycomb: Record Setup Environment time"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
         echo ::endgroup::
         echo ::group::=== INVENTORY ===
         sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
         echo ::endgroup::
 
     - name: Install agent
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
     - name: Install module
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
     - name: "Honeycomb: Record deployment times"
       if: ${{ always() }}
       run: |
         echo ::group::honeycomb step
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
         echo ::endgroup::
 
     - name: Run acceptance tests
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
 
     - name: "Honeycomb: Record acceptance testing times"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
 
     - name: Remove test environment
       if: ${{ always() }}
       continue-on-error: true
       run: |
         if [ -f inventory.yaml ]; then
           buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
           echo ::group::=== REQUEST ===
           cat request.json || true
           echo
           echo ::endgroup::
         fi
 
     - name: "Honeycomb: Record removal times"
       if: ${{ always() }}
       run: |
         buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
diff --git a/metadata.json b/metadata.json
index a199c83..1feb926 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,78 +1,78 @@
 {
   "name": "puppetlabs-vcsrepo",
   "version": "4.0.0",
   "author": "puppetlabs",
   "summary": "Puppet module providing a type to manage repositories from various version control systems",
   "license": "GPL-2.0+",
   "source": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
   "project_page": "https://github.com/puppetlabs/puppetlabs-vcsrepo",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
 
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "12",
         "15"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "8",
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
         "16.04",
         "18.04",
         "20.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g44cc7ed",
+  "template-ref": "heads/main-0-g2bf2de6",
   "pdk-version": "1.18.1"
 }
diff --git a/spec/acceptance/clone_repo_spec.rb b/spec/acceptance/clone_repo_spec.rb
index 1773d2e..91c39de 100644
--- a/spec/acceptance/clone_repo_spec.rb
+++ b/spec/acceptance/clone_repo_spec.rb
@@ -1,565 +1,567 @@
 # frozen_string_literal: true
 
 require 'spec_helper_acceptance'
 
 tmpdir = '/tmp/vcsrepo'
 
 describe 'clones a remote repo' do
   before(:all) do
     my_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     run_shell("rm -rf #{tmpdir}")
     bolt_upload_file("#{my_root}/acceptance/files", tmpdir, 'create_git_repo.sh')
     run_shell("cd #{tmpdir} && ./create_git_repo.sh")
   end
 
   after(:all) do
     run_shell("rm -rf #{tmpdir}/testrepo")
     run_shell("rm -rf #{tmpdir}/testrepo_mirror_repo")
   end
 
   context 'with get the current main HEAD' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo/.git") do
       it { is_expected.to be_directory }
     end
 
     describe file("#{tmpdir}/testrepo/.git/HEAD") do
       it { is_expected.to contain 'ref: refs/heads/main' }
     end
   end
 
   context 'with using a https source on github', unless: only_supports_weak_encryption do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/httpstestrepo":
         ensure => present,
         provider => git,
         source => "https://github.com/puppetlabs/puppetlabs-vcsrepo.git",
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/httpstestrepo/.git") do
       it { is_expected.to be_directory }
     end
 
     describe file("#{tmpdir}/httpstestrepo/.git/HEAD") do
       it { is_expected.to contain 'ref: refs/heads/main' }
     end
   end
 
   context 'with using a commit SHA' do
     let(:sha) do
       run_shell("git --git-dir=#{tmpdir}/testrepo.git rev-list HEAD | tail -1").stdout.chomp
     end
 
     after(:all) do
       run_shell("rm -rf #{tmpdir}/testrepo_sha")
     end
 
     it 'clones a repo' do
       pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_sha":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         revision => "#{sha}",
       }
       MANIFEST
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_sha/.git") do
       it { is_expected.to be_directory }
     end
 
     describe file("#{tmpdir}/testrepo_sha/.git/HEAD") do
       it { is_expected.to contain sha }
     end
   end
 
   context 'with using a tag' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_tag":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         revision => '0.0.2',
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_tag/.git") do
       it { is_expected.to be_directory }
     end
 
     it 'has the tag as the HEAD' do
       run_shell("git --git-dir=#{tmpdir}/testrepo_tag/.git name-rev HEAD | grep '0.0.2'")
     end
   end
 
   context 'with using a branch name' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_branch":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         revision => 'a_branch',
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_branch/.git") do
       it { is_expected.to be_directory }
     end
 
     describe file("#{tmpdir}/testrepo_branch/.git/HEAD") do
       it { is_expected.to contain 'ref: refs/heads/a_branch' }
     end
   end
 
   context 'with ensure latest with branch specified' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_latest":
         ensure => latest,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         revision => 'a_branch',
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     it 'verifies the HEAD commit SHA on remote and local match' do
       remote_commit = run_shell("git ls-remote file://#{tmpdir}/testrepo_latest HEAD | head -1").stdout
       local_commit = run_shell("git --git-dir=#{tmpdir}/testrepo_latest/.git rev-parse HEAD").stdout.chomp
       expect(remote_commit).to include(local_commit)
     end
   end
 
   context 'with ensure latest with branch unspecified' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_latest":
         ensure => latest,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     it 'verifies the HEAD commit SHA on remote and local match' do
       remote_commit = run_shell("git ls-remote file://#{tmpdir}/testrepo_latest HEAD | head -1").stdout
       local_commit = run_shell("git --git-dir=#{tmpdir}/testrepo_latest/.git rev-parse HEAD").stdout.chomp
       expect(remote_commit).to include(local_commit)
     end
   end
 
   context 'with with shallow clone' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_shallow":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         depth => '1',
       }
     MANIFEST
     it 'does a shallow clone' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_shallow/.git/shallow") do
       it { is_expected.to be_file }
     end
   end
 
   context 'with path is not empty and not a repository' do
     before(:all) do
       run_shell("mkdir #{tmpdir}/not_a_repo", acceptable_exit_codes: [0, 1])
       run_shell("touch #{tmpdir}/not_a_repo/file1.txt", acceptable_exit_codes: [0, 1])
     end
 
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/not_a_repo":
         ensure => present,
         provider => git
         source => "file://#{tmpdir}/testrepo.git",
       }
     MANIFEST
     it 'raises an exception' do
       apply_manifest(pp, expect_failures: true)
     end
   end
 
   context 'with with an owner' do
     pp = <<-MANIFEST
     user { 'vagrant':
       ensure => present,
     }
     MANIFEST
 
     apply_manifest(pp, catch_failures: true)
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_owner":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         owner => 'vagrant',
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_owner") do
       it { is_expected.to be_directory }
       it { is_expected.to be_owned_by 'vagrant' }
     end
   end
 
   context 'with with a group' do
     pp = <<-MANIFEST
     group { 'vagrant':
       ensure => present,
     }
     MANIFEST
 
     apply_manifest(pp, catch_failures: true)
 
     pp = <<-MANIFEST
       vcsrepo { "/#{tmpdir}/testrepo_group":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         group => 'vagrant',
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_group") do
       it { is_expected.to be_directory }
       it { is_expected.to be_grouped_into 'vagrant' }
     end
   end
 
   context 'with with excludes' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_excludes":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         excludes => ['exclude1.txt', 'exclude2.txt'],
       }
     MANIFEST
     it 'clones a repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_excludes/.git/info/exclude") do
       subject { super().content }
 
       it { is_expected.to match %r{exclude1.txt} }
     end
 
     describe file("#{tmpdir}/testrepo_excludes/.git/info/exclude") do
       subject { super().content }
 
       it { is_expected.to match %r{exclude2.txt} }
     end
   end
 
   context 'with with force' do
     before(:all) do
       run_shell("mkdir -p #{tmpdir}/testrepo_force/folder")
       run_shell("touch #{tmpdir}/testrepo_force/temp.txt")
     end
     it 'applies the manifest' do
       pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_force":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         force => true,
       }
       MANIFEST
 
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_force/folder") do
       it { is_expected.not_to be_directory }
     end
 
     describe file("#{tmpdir}/testrepo_force/temp.txt") do
       it { is_expected.not_to be_file }
     end
 
     describe file("#{tmpdir}/testrepo_force/.git") do
       it { is_expected.to be_directory }
     end
 
     context 'with and noop' do
       before(:all) do
         run_shell("mkdir #{tmpdir}/testrepo_already_exists")
         run_shell("cd #{tmpdir}/testrepo_already_exists && git init")
         run_shell("cd #{tmpdir}/testrepo_already_exists && touch a && git add a && git commit -m 'a'")
       end
       after(:all) do
         run_shell("rm -rf #{tmpdir}/testrepo_already_exists")
       end
 
       pp = <<-MANIFEST
         vcsrepo { "#{tmpdir}/testrepo_already_exists":
           ensure   => present,
           source   => "file://#{tmpdir}/testrepo.git",
           provider => git,
           force    => true,
           noop     => true,
         }
       MANIFEST
       it 'applies the manifest' do
         apply_manifest(pp, catch_changes: true)
       end
     end
   end
 
   context 'with as a user' do
     before(:all) do
       run_shell("chmod 707 #{tmpdir}")
       pp = <<-MANIFEST
       group { 'testuser':
         ensure => present,
       }
       user { 'testuser':
         ensure => present,
         groups => 'testuser',
       }
       MANIFEST
 
       apply_manifest(pp, catch_failures: true)
     end
 
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_user":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         user => 'testuser',
       }
     MANIFEST
     it 'applies the manifest' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_user") do
       it { is_expected.to be_directory }
       it { is_expected.to be_owned_by 'testuser' }
     end
 
     describe file("#{tmpdir}/testrepo_user") do
       it { is_expected.to be_directory }
       it { is_expected.to be_grouped_into 'testuser' }
     end
 
     after(:all) do
       pp = 'user { "testuser": ensure => absent }'
       apply_manifest(pp, catch_failures: true)
     end
   end
 
   context 'with non-origin remote name' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_remote":
         ensure => present,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
         remote => 'testorigin',
       }
     MANIFEST
     it 'applies the manifest' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     it 'remote name is "testorigin"' do
       run_shell("git --git-dir=#{tmpdir}/testrepo_remote/.git remote | grep 'testorigin'")
     end
   end
 
   context 'with as a user with ssh - includes special characters' do
     before(:all) do
       # create user
       pp = <<-MANIFEST
       group { 'testuser-ssh':
         ensure => present,
       }
       user { 'testuser-ssh':
         ensure => present,
         groups => 'testuser-ssh',
         managehome => true,
       }
       MANIFEST
       apply_manifest(pp, catch_failures: true)
 
       # create ssh keys
       run_shell('mkdir -p /home/testuser-ssh/.ssh')
       run_shell('ssh-keygen -q -t rsa -f /home/testuser-ssh/.ssh/id_rsa -N ""')
 
       # add localhost to known_hosts
       run_shell('rm /home/testuser-ssh/.ssh/known_hosts', expect_failures: true)
       run_shell('ssh-keyscan localhost >> /home/testuser-ssh/.ssh/known_hosts')
 
       # copy public key to authorized_keys
       run_shell('cat /home/testuser-ssh/.ssh/id_rsa.pub > /home/testuser-ssh/.ssh/authorized_keys')
       run_shell('echo -e "Host localhost\n\tStrictHostKeyChecking no\n" > /home/testuser-ssh/.ssh/config')
       run_shell('chown -R testuser-ssh:testuser-ssh /home/testuser-ssh/.ssh')
+      run_shell('rm -rf /var/run/nologin')
     end
 
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_user_ssh":
         ensure => present,
         provider => git,
         source => "git+ssh://testuser-ssh@localhost#{tmpdir}/testrepo.git",
         user => 'testuser-ssh',
       }
     MANIFEST
     it 'applies the manifest' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     after(:all) do
       pp = <<-MANIFEST
       user { 'testuser-ssh':
         ensure => absent,
         managehome => true,
       }
       MANIFEST
       sleep 10
       apply_manifest(pp, catch_failures: true)
     end
   end
 
   context 'with using an identity file' do
     before(:all) do
       # create user
       pp = <<-MANIFEST
       group { 'testuser-ssh':
         ensure => present,
       }
       user { 'testuser-ssh':
         ensure => present,
         groups => 'testuser-ssh',
         managehome => true,
       }
       MANIFEST
       apply_manifest(pp, catch_failures: true)
 
       # create ssh keys
       run_shell('mkdir -p /home/testuser-ssh/.ssh')
       run_shell('ssh-keygen -q -t rsa -f /home/testuser-ssh/.ssh/id_rsa -N ""')
 
       # add localhost to known_hosts
       run_shell('ssh-keyscan localhost > /home/testuser-ssh/.ssh/known_hosts')
 
       # copy public key to authorized_keys
       run_shell('cat /home/testuser-ssh/.ssh/id_rsa.pub > /home/testuser-ssh/.ssh/authorized_keys')
       run_shell('chown -R testuser-ssh:testuser-ssh /home/testuser-ssh/.ssh')
+      run_shell('rm -rf /var/run/nologin')
     end
 
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_user_ssh_id":
         ensure => present,
         provider => git,
         source => "testuser-ssh@localhost:#{tmpdir}/testrepo.git",
         identity => '/home/testuser-ssh/.ssh/id_rsa',
         user => 'testuser-ssh',
       }
     MANIFEST
     it 'applies the manifest' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
   end
 
   context 'with bare repo' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_bare_repo":
         ensure => bare,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
       }
     MANIFEST
     it 'creates a bare repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_bare_repo/config") do
       it { is_expected.to contain 'bare = true' }
     end
     describe file("#{tmpdir}/testrepo_bare_repo/.git") do
       it { is_expected.not_to be_directory }
     end
     describe file("#{tmpdir}/testrepo_bare_repo/HEAD") do
       it { is_expected.to contain 'ref: refs/heads/main' }
     end
   end
 
   context 'with mirror repo' do
     pp = <<-MANIFEST
       vcsrepo { "#{tmpdir}/testrepo_mirror_repo":
         ensure => mirror,
         provider => git,
         source => "file://#{tmpdir}/testrepo.git",
       }
     MANIFEST
     it 'creates a mirror repo' do
       # Run it twice and test for idempotency
       idempotent_apply(pp)
     end
 
     describe file("#{tmpdir}/testrepo_mirror_repo/config") do
       it { is_expected.to contain 'bare = true' }
       it { is_expected.to contain 'mirror = true' }
     end
     describe file("#{tmpdir}/testrepo_mirror_repo/.git") do
       it { is_expected.not_to be_directory }
     end
     describe file("#{tmpdir}/testrepo_mirror_repo/HEAD") do
       it { is_expected.to contain 'ref: refs/heads/main' }
     end
   end
 end