Skip to content

Commit

Permalink
backport of commit c6ce966
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Oct 6, 2023
1 parent 597d835 commit 2419d9a
Show file tree
Hide file tree
Showing 3,396 changed files with 24,221 additions and 30,423 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 0 additions & 3 deletions .changelog/17383.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18069.txt

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/18070.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18146.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18318.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18426.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18520.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18553.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18595.txt

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/18598.txt

This file was deleted.

10 changes: 1 addition & 9 deletions .copywrite.hcl
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

schema_version = 1

project {
header_ignore = [
"command/asset/*.hcl",
"command/agent/bindata_assetfs.go",
# licensed under MPL - ignoring for now until the copywrite tool can support
# multiple licenses per repo.
"api/**",
"drivers/shared/**",
"plugins/**",
// Enterprise files do not fall under the open source licensing. OSS-ENT
// merge conflicts might happen here, please be sure to put new OSS
// exceptions above this comment.
]
}
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

blank_issues_enabled: false
contact_links:
Expand Down
2 changes: 1 addition & 1 deletion .github/actionlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

self-hosted-runner:
# Labels of self-hosted runner in array of string
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-vault/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

name: install-vault
inputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-js/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

name: setup-js
description: install node and yarn, and run yarn install
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/vault-secrets/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

name: vault-secrets
description: 'pull secrets from CI Vault into environment vars'
Expand Down
2 changes: 1 addition & 1 deletion .github/secret-scanning.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

paths-ignore:
- "website/content/*"
6 changes: 3 additions & 3 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
backport:
if: github.event.pull_request.merged
runs-on: ubuntu-latest
container: hashicorpdev/backport-assistant:0.3.4
container: hashicorpdev/backport-assistant:0.2.3
steps:
- name: Backport changes to stable-website
run: |
backport-assistant backport -merge-method=squash
backport-assistant backport -merge-method=squash -automerge
env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>website)"
BACKPORT_TARGET_TEMPLATE: "stable-{{.target}}"
Expand All @@ -24,7 +24,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
- name: Backport changes to targeted release branch
run: |
backport-assistant backport -merge-method=squash
backport-assistant backport -merge-method=squash -automerge
env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ jobs:
version: ${{ needs.get-product-version.outputs.product-version }}
maintainer: "HashiCorp"
homepage: "https://github.com/hashicorp/nomad"
license: "BUSL-1.1"
license: "MPL-2.0"
binary: "pkg/${{ matrix.goos }}_${{ matrix.goarch }}/${{ env.PKG_NAME }}"
deb_depends: "openssl"
rpm_depends: "openssl"
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/copywrite.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ember-test-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with:
ref: ${{ github.event.pull_request.base.sha }}
- uses: nanasess/setup-chromedriver@69cc01d772a1595b8aee87d52f53e71b3904d9d0 # v2.1.2
- uses: nanasess/setup-chromedriver@6fb8f5ffa6b7dc11e631ff695fbd2fec0b04bb52 # v2.1.1
- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: nanasess/setup-chromedriver@69cc01d772a1595b8aee87d52f53e71b3904d9d0 # v2.1.2
- uses: nanasess/setup-chromedriver@6fb8f5ffa6b7dc11e631ff695fbd2fec0b04bb52 # v2.1.1
- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ jobs:
semgrep:
name: Semgrep Scan
runs-on: ubuntu-latest
container:
image: returntocorp/semgrep:1.36.0
env:
SEMGREP_SEND_METRICS: 0
# Skip any PR created by dependabot to avoid permission issues
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- run: semgrep ci --config=.semgrep/
- uses: returntocorp/semgrep-action@245bf11ddb2f3d4e35f116608cf6e27ae0f9aa04 # v1
permissions:
contents: read

2 changes: 1 addition & 1 deletion .github/workflows/test-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ jobs:
- uses: hashicorp/setup-golang@v1
- name: Get Go modules
run: |
make bootstrap
make tidy
make bootstrap
checks:
uses: ./.github/workflows/checks.yaml
needs: [mods]
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

run:
# Timeout for analysis.
Expand Down
2 changes: 1 addition & 1 deletion .release/ci.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

schema = "1"

Expand Down
2 changes: 1 addition & 1 deletion .release/linux/package/etc/nomad.d/nomad.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

# Full configuration options can be found at https://www.nomadproject.io/docs/configuration

Expand Down
2 changes: 1 addition & 1 deletion .release/release-metadata.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

url_license = "https://github.com/hashicorp/nomad/blob/main/LICENSE"
url_project_website = "https://www.nomadproject.io/"
Expand Down
2 changes: 1 addition & 1 deletion .release/security-scan.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

container {
secrets {
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/api_errorf.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: "fmt_errorf_unformatted_use"
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
# Check `release-note` in changelog entries.
Expand Down
8 changes: 3 additions & 5 deletions .semgrep/fsm_time.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: "no-time-in-fsm"
Expand Down Expand Up @@ -29,7 +29,5 @@ rules:
severity: "WARNING"
paths:
include:
- "nomad/fsm*"
- "nomad/state/state_store*"
exclude:
- "*_test.go"
- "nomad/fsm.*"
- "nomad/state/state_store.*"
2 changes: 1 addition & 1 deletion .semgrep/go_tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
# Check `require` or `assert` testify overrides.
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/http_endpoint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: "http-endpoint-request-decode-error-code"
Expand Down
2 changes: 0 additions & 2 deletions .semgrep/imports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ rules:
- pattern: '"github.com/hashicorp/consul"'
- pattern: '"github.com/hashicorp/consul/command/flags"'
- pattern: '"github.com/hashicorp/consul/sdk"'
- pattern: '"golang.org/x/exp/slices"'
- pattern: '"golang.org/x/exp/maps"'
message: "Import of this package has been disallowed"
languages:
- "generic"
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/loopclosure.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: loopclosure
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/protect_globals.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: "no-overriding-struct-globals"
Expand Down
3 changes: 1 addition & 2 deletions .semgrep/rpc_endpoint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
# Check potentially unauthenticated RPC endpoints. Technically more
Expand Down Expand Up @@ -108,7 +108,6 @@ rules:
- pattern-not: '"Status.Leader"'
- pattern-not: '"Status.Peers"'
- pattern-not: '"Status.Version"'
- pattern-not: '"Keyring.ListPublic"'
message: "RPC method $METHOD appears to be unauthenticated"
languages:
- "go"
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/rpc_metrics.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
# Check for server RPC endpoints without metrics
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/time_after.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: "time-after-leak"
Expand Down
2 changes: 1 addition & 1 deletion .semgrep/ui.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1
# SPDX-License-Identifier: MPL-2.0

rules:
- id: ui-no-string-extensions
Expand Down
Loading

0 comments on commit 2419d9a

Please sign in to comment.