diff --git a/.github/secret-scanning.yml b/.github/secret-scanning.yml index 6a9449c63..37283b7ee 100644 --- a/.github/secret-scanning.yml +++ b/.github/secret-scanning.yml @@ -1,2 +1,5 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + paths-ignore: - "website/content/*" diff --git a/api/error_unexpected_response.go b/api/error_unexpected_response.go index 4dc4bc7fb..b843fc7ab 100644 --- a/api/error_unexpected_response.go +++ b/api/error_unexpected_response.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package api import ( diff --git a/api/error_unexpected_response_test.go b/api/error_unexpected_response_test.go index 8c1d53687..eb2297b4b 100644 --- a/api/error_unexpected_response_test.go +++ b/api/error_unexpected_response_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package api_test import ( diff --git a/client/config/drain.go b/client/config/drain.go index 539f5f2dc..0d134ad08 100644 --- a/client/config/drain.go +++ b/client/config/drain.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package config import ( diff --git a/client/drain.go b/client/drain.go index 22bc80ceb..c23d74caa 100644 --- a/client/drain.go +++ b/client/drain.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package client import ( diff --git a/client/drain_test.go b/client/drain_test.go index 2fc81685f..de7637937 100644 --- a/client/drain_test.go +++ b/client/drain_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package client import ( diff --git a/command/agent/bindata_assetfs.go b/command/agent/bindata_assetfs.go index ac0275d34..b5d550f29 100644 --- a/command/agent/bindata_assetfs.go +++ b/command/agent/bindata_assetfs.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + // Code generated by go-bindata. // sources: // ui/dist/assets/chunk.143.8d29410835f3df0eac0c.js diff --git a/command/ui/writer_ui_test.go b/command/ui/writer_ui_test.go index fc4936129..26fbed6ee 100644 --- a/command/ui/writer_ui_test.go +++ b/command/ui/writer_ui_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package ui import ( diff --git a/demo/csi/nfs/agent.hcl b/demo/csi/nfs/agent.hcl index 890f2fa4c..2245bdc04 100644 --- a/demo/csi/nfs/agent.hcl +++ b/demo/csi/nfs/agent.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + data_dir = "/tmp/nomad/data" server { diff --git a/demo/csi/nfs/jobs/controller-plugin.nomad.hcl b/demo/csi/nfs/jobs/controller-plugin.nomad.hcl index cc1f21ecc..1bc404211 100644 --- a/demo/csi/nfs/jobs/controller-plugin.nomad.hcl +++ b/demo/csi/nfs/jobs/controller-plugin.nomad.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # Controller plugins create and manage CSI volumes. # This one just creates folders within the NFS mount. job "controller" { diff --git a/demo/csi/nfs/jobs/nfs.nomad.hcl b/demo/csi/nfs/jobs/nfs.nomad.hcl index d9c8d5eb6..212652587 100644 --- a/demo/csi/nfs/jobs/nfs.nomad.hcl +++ b/demo/csi/nfs/jobs/nfs.nomad.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # A test NFS server that serves a host volume for persistent state. job "nfs" { group "nfs" { diff --git a/demo/csi/nfs/jobs/node-plugin.nomad.hcl b/demo/csi/nfs/jobs/node-plugin.nomad.hcl index f7b9d7953..8cffeb8aa 100644 --- a/demo/csi/nfs/jobs/node-plugin.nomad.hcl +++ b/demo/csi/nfs/jobs/node-plugin.nomad.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # Node plugins mount the volume on the host to present to other tasks. job "node" { # node plugins should run anywhere your task might be placed, i.e. ~everywhere diff --git a/demo/csi/nfs/jobs/web.nomad.hcl b/demo/csi/nfs/jobs/web.nomad.hcl index fe0cca2dc..163815ba8 100644 --- a/demo/csi/nfs/jobs/web.nomad.hcl +++ b/demo/csi/nfs/jobs/web.nomad.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # Serve the contents of our CSI volume with a little web server. job "web" { group "web" { diff --git a/demo/csi/nfs/setup.sh b/demo/csi/nfs/setup.sh index 5feba5c51..c7373cb46 100755 --- a/demo/csi/nfs/setup.sh +++ b/demo/csi/nfs/setup.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # Set up all the demo components. # This can be run repeatedly as it is fairly idempotent. diff --git a/demo/csi/nfs/teardown.sh b/demo/csi/nfs/teardown.sh index b5b0b58ec..d380cbe20 100755 --- a/demo/csi/nfs/teardown.sh +++ b/demo/csi/nfs/teardown.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # Clean up all demo components. diff --git a/demo/csi/nfs/volume.hcl b/demo/csi/nfs/volume.hcl index 3bfc00183..5458af5d9 100644 --- a/demo/csi/nfs/volume.hcl +++ b/demo/csi/nfs/volume.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + id = "csi-nfs" name = "csi-nfs" type = "csi" diff --git a/e2e/consul/consul_test.go b/e2e/consul/consul_test.go index 6be7dc286..5ae22b609 100644 --- a/e2e/consul/consul_test.go +++ b/e2e/consul/consul_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package consul import ( diff --git a/e2e/consul/input/alloc_restart.hcl b/e2e/consul/input/alloc_restart.hcl index d2937ab0e..0c87493e7 100644 --- a/e2e/consul/input/alloc_restart.hcl +++ b/e2e/consul/input/alloc_restart.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + job "alloc-restart" { constraint { attribute = "${attr.kernel.name}" diff --git a/e2e/jobsubmissions/doc.go b/e2e/jobsubmissions/doc.go index 90f890c51..07d82d0a0 100644 --- a/e2e/jobsubmissions/doc.go +++ b/e2e/jobsubmissions/doc.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + // Package jobsubmissions contains e2e tests related to the /v1/job//submission // HTTP API endpoint and related components. package jobsubmissions diff --git a/e2e/jobsubmissions/input/huge.hcl b/e2e/jobsubmissions/input/huge.hcl index d84703bec..7b2124a09 100644 --- a/e2e/jobsubmissions/input/huge.hcl +++ b/e2e/jobsubmissions/input/huge.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + job "huge" { type = "batch" diff --git a/e2e/jobsubmissions/input/x.hcl b/e2e/jobsubmissions/input/x.hcl index 19d3aac02..5ffbae39b 100644 --- a/e2e/jobsubmissions/input/x.hcl +++ b/e2e/jobsubmissions/input/x.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + # This is an HCL comment X = "my var file x value" diff --git a/e2e/jobsubmissions/input/xyz.hcl b/e2e/jobsubmissions/input/xyz.hcl index f1da56e74..571a144da 100644 --- a/e2e/jobsubmissions/input/xyz.hcl +++ b/e2e/jobsubmissions/input/xyz.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + variable "X" { type = string } diff --git a/e2e/jobsubmissions/input/y.hcl b/e2e/jobsubmissions/input/y.hcl index 1cd5590f5..1de2f03a5 100644 --- a/e2e/jobsubmissions/input/y.hcl +++ b/e2e/jobsubmissions/input/y.hcl @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + Y = 700 diff --git a/e2e/jobsubmissions/input/z.hcl b/e2e/jobsubmissions/input/z.hcl index e81e2d4b7..56de364a7 100644 --- a/e2e/jobsubmissions/input/z.hcl +++ b/e2e/jobsubmissions/input/z.hcl @@ -1,2 +1,5 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + Z = true diff --git a/e2e/jobsubmissions/jobsubapi_test.go b/e2e/jobsubmissions/jobsubapi_test.go index fd8c59007..773b19610 100644 --- a/e2e/jobsubmissions/jobsubapi_test.go +++ b/e2e/jobsubmissions/jobsubapi_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package jobsubmissions import ( diff --git a/nomad/structs/config/drain.go b/nomad/structs/config/drain.go index 0df9812ce..02b596cfe 100644 --- a/nomad/structs/config/drain.go +++ b/nomad/structs/config/drain.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package config import "github.com/hashicorp/nomad/helper/pointer" diff --git a/ui/app/components/conditional-link-to.hbs b/ui/app/components/conditional-link-to.hbs index 00766532d..0633f66dd 100644 --- a/ui/app/components/conditional-link-to.hbs +++ b/ui/app/components/conditional-link-to.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} + {{#if @condition}} {{yield}} diff --git a/ui/app/components/conditional-link-to.js b/ui/app/components/conditional-link-to.js index 7dd1d3b31..442e85c65 100644 --- a/ui/app/components/conditional-link-to.js +++ b/ui/app/components/conditional-link-to.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + import Component from '@glimmer/component'; export default class ConditionalLinkToComponent extends Component { diff --git a/ui/app/components/job-editor/alert.js b/ui/app/components/job-editor/alert.js index 2c89962ca..4d4c12bba 100644 --- a/ui/app/components/job-editor/alert.js +++ b/ui/app/components/job-editor/alert.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + import Component from '@glimmer/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; diff --git a/ui/app/components/job-page/parts/summary-chart.js b/ui/app/components/job-page/parts/summary-chart.js index 754e1de5f..89ec0cab2 100644 --- a/ui/app/components/job-page/parts/summary-chart.js +++ b/ui/app/components/job-page/parts/summary-chart.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + // @ts-check import Component from '@glimmer/component'; import { action } from '@ember/object'; diff --git a/ui/app/components/job-status/allocation-status-block.hbs b/ui/app/components/job-status/allocation-status-block.hbs index 5ff785fc3..36a4b8c0e 100644 --- a/ui/app/components/job-status/allocation-status-block.hbs +++ b/ui/app/components/job-status/allocation-status-block.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +
{{#if this.showSummaries}}

diff --git a/ui/app/components/job-status/deployment-history.js b/ui/app/components/job-status/deployment-history.js index 736efc4fc..47dca491c 100644 --- a/ui/app/components/job-status/deployment-history.js +++ b/ui/app/components/job-status/deployment-history.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + // @ts-check import Component from '@glimmer/component'; import { alias } from '@ember/object/computed'; diff --git a/ui/app/components/job-status/failed-or-lost.hbs b/ui/app/components/job-status/failed-or-lost.hbs index 9cfbcd702..0e224e3db 100644 --- a/ui/app/components/job-status/failed-or-lost.hbs +++ b/ui/app/components/job-status/failed-or-lost.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +

Replaced Allocations

diff --git a/ui/app/components/job-status/latest-deployment.hbs b/ui/app/components/job-status/latest-deployment.hbs index 49fa142d9..048655301 100644 --- a/ui/app/components/job-status/latest-deployment.hbs +++ b/ui/app/components/job-status/latest-deployment.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +

diff --git a/ui/app/components/job-status/latest-deployment.js b/ui/app/components/job-status/latest-deployment.js index 2387365d3..9111135d8 100644 --- a/ui/app/components/job-status/latest-deployment.js +++ b/ui/app/components/job-status/latest-deployment.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + import Component from '@glimmer/component'; import { alias } from '@ember/object/computed'; diff --git a/ui/app/components/job-status/panel.hbs b/ui/app/components/job-status/panel.hbs index 6e1ee8708..d6962d423 100644 --- a/ui/app/components/job-status/panel.hbs +++ b/ui/app/components/job-status/panel.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} + {{#if this.isActivelyDeploying}} {{else}} diff --git a/ui/app/components/job-status/panel.js b/ui/app/components/job-status/panel.js index fa337d430..4781e08cd 100644 --- a/ui/app/components/job-status/panel.js +++ b/ui/app/components/job-status/panel.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + // @ts-check import Component from '@glimmer/component'; import { inject as service } from '@ember/service'; diff --git a/ui/app/components/job-status/panel/deploying.hbs b/ui/app/components/job-status/panel/deploying.hbs index 3a0f0f10a..ec02b0107 100644 --- a/ui/app/components/job-status/panel/deploying.hbs +++ b/ui/app/components/job-status/panel/deploying.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +

Status

diff --git a/ui/app/components/job-status/panel/steady.js b/ui/app/components/job-status/panel/steady.js index 2ad0c2351..9bf6b9412 100644 --- a/ui/app/components/job-status/panel/steady.js +++ b/ui/app/components/job-status/panel/steady.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + // @ts-check import Component from '@glimmer/component'; import { alias } from '@ember/object/computed'; diff --git a/ui/app/components/job-status/update-params.hbs b/ui/app/components/job-status/update-params.hbs index e9213dd6d..3d1c1c3e3 100644 --- a/ui/app/components/job-status/update-params.hbs +++ b/ui/app/components/job-status/update-params.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} + {{did-insert trigger.fns.do}} diff --git a/ui/app/components/job-status/update-params.js b/ui/app/components/job-status/update-params.js index 79436a7db..3d2ed461b 100644 --- a/ui/app/components/job-status/update-params.js +++ b/ui/app/components/job-status/update-params.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + // @ts-check import Component from '@glimmer/component'; import { action } from '@ember/object'; diff --git a/ui/app/helpers/merge.js b/ui/app/helpers/merge.js index 0f56c27c1..aa8361394 100644 --- a/ui/app/helpers/merge.js +++ b/ui/app/helpers/merge.js @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + import { helper } from '@ember/component/helper'; function merge(positional) { diff --git a/ui/app/styles/components/job-status-panel.scss b/ui/app/styles/components/job-status-panel.scss index 5c73a1b0f..f2e9d3985 100644 --- a/ui/app/styles/components/job-status-panel.scss +++ b/ui/app/styles/components/job-status-panel.scss @@ -1,3 +1,8 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + .job-status-panel { // #region layout &.steady-state.current-state .boxed-section-body { diff --git a/ui/app/templates/components/job-editor/alert.hbs b/ui/app/templates/components/job-editor/alert.hbs index cf2c82e64..de93fca8c 100644 --- a/ui/app/templates/components/job-editor/alert.hbs +++ b/ui/app/templates/components/job-editor/alert.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +
{{#if @data.error}} diff --git a/ui/app/templates/components/job-editor/edit.hbs b/ui/app/templates/components/job-editor/edit.hbs index 3ab2bf6bc..2a42cb1eb 100644 --- a/ui/app/templates/components/job-editor/edit.hbs +++ b/ui/app/templates/components/job-editor/edit.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +
Job Definition diff --git a/ui/app/templates/components/job-editor/read.hbs b/ui/app/templates/components/job-editor/read.hbs index 3fd79bcf7..6a33c929c 100644 --- a/ui/app/templates/components/job-editor/read.hbs +++ b/ui/app/templates/components/job-editor/read.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +
Job Definition diff --git a/ui/app/templates/components/job-editor/review.hbs b/ui/app/templates/components/job-editor/review.hbs index a4bc2853e..9eb1243f3 100644 --- a/ui/app/templates/components/job-editor/review.hbs +++ b/ui/app/templates/components/job-editor/review.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} +
Job Plan
diff --git a/ui/app/templates/components/job-page/parts/summary-chart.hbs b/ui/app/templates/components/job-page/parts/summary-chart.hbs index b42df7cc3..a669c2614 100644 --- a/ui/app/templates/components/job-page/parts/summary-chart.hbs +++ b/ui/app/templates/components/job-page/parts/summary-chart.hbs @@ -1,3 +1,8 @@ +{{! + Copyright (c) HashiCorp, Inc. + SPDX-License-Identifier: MPL-2.0 +~}} + {{#if @job.hasChildren}}