Merge pull request #48 from mhashizume/maint/main/module-updates

Actions and test updates

6 files changed, 26 insertions, 68 deletions

diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml
new file mode 100644
index 0000000..47f8080
--- /dev/null
+++ b/.github/workflows/jira.yml
@@ -0,0 +1,20 @@
+---
+name: Export issue to Jira
+
+on:
+  issues:
+    types: [labeled]
+
+permissions:
+  issues: write
+
+jobs:
+  export:
+    uses: "puppetlabs/phoenix-github-actions/.github/workflows/jira.yml@main"
+    with:
+      jira-project: PA
+      jira-base-url: ${{ vars.jira_base_url }}
+      jira-user-email: ${{ vars.jira_user_email }}
+    secrets:
+      jira-api-token: ${{ secrets.JIRA_ISSUES_ACTION }}
+
diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml
index b639220..62438da 100644
--- a/.github/workflows/static_code_analysis.yaml
+++ b/.github/workflows/static_code_analysis.yaml
@@ -6,44 +6,8 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  workflow_dispatch:
 
 jobs:
   static_code_analysis:
-    name: Run checks
-
-    env:
-      ruby_version: 2.6
-      extra_checks: check:symlinks check:git_ignore check:dot_underscore check:test_file
-
-    runs-on: 'ubuntu-20.04'
-    steps:
-      - name: Checkout current PR code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Install ruby version ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ env.ruby_version }}
-
-      - name: Prepare testing environment with bundler
-        run: |
-          git config --global core.longpaths true
-          bundle config set --local without 'release'
-          bundle update --jobs 4 --retry 3
-
-      - name: Run commits check
-        run: bundle exec rake commits
-
-      - name: Run rubocop check
-        run: bundle exec rake ${{ env.extra_checks }} rubocop
-
-      - name: Run syntax check
-        run: bundle exec rake ${{ env.extra_checks }} syntax syntax:hiera syntax:manifests syntax:templates
-
-      - name: Run lint check
-        run: bundle exec rake ${{ env.extra_checks }} lint
-
-      - name: Run metadata_lint check
-        run: bundle exec rake ${{ env.extra_checks }} metadata_lint
+    uses: "puppetlabs/phoenix-github-actions/.github/workflows/static_code_analysis.yaml@main"
diff --git a/metadata.json b/metadata.json
index b626f62..bd99ed2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-mailalias_core",
   "project_page": "https://github.com/puppetlabs/puppetlabs-mailalias_core",
-  "issues_url": "https://tickets.puppetlabs.com/projects/MODULES",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-mailalias_core/issues",
   "dependencies": [
 
   ],
diff --git a/rakelib/commits.rake b/rakelib/commits.rake
deleted file mode 100644
index 42eb209..0000000
--- a/rakelib/commits.rake
+++ /dev/null
@@ -1,26 +0,0 @@
-desc "verify that commit messages match CONTRIBUTING.md requirements"
-task(:commits) do
-  # This rake task looks at the summary from every commit from this branch not
-  # in the branch targeted for a PR.
-  commit_range = 'HEAD^..HEAD'
-  puts "Checking commits #{commit_range}"
-  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
-    # This regex tests for the currently supported commit summary tokens.
-    # The exception tries to explain it in more full.
-    if /^Release prep|\((maint|packaging|doc|docs|modules-\d+)\)|revert/i.match(commit_summary).nil?
-      raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
-        "\n\t\t#{commit_summary}\n" \
-        "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
-        "\t\t(MODULES-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
-        "\t\t(docs)\n" \
-        "\t\t(docs)(DOCUMENT-<digits>)\n" \
-        "\t\t(packaging)\n"
-        "\t\t(maint)\n" \
-        "\t\tRelease prep v<tag>\n" \
-        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
-    else
-      puts "#{commit_summary}"
-    end
-    puts "...passed"
-  end
-end
diff --git a/spec/acceptance/tests/destroy_spec.rb b/spec/acceptance/tests/destroy_spec.rb
index a5cb122..380fc96 100644
--- a/spec/acceptance/tests/destroy_spec.rb
+++ b/spec/acceptance/tests/destroy_spec.rb
@@ -34,7 +34,7 @@ RSpec.context 'Mailalias: should delete an email alias' do
 
       # verify the alias is absent
       on(agent, 'cat /etc/aliases') do |res|
-        assert_no_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias was not removed from aliases file')
+        refute_match(%r{#{name}:.*foo,bar,baz}, res.stdout, 'mailalias was not removed from aliases file')
       end
     end
   end
diff --git a/spec/acceptance/tests/query_spec.rb b/spec/acceptance/tests/query_spec.rb
index 17e0bbf..43bbcaf 100644
--- a/spec/acceptance/tests/query_spec.rb
+++ b/spec/acceptance/tests/query_spec.rb
@@ -27,8 +27,8 @@ RSpec.context 'should be able to find an exisitng email alias' do
 
   non_windows_agents.each do |agent|
     it 'queries for the mail alias with puppet' do
-      on(agent, puppet_resource('mailalias', name)) do
-        fail_test "didn't find the scheduled_task #{name}" unless stdout.include? 'present'
+      on(agent, puppet_resource('mailalias', name)) do |res|
+        fail_test "didn't find the scheduled_task #{name}" unless res.stdout.include? 'present'
       end
     end
   end