backport of commit 59f14f5

hashicorp · Oct 20, 2022 · 03e59c0 · 03e59c0
1 parent 0521420
commit 03e59c0
Show file tree

Hide file tree

Showing 1,720 changed files with 22,238 additions and 48,414 deletions.
diff --git a/.changelog/11500.txt b/.changelog/11500.txt
@@ -1,4 +1,4 @@
-```release-note:bug
+```release-note:bugfix
 rpc: Adds a deadline to client RPC calls, so that streams will no longer hang
 indefinitely in unstable network conditions. [[GH-8504](https://github.com/hashicorp/consul/issues/8504)]
-```
+```
diff --git a/.changelog/11742.txt b/.changelog/11742.txt
diff --git a/.changelog/11791.txt b/.changelog/11791.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 ui: Change partitions to expect [] from the listing API
 ```
diff --git a/.changelog/11804.txt b/.changelog/11804.txt
@@ -1,4 +1,4 @@
-```release-note:bug
+```release-note:bugfix
 ui: Don't offer to save an intention with a source/destinatiojn wildcard
 partition
 ```
diff --git a/.changelog/11850.txt b/.changelog/11850.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 ui: Fixes an issue with the version footer wandering when scrolling
 ```
diff --git a/.changelog/12279.txt b/.changelog/12279.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 ui: Ensure proxy instance health is taken into account in Service Instance Listings
 ```
diff --git a/.changelog/12890.txt b/.changelog/12890.txt
diff --git a/.changelog/12905.txt b/.changelog/12905.txt
diff --git a/.changelog/13388.txt b/.changelog/13388.txt
diff --git a/.changelog/13493.txt b/.changelog/13493.txt
diff --git a/.changelog/14162.txt b/.changelog/14162.txt
diff --git a/.changelog/14178.txt b/.changelog/14178.txt
diff --git a/.changelog/14233.txt b/.changelog/14233.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 rpc: Adds max jitter to client deadlines to prevent i/o deadline errors on blocking queries
 ```
diff --git a/.changelog/14269.txt b/.changelog/14269.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 connect: Fix issue where `auto_config` and `auto_encrypt` could unintentionally enable TLS for gRPC xDS connections.
-```
+```
diff --git a/.changelog/14290.txt b/.changelog/14290.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 envoy: validate name before deleting proxy default configurations. 
-```
+```
diff --git a/.changelog/14294.txt b/.changelog/14294.txt
diff --git a/.changelog/14343.txt b/.changelog/14343.txt
diff --git a/.changelog/14356.txt b/.changelog/14356.txt
diff --git a/.changelog/14364.txt b/.changelog/14364.txt
@@ -1,3 +1,3 @@
-```release-note:bug
+```release-note:bugfix
 peering: Fix issue preventing deletion and recreation of peerings in TERMINATED state.
-```
+```
diff --git a/.changelog/14373.txt b/.changelog/14373.txt
diff --git a/.changelog/14396.txt b/.changelog/14396.txt
diff --git a/.changelog/14397.txt b/.changelog/14397.txt
diff --git a/.changelog/14433.txt b/.changelog/14433.txt
diff --git a/.changelog/14445.txt b/.changelog/14445.txt
diff --git a/.changelog/14474.txt b/.changelog/14474.txt
diff --git a/.changelog/14475.txt b/.changelog/14475.txt
diff --git a/.changelog/14495.txt b/.changelog/14495.txt
diff --git a/.changelog/14527.txt b/.changelog/14527.txt
diff --git a/.changelog/14556.txt b/.changelog/14556.txt
diff --git a/.changelog/14599.txt b/.changelog/14599.txt
diff --git a/.changelog/14604.txt b/.changelog/14604.txt
diff --git a/.changelog/14616.txt b/.changelog/14616.txt
diff --git a/.changelog/14619.txt b/.changelog/14619.txt
diff --git a/.changelog/14668.txt b/.changelog/14668.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+tls: undo breaking change that prevented setting TLS for gRPC when using config flags available in Consul v1.11.
+```
diff --git a/.changelog/14679.txt b/.changelog/14679.txt
diff --git a/.changelog/14723.txt b/.changelog/14723.txt
diff --git a/.changelog/14724.txt b/.changelog/14724.txt
diff --git a/.changelog/14747.txt b/.changelog/14747.txt
diff --git a/.changelog/14796.txt b/.changelog/14796.txt
diff --git a/.changelog/14797.txt b/.changelog/14797.txt
diff --git a/.changelog/14811.txt b/.changelog/14811.txt
diff --git a/.changelog/14817.txt b/.changelog/14817.txt
diff --git a/.changelog/14831.txt → .changelog/14828.txt b/.changelog/14831.txt → .changelog/14828.txt
diff --git a/.changelog/14854.txt b/.changelog/14854.txt
diff --git a/.changelog/14869.txt b/.changelog/14869.txt
diff --git a/.changelog/14873.txt b/.changelog/14873.txt
diff --git a/.changelog/14889.txt b/.changelog/14889.txt
diff --git a/.changelog/14897.txt b/.changelog/14897.txt
diff --git a/.changelog/14903.txt b/.changelog/14903.txt
diff --git a/.changelog/14916.txt b/.changelog/14916.txt
diff --git a/.changelog/14921.txt b/.changelog/14921.txt
diff --git a/.changelog/14922.txt b/.changelog/14922.txt
diff --git a/.changelog/14924.txt b/.changelog/14924.txt
diff --git a/.changelog/14930.txt b/.changelog/14930.txt
diff --git a/.changelog/14933.txt b/.changelog/14933.txt
diff --git a/.changelog/14934.txt b/.changelog/14934.txt
diff --git a/.changelog/14936.txt b/.changelog/14936.txt
diff --git a/.changelog/14947.txt b/.changelog/14947.txt
diff --git a/.changelog/14957.txt b/.changelog/14957.txt
diff --git a/.changelog/14960.txt b/.changelog/14960.txt
diff --git a/.changelog/14962.txt b/.changelog/14962.txt
diff --git a/.changelog/14970.txt b/.changelog/14970.txt
diff --git a/.changelog/14971.txt b/.changelog/14971.txt
diff --git a/.changelog/14981.txt b/.changelog/14981.txt
diff --git a/.changelog/14986.txt b/.changelog/14986.txt
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -263,26 +263,6 @@ jobs:
           name: "Protobuf Lint"
           command: make proto-lint
 
-  check-generated-deep-copy:
-    docker:
-      - image: *GOLANG_IMAGE
-    environment:
-      <<: *ENVIRONMENT
-      # tput complains if this isn't set to something.
-      TERM: ansi
-    steps:
-      - checkout
-      - run:
-          name: Install deep-copy
-          command: make codegen-tools
-      - run:
-          command: make --always-make deep-copy
-      - run: |
-          if ! git diff --exit-code; then
-            echo "Generated code was not updated correctly"
-            exit 1
-          fi
-
   go-test-arm64:
     machine:
       image: *UBUNTU_CI_IMAGE
@@ -836,7 +816,7 @@ jobs:
       # Get go binary from workspace
       - attach_workspace:
           at: .
-      # Build the consul:local image from the already built binary
+      # Build the consul-dev image from the already built binary
       - run:
           command: |
             sudo rm -rf /usr/local/go
@@ -907,8 +887,8 @@ jobs:
       - attach_workspace:
           at: .
       - run: *install-gotestsum
-      # Build the consul:local image from the already built binary
-      - run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile .
+      # Build the consul-dev image from the already built binary
+      - run: docker build -t consul-dev -f ./build-support/docker/Consul-Dev.dockerfile .
       - run:
           name: Envoy Integration Tests
           command: |
@@ -922,7 +902,6 @@ jobs:
             GOTESTSUM_JUNITFILE: /tmp/test-results/results.xml
             GOTESTSUM_FORMAT: standard-verbose
             COMPOSE_INTERACTIVE_NO_CLI: 1
-            LAMBDA_TESTS_ENABLED: "true"
             # tput complains if this isn't set to something.
             TERM: ansi
       - store_artifacts:
@@ -1056,7 +1035,6 @@ workflows:
                 - /^docs\/.*/
                 - /^ui\/.*/
       - check-generated-protobuf: *filter-ignore-non-go-branches
-      - check-generated-deep-copy: *filter-ignore-non-go-branches
       - lint-enums: *filter-ignore-non-go-branches
       - lint-consul-retry: *filter-ignore-non-go-branches
       - lint: *filter-ignore-non-go-branches

diff --git a/.github/scripts/metrics_checker.sh b/.github/scripts/metrics_checker.sh
@@ -6,7 +6,7 @@ set -uo pipefail
 ### It is still up to the reviewer to make sure that any tests added are needed and meaningful.
 
 # search for any "new" or modified metric emissions
-metrics_modified=$(git --no-pager diff origin/main...HEAD | grep -i "SetGauge\|EmitKey\|IncrCounter\|AddSample\|MeasureSince\|UpdateFilter" | grep "^[+-]")
+metrics_modified=$(git --no-pager diff origin/main...HEAD | grep -i "SetGauge\|EmitKey\|IncrCounter\|AddSample\|MeasureSince\|UpdateFilter")
 # search for PR body or title metric references
 metrics_in_pr_body=$(echo "${PR_BODY-""}" | grep -i "metric")
 metrics_in_pr_title=$(echo "${PR_TITLE-""}" | grep -i "metric")
@@ -15,7 +15,7 @@ metrics_in_pr_title=$(echo "${PR_TITLE-""}" | grep -i "metric")
 if [ "$metrics_modified" ] || [ "$metrics_in_pr_body" ] || [ "$metrics_in_pr_title" ]; then
   # need to check if there are modifications to metrics_test
   test_files_regex="*_test.go"
-  modified_metrics_test_files=$(git --no-pager diff HEAD "$(git merge-base HEAD "origin/main")" -- "$test_files_regex" | grep -i "metric" | grep "^[+-]")
+  modified_metrics_test_files=$(git --no-pager diff HEAD "$(git merge-base HEAD "origin/main")" -- "$test_files_regex" | grep -i "metric")
   if [ "$modified_metrics_test_files" ]; then
     # 1 happy path: metrics_test has been modified bc we modified metrics behavior
     echo "PR seems to modify metrics behavior. It seems it may have added tests to the metrics as well."