backport of commit ac94f40

hashicorp · Feb 14, 2023 · 75a14e7 · 75a14e7
1 parent fd011ce
commit 75a14e7
Show file tree

Hide file tree

Showing 1,061 changed files with 9,343 additions and 41,726 deletions.
diff --git a/.changelog/11170.txt b/.changelog/11170.txt
diff --git a/.changelog/12582.txt b/.changelog/12582.txt
diff --git a/.changelog/13976.txt b/.changelog/13976.txt
diff --git a/.changelog/14492.txt b/.changelog/14492.txt
diff --git a/.changelog/14775.txt b/.changelog/14775.txt
diff --git a/.changelog/14897.txt b/.changelog/14897.txt
diff --git a/.changelog/14898.txt b/.changelog/14898.txt
diff --git a/.changelog/15073.txt b/.changelog/15073.txt
diff --git a/.changelog/15091.txt b/.changelog/15091.txt
diff --git a/.changelog/15328.txt b/.changelog/15328.txt
diff --git a/.changelog/15435.txt b/.changelog/15435.txt
diff --git a/.changelog/15469.txt b/.changelog/15469.txt
diff --git a/.changelog/15522.txt b/.changelog/15522.txt
diff --git a/.changelog/15552.txt b/.changelog/15552.txt
diff --git a/.changelog/15726.txt b/.changelog/15726.txt
diff --git a/.changelog/15745.txt b/.changelog/15745.txt
diff --git a/.changelog/15746.txt b/.changelog/15746.txt
diff --git a/.changelog/15755.txt b/.changelog/15755.txt
diff --git a/.changelog/15761.txt b/.changelog/15761.txt
diff --git a/.changelog/15769.txt b/.changelog/15769.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+build: Update to go1.19.5
+```
diff --git a/.changelog/15780.txt b/.changelog/15780.txt
diff --git a/.changelog/15816.txt b/.changelog/15816.txt
diff --git a/.changelog/15819.txt b/.changelog/15819.txt
diff --git a/.changelog/15835.txt b/.changelog/15835.txt
diff --git a/.changelog/15842.txt b/.changelog/15842.txt
diff --git a/.changelog/15844.txt b/.changelog/15844.txt
diff --git a/.changelog/15848.txt b/.changelog/15848.txt
diff --git a/.changelog/15852.txt b/.changelog/15852.txt
diff --git a/.changelog/15862.txt b/.changelog/15862.txt
diff --git a/.changelog/15864.txt b/.changelog/15864.txt
diff --git a/.changelog/15870.txt b/.changelog/15870.txt
diff --git a/.changelog/15876.txt b/.changelog/15876.txt
diff --git a/.changelog/15933.txt b/.changelog/15933.txt
diff --git a/.changelog/15961.txt b/.changelog/15961.txt
diff --git a/.changelog/15983.txt b/.changelog/15983.txt
diff --git a/.changelog/15997.txt b/.changelog/15997.txt
diff --git a/.changelog/16006.txt b/.changelog/16006.txt
diff --git a/.changelog/16055.txt b/.changelog/16055.txt
diff --git a/.changelog/16068.txt b/.changelog/16068.txt
diff --git a/.changelog/16074.txt b/.changelog/16074.txt
diff --git a/.changelog/16085.txt b/.changelog/16085.txt
diff --git a/.changelog/16100.txt b/.changelog/16100.txt
diff --git a/.changelog/16111.txt b/.changelog/16111.txt
diff --git a/.changelog/16151.txt → .changelog/16126.txt b/.changelog/16151.txt → .changelog/16126.txt
@@ -1,3 +1,3 @@
-```release-note:improvement
+```release-note:security
 artifact: Provide mitigations against unbounded artifact decompression
 ```
diff --git a/.changelog/16138.txt b/.changelog/16138.txt
diff --git a/.changelog/7794.txt b/.changelog/7794.txt
diff --git a/.changelog/9053.txt b/.changelog/9053.txt
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -75,7 +75,7 @@ commands:
           command: |
             set -x
 
-            echo installing golang 1.20
+            echo installing golang ${GOLANG_VERSION}
 
             case "${OSTYPE}" in
               linux*)  os="linux" ;;
@@ -88,13 +88,13 @@ commands:
             then
               sudo rm -rf << parameters.target_directory >>/go
               sudo mkdir -p << parameters.target_directory >>
-              curl -SL --fail -o /tmp/golang.tar.gz https://dl.google.com/go/go1.20.${os}-amd64.tar.gz
+              curl -SL --fail -o /tmp/golang.tar.gz https://dl.google.com/go/go${GOLANG_VERSION}.${os}-amd64.tar.gz
               sudo tar -C << parameters.target_directory >> -xzf /tmp/golang.tar.gz
               rm -rf /tmp/golang.tar.gz
             else
               rm -rf << parameters.target_directory >>/go
               mkdir -p <<parameters.target_directory >>
-              curl -SL --fail -o /tmp/go.zip https://dl.google.com/go/go1.20.windows-amd64.zip
+              curl -SL --fail -o /tmp/go.zip https://dl.google.com/go/go${GOLANG_VERSION}.windows-amd64.zip
               unzip -q -o /tmp/go.zip -d << parameters.target_directory >>
               rm -rf /tmp/go.zip
             fi
@@ -339,6 +339,17 @@ jobs:
           path: /tmp/test-reports
       - store_artifacts:
           path: /tmp/test-reports
+  lint-go:
+    executor: go
+    steps:
+      - checkout
+      - run: apt-get update; apt-get install -y shellcheck sudo unzip
+      - install-buf
+      - install-circleci-local-cli
+      - run: make deps lint-deps
+      - run: make check
+      - run: make checkscripts
+      - run: mkdir -p ui/dist && make generate-all static-assets
   build-darwin-binaries:
     executor: go-macos
     steps:
@@ -499,15 +510,19 @@ workflows:
               ignore:
                 - stable-website
 
-      - test-e2e:
-          filters:
+      - lint-go:
+          # check branches are almost all the backend branches
+          filters: &backend_check_branches_filter
             branches:
               ignore:
                 - /^.-ui\b.*/
                 - /^docs-.*/
                 - /^backport/docs-.*/
                 - stable-website
 
+      - test-e2e:
+          filters: *backend_check_branches_filter
+
       - test-ui:
           filters:
             branches:

diff --git a/.github/workflows/check-legacy-links-format.yml b/.github/workflows/check-legacy-links-format.yml
diff --git a/.github/workflows/ember-test-audit.yml b/.github/workflows/ember-test-audit.yml
@@ -2,7 +2,6 @@ name: Ember test audit comparison
 on:
   pull_request:
     paths:
-    - '.github/workflows/ember*'
     - 'ui/**'
 
 defaults:
@@ -25,7 +24,7 @@ jobs:
           node-version: '14'
       - run: yarn --frozen-lockfile
       - run: mkdir -p /tmp/test-reports
-      - run: npx ember-test-audit 1 --json --output ../base-audit.json
+      - run: npx ember-test-audit 3 --json --output ../base-audit.json
       - name: Upload result
         uses: actions/upload-artifact@v2
         with:
@@ -42,7 +41,7 @@ jobs:
           node-version: '14'
       - run: yarn --frozen-lockfile
       - run: mkdir -p /tmp/test-reports
-      - run: npx ember-test-audit 1 --json --output ../pr-audit.json
+      - run: npx ember-test-audit 3 --json --output ../pr-audit.json
       - name: Upload result
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml
@@ -20,7 +20,7 @@ on:
   push:
     branches:
       - main
-      - release/**
+      - release-**
     paths-ignore:
       - 'README.md'
       - 'CHANGELOG.md'
@@ -41,8 +41,8 @@ on:
 env:
   VERBOSE: 1
   GOTESTARCH: amd64
-  CONSUL_VERSION: 1.14.4
-  VAULT_VERSION: 1.12.2
+  CONSUL_VERSION: 1.12.6
+  VAULT_VERSION: 1.12.0
   NOMAD_SLOW_TEST: 0
   NOMAD_TEST_LOG_LEVEL: OFF
 jobs:
@@ -88,7 +88,7 @@ jobs:
   tests-api:
     needs: [mods]
     runs-on: [custom, xl, 22.04]
-    timeout-minutes: 8
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
       - uses: hashicorp/setup-golang@v1

diff --git a/.github/workflows/test-link-rewrites.yml b/.github/workflows/test-link-rewrites.yml
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@
 .DS_Store
 Thumbs.db
 .idea
-.fleet
 
 # Folders
 _obj
@@ -62,7 +61,6 @@ go.work.sum
 
 # init outputs
 example.nomad
-example.nomad.hcl
 spec.hcl
 volume.hcl
 nomad_linux_amd64