backport of commit 16e020b

.changelog/16651.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
+```

.changelog/16818.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cache: revert cache refactor which could cause blocking queries to never return
+```

.circleci/bash_env.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 export GIT_COMMIT=$(git rev-parse --short HEAD)
 export GIT_COMMIT_YEAR=$(git show -s --format=%cd --date=format:%Y HEAD)

.circleci/config.yml

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 ---
 version: 2.1
 
@@ -35,14 +32,11 @@ references:
     - "1.11.6"
     - "1.10.9"
     - "1.9.10"
-  consul-versions: &consul_versions
-    - "1.14"
-    - "1.15"
   images:
     # When updating the Go version, remember to also update the versions in the
     # workflows section for go-test-lib jobs.
     go: &GOLANG_IMAGE docker.mirror.hashicorp.services/cimg/go:1.20.1
-    ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:16-browsers
+    ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:14-browsers
     ubuntu: &UBUNTU_CI_IMAGE ubuntu-2004:202201-02
   cache:
     yarn: &YARN_CACHE_KEY consul-ui-v9-{{ checksum "ui/yarn.lock" }}
@@ -612,7 +606,7 @@ jobs:
               -p=4 \
               -timeout=30m \
               -json \
-              `go list ./... | grep -v upgrade` \
+              ./... \
               --target-image consul \
               --target-version local \
               --latest-image consul \
@@ -631,84 +625,6 @@ jobs:
           path: *TEST_RESULTS_DIR
       - run: *notify-slack-failure
 
-  upgrade-integration-test:
-      machine:
-        image: *UBUNTU_CI_IMAGE
-        docker_layer_caching: true
-      parallelism: 3
-      resource_class: large
-      parameters:
-        consul-version:
-          type: enum
-          enum: *consul_versions
-      environment:
-        CONSUL_VERSION: << parameters.consul-version >>
-      steps:
-        - checkout
-        # Get go binary from workspace
-        - attach_workspace:
-            at: .
-        # Build the consul:local image from the already built binary
-        - run:
-            command: |
-              sudo rm -rf /usr/local/go
-              wget https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz
-              sudo tar -C /usr/local -xzvf go${GO_VERSION}.linux-amd64.tar.gz
-            environment:
-              <<: *ENVIRONMENT
-        - run: *install-gotestsum
-        - run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile .
-        - run:
-            name: Upgrade Integration Tests
-            command: |
-              mkdir -p /tmp/test-results/
-              cd ./test/integration/consul-container
-              docker run --rm consul:local consul version
-              gotestsum \
-                --raw-command \
-                --format=short-verbose \
-                --debug \
-                --rerun-fails=3 \
-                --packages="./..." \
-                -- \
-                go test \
-                -p=4 \
-                -tags "${GOTAGS}" \
-                -timeout=30m \
-                -json \
-                ./.../upgrade/ \
-                --target-image consul \
-                --target-version local \
-                --latest-image consul \
-                --latest-version $CONSUL_VERSION
-              ls -lrt
-            environment:
-              # this is needed because of incompatibility between RYUK container and circleci
-              GOTESTSUM_JUNITFILE: /tmp/test-results/results.xml
-              GOTESTSUM_FORMAT: standard-verbose
-              COMPOSE_INTERACTIVE_NO_CLI: 1
-              # tput complains if this isn't set to something.
-              TERM: ansi
-        - store_test_results:
-            path: *TEST_RESULTS_DIR
-        - store_artifacts:
-            path: *TEST_RESULTS_DIR
-        - run: *notify-slack-failure
-
-  # Lints all *.dockerfile but don't fail at this time
-  dockerfile-lint:
-    docker:
-      - image: docker.mirror.hashicorp.services/hadolint/hadolint:latest-debian
-    steps:
-      - run: apt-get -qq update; apt-get -y install git # the hadolint container doesn't have git
-      - checkout
-      - run:
-          name: Dockefile lint
-          command: |
-            for file in $(find . -type f -name *.dockerfile); do
-              hadolint $file || true
-            done
-
   envoy-integration-test: &ENVOY_TESTS
     machine:
       image: *UBUNTU_CI_IMAGE
@@ -880,13 +796,6 @@ workflows:
       - compatibility-integration-test:
           requires:
             - dev-build
-      - upgrade-integration-test:
-          requires:
-            - dev-build
-          matrix:
-            parameters:
-              consul-version: *consul_versions
-
       - noop
   frontend:
     jobs:

.circleci/scripts/rerun-fails-report.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 #
 # Add a comment on the github PR if there were any rerun tests.
 #

.circleci/terraform/load-test/main.tf

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 terraform {
   backend "s3" {
   }

.circleci/terraform/load-test/variables.tf

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 variable "vpc_name" {
   description = "Name of the VPC"
 }

.github/CONTRIBUTING.md

@@ -162,7 +162,8 @@ When you're ready to submit a pull request:
    | --- | --- |
    | `pr/no-changelog` | This PR does not have an intended changelog entry |
    | `pr/no-metrics-test` | This PR does not require any testing for metrics |
-   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. Website documentation merged to the latest release branch is deployed immediately |
+   | `backport/stable-website` | This PR contains documentation changes that are ready to be deployed immediately. Changes will also automatically get backported to the latest release branch |
+   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. |
    Other labels may automatically be added by the Github Action CI.
 7. After you submit, the Consul maintainers team needs time to carefully review your
    contribution and ensure it is production-ready, considering factors such as: security,

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,41 +4,27 @@ about: You're experiencing an issue with Consul that is different than the docum
 
 ---
 
-<!-- When filing a bug, please include the following headings if possible. Any example text in this template can be deleted.
--->
+When filing a bug, please include the following headings if possible. Any example text in this template can be deleted.
 
 #### Overview of the Issue
 
-<!-- Please provide a paragraph or two about the issue you're experiencing. -->
-
----
+A paragraph or two about the issue you're experiencing.
 
 #### Reproduction Steps
 
-<!-- Please provide steps to reproduce the bug, without any details it would be hard to troubleshoot: 
-
 Steps to reproduce this issue, eg:
 
 1. Create a cluster with n client nodes n and n server nodes
 1. Run `curl ...`
 1. View error
 
--->
-
 ### Consul info for both Client and Server
 
-
-<!---  Please provide both `consul info` and agent HCL config for both client and servers to help us better diagnose the issue. Take careful steps to remove any sensitive information from config files that include secrets such as Gossip keys. --->
-
 <details>
   <summary>Client info</summary>
 
 ```
-Output from client 'consul info' command here
-```
-
-```
-Client agent HCL config
+output from client 'consul info' command here
 ```
 
 </details>
@@ -47,19 +33,15 @@ Client agent HCL config
   <summary>Server info</summary>
 
 ```
-Output from server 'consul info' command here
-```
-
-```
-Server agent HCL config
+output from server 'consul info' command here
 ```
 
 </details>
 
 ### Operating system and Environment details
 
-<!--  OS, Architecture, and any other information you can provide about the environment. -->
+OS, Architecture, and any other information you can provide about the environment.
 
 ### Log Fragments
 
-<!-- Include appropriate Client or Server log fragments. If the log is longer than a few dozen lines, please include the URL to the [gist](https://gist.github.com/) of the log instead of posting it in the issue. Use `-log-level=TRACE` on the client and server to capture the maximum log detail. -->
+Include appropriate Client or Server log fragments. If the log is longer than a few dozen lines, please include the URL to the [gist](https://gist.github.com/) of the log instead of posting it in the issue. Use `-log-level=TRACE` on the client and server to capture the maximum log detail.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 blank_issues_enabled: false
 contact_links:
   - name: Consul Community Support

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,12 +4,12 @@ about: If you have something you think Consul could improve or add support for.
 
 ---
 
-<!--- Please search the existing issues for relevant feature requests, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing requests. --->
+Please search the existing issues for relevant feature requests, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing requests.
 
 #### Feature Description
 
-<!--- Please provide a written overview of the feature and why this feature solves challenges that you are facing today. --->
+A written overview of the feature.
 
 #### Use Case(s)
 
-<!--- Please describe the use case for this feature (i.e. Service Mesh, Service Discovery, KV, API Gateway) and also deployment environments you are looking to see this addressed in (K8s, VMs, Nomad, ECS, Lambda). -->
+Any relevant use-cases that you see.