Merge upstream changes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,45 +7,26 @@ assignees: ''
 
 ---
 
-## Describe the bug
+## What happened?
 
-A clear and concise description of what the bug is.
+Please provide as much info as possible.
+Not doing so may result in your bug not being addressed in a timely manner.
 
-Formatting tips: GitHub supports Markdown: https://guides.github.com/features/mastering-markdown/
+## What did you expect to happen?
 
-## To Reproduce
 
-Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include configuration, logs, etc. to reproduce, if relevant.
+## How can we reproduce it (as minimally and precisely as possible)?
 
-1.
-2.
-3.
-4.
+Minimal code helps us to identify the problem faster.
 
-## Expected behavior
+## Anything else we need to know?
 
-A clear and concise description of what you expected to happen.
-
-## Possible Solution
-
-Not obligatory, but suggest a fix/reason for the bug, or ideas how to implement: the addition or change.
 
 ## Your Environment
 
 Include as many relevant details about the environment you experienced the problem in
 
 * go-jira version (git tag or sha):
 * Go version (`go version`):
-* Jira version:
 * Jira type (cloud or on-premise):
-* Involved Jira plugins:
-* Operating System and version:
-
-## Additional context
-
-Add any other context about the problem here.
-
-How has this issue affected you? What are you trying to accomplish?
-Providing context helps us come up with a solution that is most useful in the real world.
-
-
+* Jira version / Api version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +1,16 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest a feature for this project
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-## Is your feature request related to a problem? Please describe.
+## What would you like to be added?
 
-A clear and concise description of what the problem is. Ex. I'm always using this feature but am missing [...]
 
-## Describe the solution you'd like
+## Why is this needed?
 
-A clear and concise description of what you want to happen.
 
-## Describe alternatives you've considered
-
-A clear and concise description of any alternative solutions or features you've considered.
-
-## Additional context
-
-Add any other context or screenshots about the feature request here.
+## Anything else we need to know?

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +1,25 @@
-# Description
+#### What type of PR is this?
 
-Please describe _what does this Pull Request fix or add?_.
+<!--
+Add one of the following kinds:
+* bug
+* cleanup
+* documentation
+* feature
 
-Information that is useful here:
-* **The What**: What is your change doing?
-* **The Why**: Why is your change useful/needed? What is your use case? (this helps us to understand the real world better)
-* **Type of change**: Things like Bugfix, New feature, Code quality improvements, Dependency upgrade, Documentation, ...
-* **Breaking change**: Yes or no? Backward compatible?
-* **Related to an issue**: Does this fix or close an issue? Or is related in any kind?
-* **Jira Version + Type**: Which Jira version and type (on-premise / cloud) you have used?
+Optionally add one or more of the following kinds if applicable:
+* api-change
+* deprecation
+-->
 
-## Example:
+#### What this PR does / why we need it:
 
-Let us know how users can use or test this functionality.
 
-```go
-// Example code
+#### Which issue(s) this PR fixes:
 
-```
+Fixes #
 
-# Checklist
+#### Special notes for your reviewer:
 
-* [ ] Unit or Integration tests added
-  * [ ] Good Path
-  * [ ] Error Path
-* [ ] Commits follow conventions described here:
-  * [ ] [Conventional Commits 1.0.0](https://conventionalcommits.org/en/v1.0.0-beta.4/#summary)
-  * [ ] [The seven rules of a great Git commit message](https://chris.beams.io/posts/git-commit/#seven-rules)
-* [ ] Commits are squashed such that
-  * [ ] There is 1 commit per isolated change
-* [ ] I've not made extraneous commits/changes that are unrelated to my change.
+
+#### Additional documentation e.g., usage docs, etc.:

.github/dependabot.yml

@@ -6,9 +6,9 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"

.github/labeler.yml

@@ -0,0 +1,3 @@
+jira-onpremise: onpremise/**/*
+jira-cloud: cloud/**/*
+documentation: docs/**/*

.github/workflows/documentation.yml

@@ -0,0 +1,16 @@
+name: Documentation 
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - run: pip install mkdocs-material 
+      - run: mkdocs gh-deploy --force

.github/workflows/label-merge-conflicts.yml

@@ -0,0 +1,21 @@
+name: Auto-label merge conflicts
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "*/15 * * * *"
+
+# limit permissions
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  conflicts:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: mschilde/[email protected]
+        with:
+          CONFLICT_LABEL_NAME: conflicts
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/label.yml

@@ -0,0 +1,19 @@
+name: Label pull requests
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+# limit permissions
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: (github.actor != 'dependabot[bot]')
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/testing.yml

@@ -3,45 +3,71 @@ name: Tests
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
   workflow_dispatch:
   schedule:
     - cron: "5 1 * * *"
 
 jobs:
-  test:
-    name: Test and lint
+  unit-test:
+    name: Unit tests
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ '1.18', '1.17' ]
-        os: ["windows-latest", "ubuntu-latest", "macOS-latest"]
+        go: [ '1.19', '1.18' ]
+        os: [ 'windows-latest', 'ubuntu-latest', 'macOS-latest' ]
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: ${{ matrix.go }}
 
-      # Caching go modules to speed up the run
-      - uses: actions/[email protected]
+      - name: Run Unit tests (Go ${{ matrix.go }})
+        run: make test
+
+  fmt:
+    name: go fmt
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: 1.19
 
-      - name: Run go fmt
+      - name: Run go fmt (Go ${{ matrix.go }})
         if: runner.os != 'Windows'
         run: diff -u <(echo -n) <(gofmt -d -s .)
 
+  vet:
+    name: go vet
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+
       - name: Run go vet
         run: make vet
 
-      - name: Run staticcheck
-        run: make staticcheck
+  staticcheck:
+    name: staticcheck
+    runs-on: ubuntu-latest
 
-      - name: Run Unit tests.
-        run: make test
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+
+      - name: Run staticcheck (Go ${{ matrix.go }})
+        uses: dominikh/[email protected]
+        with:
+          version: "2022.1"
+          install-go: false
+          cache-key: staticcheck-cache

.gitignore

@@ -27,4 +27,7 @@ _testmain.go
 *.prof
 *.iml
 .idea
-.DS_Store
+.DS_Store
+
+# Code coverage
+coverage.txt