backport of commit 8d07c29

Author: jrasell

.github/ISSUE_TEMPLATE/config.yml

@@ -3,12 +3,9 @@
 
 blank_issues_enabled: false
 contact_links:
-  - name: Create a documentation issue
-    url: https://github.com/hashicorp/web-unified-docs/issues
-    about: Create a Nomad documentation bug or content request in the    web-unified-docs repository.
   - name: Ask a Question
     url: https://discuss.hashicorp.com/c/nomad
     about: If you have a question, or are looking for advice, please post on our Discuss forum.
-  - name: Nomad Tutorials
-    url: https://developer.hashicorp.com/nomad/tutorials
-    about: Please check out our tutorials. These tutorials provide in-depth   learning on Nomad features.
+  - name: Nomad Learn Tracks
+    url: https://learn.hashicorp.com/nomad
+    about: Please check out our Learn Guides. These hands on guides deal with many of the tasks common to using Nomad.

.github/actions/jira/shared.bash

@@ -7,7 +7,7 @@ TEXT_CLEAR='\e[0m'
 
 # Make a request to the Jira API
 function jira-request() {
-  curl --show-error --location --fail-with-body \
+  curl --show-error --location --fail \
     --user "${JIRA_USER_EMAIL}:${JIRA_API_TOKEN}" \
     --header "Accept: application/json" \
     --header "Content-Type: application/json" \

.github/actions/jira/transition/action.yml

@@ -7,22 +7,9 @@ inputs:
   issue:
     required: true
     description: JIRA issue to transition
-  resolution:
-    required: false
-    description: Resolution name to apply to issue
   transition:
     required: true
     description: Transition name to apply to issue
-  fixed-version:
-    required: false
-    description: Version fixed (only used if resolution set. Use 'auto' for detection in nomad.)
-  timeline-url:
-    required: false
-    description: GitHub API issue timeline URL (required if fixed-version is set to 'auto')
-  project:
-    required: false
-    description: JIRA project (required for setting fixed-version)
-    default: NMD
 
 runs:
   using: composite
@@ -33,7 +20,3 @@ runs:
     env:
       ISSUE: ${{ inputs.issue }}
       TRANSITION: ${{ inputs.transition }}
-      RESOLUTION: ${{ inputs.resolution }}
-      FIXED_VERSION: ${{ inputs.fixed-version }}
-      TIMELINE_URL: ${{ inputs.timeline-url }}
-      PROJECT: ${{ inputs.project }}

.github/actions/jira/transition/jira-transition.bash

@@ -4,9 +4,7 @@
 
 source "$(dirname "${BASH_SOURCE[0]}")/../shared.bash"
 
-# Do all the checks up front so we just bail before
-# doing any actual work.
-
+# Check for required inputs
 if [ -z "${ISSUE}" ]; then
     error "Missing 'issue' input value"
     exit 1
@@ -17,21 +15,6 @@ if [ -z "${TRANSITION}" ]; then
     exit 1
 fi
 
-if [ -n "${FIXED_VERSION}" ] && [ -z "${RESOLUTION}" ]; then
-    error "The 'fixed-version' value can only be set if 'resolution' is set"
-    exit 1
-fi
-
-if [ -n "${FIXED_VERSION}" ] && [ -z "${PROJECT}" ]; then
-    error "Missing 'project' input value (must be set if 'fixed-version' is set)"
-    exit 1
-fi
-
-if [ "${FIXED_VERSION}" == "auto" ] && [ -z "${TIMELINE_URL}" ]; then
-    error "Missing 'timeline-url' input value (must be set if 'fixed-version' is 'auto')"
-    exit 1
-fi
-
 # Grab the transition ID
 result="$(jira-request "${JIRA_BASE_URL}/rest/api/3/issue/${ISSUE}/transitions")" || exit
 query="$(printf '.transitions[] | select(.name == "%s").id' "${TRANSITION}")"
@@ -42,100 +25,20 @@ if [ -z "${transition_id}" ]; then
     exit 1
 fi
 
-# Create the initial payload. This will be updated as needed prior
-# to sending the request.
-template='{transition: {id: $transition_id}}'
-payload="$(jq -n --arg transition_id "${transition_id}" "${template}")" || exit
+template='
+{
+  transition: {
+    id: $transition
+  }
+}
+'
+issue_transition="$(jq -n --arg transition "${transition_id}" "${template}")" || exit
 
 info "Transitioning JIRA issue '%s' to %s (ID: %s)" "${ISSUE}" \
     "${TRANSITION}" "${transition_id}"
+info "Transition payload:\n%s" "${issue_transition}"
 
-# If a resolution is set, find it
-if [ -n "${RESOLUTION}" ]; then
-    # Grab the resolution ID
-    result="$(jira-request "${JIRA_BASE_URL}/rest/api/3/resolution")" || exit
-    query="$(printf '.[] | select(.name == "%s").id' "${RESOLUTION}")"
-    resolution_id="$(jq -r "${query}" <<< "${result}")"
-
-    if [ -z "${resolution_id}" ]; then
-        error "Could not find matching resolution with name matching '%s'" "${RESOLUTION}"
-        exit 1
-    fi
-
-    # Render the data structure for the resolution
-    template='{fields: {resolution: {id: $resolution_id}}}'
-    rendered="$(jq -n --arg resolution_id "${resolution_id}" "${template}")" || exit
-
-    # Add it to the payload
-    payload="$(jq -s '.[0] * .[1]' <<< "${payload}${rendered}")"
-
-    info "Resolving JIRA issue '%s' to %s (ID: %s)" "${ISSUE}" "${RESOLUTION}" "${resolution_id}"
-fi
-
-# Handle setting fixed versions if set
-if [ -n "${FIXED_VERSION}" ]; then
-    fixed_versions=()
-    
-    # First pull the valid versions from jira
-    project="$(jira-request "${JIRA_BASE_URL}/rest/api/3/project/${PROJECT}")" || exit
-    jira_versions="$(jq -r '.versions' <<< "${project}")"
-
-    # If the fixed version value is auto, attempt to detect versions from pull linked pull request
-    if [ "${FIXED_VERSION}" == "auto" ]; then
-        timeline="$(curl -sL --show-error --fail-with-body -H "Accept: application/vnd.github+json" "${TIMELINE_URL}")" || exit
-        filter='.[] | select(.event == "cross-referenced") | .source.issue.labels.[] | select(.name | startswith("backport")).name'
-        readarray -t labels < <(jq -r "${filter}" <<< "${timeline}")
-
-        for label in "${labels[@]}"; do
-            # start with stripping off the start of the label (backport/ or backport/ent/)
-            version_prefix="${label##*/}"
-            # then strip off the end of the label
-            version_prefix="${version_prefix%.x*}"
-
-            filter="$(printf '.[] | select(.name | contains("%s")).name' "${version_prefix}")"
-            readarray -t valid_versions < <(jq -r "${filter}" <<< "${jira_versions}")
-            match="${version_prefix}.0"
-            for v in "${valid_versions[@]}"; do
-                if [ "${v##*.}" -gt "${match##*.}" ]; then
-                    match="${v}"
-                fi
-            done
-
-            filter="$(printf '.[] | select(.name | endswith("%s")).id' "${match}")"
-            version_id="$(jq -r "${filter}" <<< "${jira_versions}")"
-            if [ -z "${version_id}" ]; then
-                printf "WARNING: Failed to find valid JIRA version to match label: '%s'\n" "${label}"
-                continue
-            fi
-            fixed_versions+=("$(jq -n --arg version_id "${version_id}" '[{id: $version_id}]')")
-        done
-    else
-        # Match version directly
-        filter="$(printf '.[] | select(.name | endswith("%s")).id' "${FIXED_VERSION}")"
-        version_id="$(jq -r "${filter}" <<< "${jira_versions}")"
-        if [ -z "${version_id}" ]; then
-            printf "WARNING: Failed to find valid JIRA version to match provided version: '%s'\n" "${FIXED_VERSION}"
-        else
-            fixed_versions+=(jq -n --arg version_id "${version_id}" '[{id: $version_id}]')
-        fi
-    fi
-
-    # If fixed versions are availble, create the data structure
-    if [ "${#fixed_versions[@]}" -gt "0" ]; then
-        template='{fields: {fixVersions: $versions}}'
-        # Combine all the versions into a single array
-        versions="$(jq -s 'add' <<< "${fixed_versions[*]}")"
-        # Render the data structure for the fix versions
-        rendered="$(jq -n --argjson versions "${versions}" "${template}")" || exit
-
-        # Add it to the payload
-        payload="$(jq -s '.[0] * .[1]' <<< "${payload}${rendered}")"
-    fi
-fi
-
-info "Transition payload:\n%s" "${payload}"
-
-jira-request --request "POST" --data "${payload}" \
+jira-request --request "POST" --data "${issue_transition}" \
     "${JIRA_BASE_URL}/rest/api/3/issue/${ISSUE}/transitions" || exit
 
 info "JIRA issue '%s' transitioned to %s" "${ISSUE}" "${TRANSITION}"

.github/pull_request_template.md

@@ -21,10 +21,9 @@ merged.
 - [ ] **Testing** Please add tests to cover any new functionality or to demonstrate bug fixes and
   ensure regressions will be caught.
 - [ ] **Documentation** If the change impacts user-facing functionality such as the CLI, API, UI,
-  and job configuration, please update the Nomad product documentation, which is stored in the
-  [`web-unified-docs` repo](../web-unified-docs/). Refer to the [`web-unified-docs` contributor guide](../web-unified-docs/tree/docs/contribute.md) for docs guidelines.
-  Please also consider whether the change requires notes within the [upgrade
-  guide](https://developer.hashicorp.com/nomad/docs/upgrade/upgrade-specific). If you would like help with the docs, tag the `nomad-docs` team in this PR.
+  and job configuration, please update the  Nomad website documentation to reflect this. Refer to
+  the [website README](../website/README.md) for docs guidelines. Please also consider whether the
+  change requires notes within the [upgrade guide](../website/content/docs/upgrade/upgrade-specific.mdx).
 
 ### Reviewer Checklist
 - [ ] **Backport Labels** Please add the correct backport labels as described by the internal
@@ -33,7 +32,7 @@ merged.
   in the majority of situations. The main exceptions are long-lived feature branches or merges where
   history should be preserved.
 - [ ] **Enterprise PRs** If this is an enterprise only PR, please add any required changelog entry
-  within the public repository.
+  within the public repository. 
 
 
 <!-- heimdall_github_prtemplate:grc-pci_dss-2024-01-05 -->
@@ -43,3 +42,4 @@ merged.
 ## Changes to Security Controls
 
 Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.
+

.github/workflows/jira-sync.yml

@@ -58,10 +58,6 @@ jobs:
         with:
           issue: ${{ steps.search.outputs.issue }}
           transition: "Closed"
-          resolution: "Done"
-          fixed-version: "auto"
-          project: NMD
-          timeline-url: ${{ github.event.issue.timeline_url }}
       - name: Reopen ticket
         if: github.event.action == 'reopened' && steps.search.outputs.issue
         uses: ./.github/actions/jira/transition

.github/workflows/release.yml

@@ -124,9 +124,8 @@ jobs:
           echo "::group::Fetch all git repo"
           git fetch --unshallow
           echo "::endgroup::"
-          version="${{ github.event.inputs.version }}"
-          header="${version//+ent/ Enterprise}"
-          echo -e "## $header ($(date '+%B %d, %Y'))\n$(make changelog)\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+
+          echo -e "## ${{ github.event.inputs.version }} ($(date '+%B %d, %Y'))\n$(make changelog)\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
           git diff --color=always CHANGELOG.md
         env:
           LAST_RELEASE: ${{ github.event.inputs.changelog-last-release }}

.release/versions.hcl

@@ -6,14 +6,13 @@
 
 schema = 1
 active_versions {
-  version "1.11.x" {
-    ce_active = true
-    lts       = true
-  }
   version "1.10.x" {
     ce_active = true
     lts       = true
   }
+  version "1.9.x" {
+    ce_active = true # needed for docs
+  }
   version "1.8.x" {
     ce_active = true # needed for docs
     lts       = true