hashicorp · hc-github-team-es-release-engineering · Jan 2, 2024 · Nov 21, 2023 · Nov 23, 2023 · Nov 23, 2023
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -2,7 +2,7 @@ schema_version = 1
 
 project {
   license        = "BUSL-1.1"
-  copyright_year = 2023
+  copyright_year = 2024
 
   # (OPTIONAL) A list of globs that should not have copyright/license headers.
   # Supports doublestar glob patterns for more flexibility in defining which
@@ -12,10 +12,5 @@ project {
     "ui/node_modules/**",
     "enos/modules/k8s_deploy_vault/raft-config.hcl",
     "plugins/database/postgresql/scram/**",
-    # licensed under MPL - ignoring for now until the copywrite tool can support
-    # multiple licenses per repo.
-    "sdk/**",
-    "api/**",
-    "shamir/**'"
   ]
 }
@@ -0,0 +1,24 @@
+name: Check Copywrite Headers
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  push:
+    branches:
+      - main
+      - release/**
+
+jobs:
+  copywrite:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: hashicorp/setup-copywrite@867a1a2a064a0626db322392806428f7dc59cb3e # v1.1.2
+        name: Setup Copywrite
+        with:
+          version: v0.16.4
+          archive-checksum: c299f830e6eef7e126a3c6ef99ac6f43a3c132d830c769e0d36fa347fa1af254
+      - name: Check Header Compliance
+        run: make ci-copywriteheaders
+permissions:
+  contents: read
diff --git a/LICENSE b/LICENSE
@@ -4,7 +4,7 @@ License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
 Parameters
 
 Licensor:             HashiCorp, Inc.
-Licensed Work:        Vault Version 1.15.0 or later. The Licensed Work is (c) 2023
+Licensed Work:        Vault Version 1.15.0 or later. The Licensed Work is (c) 2024
                       HashiCorp, Inc.
 Additional Use Grant: You may make production use of the Licensed Work, provided
                       Your use does not include offering the Licensed Work to third

diff --git a/Makefile b/Makefile
@@ -316,3 +316,13 @@ ci-get-version-package:
 .PHONY: ci-prepare-legal
 ci-prepare-legal:
 	@$(CURDIR)/scripts/ci-helper.sh prepare-legal
+
+.PHONY: ci-copywriteheaders
+ci-copywriteheaders:
+	copywrite headers --plan
+	echo $(CURDIR)
+	pwd
+	# Special case for MPL headers in /api, /sdk, and /shamir
+	cd api && $(CURDIR)/scripts/copywrite-exceptions.sh
+	cd sdk && $(CURDIR)/scripts/copywrite-exceptions.sh
+	cd shamir && $(CURDIR)/scripts/copywrite-exceptions.sh
diff --git a/api/.copywrite.hcl b/api/.copywrite.hcl
@@ -0,0 +1,9 @@
+
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2024
+
+  header_ignore = []
+}
diff --git a/api/secret_test.go b/api/secret_test.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package api
 
 import (

diff --git a/audit/sink_wrapper.go b/audit/sink_wrapper.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package audit
 
 import (

@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package schedule
 
 import (

diff --git a/command/server/config_stubs_oss.go b/command/server/config_stubs_oss.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 //go:build !enterprise
 
 package server

diff --git a/command/server/tls_util_test.go b/command/server/tls_util_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package server
 
 import (

diff --git a/http/handler_stubs_oss.go b/http/handler_stubs_oss.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 //go:build !enterprise
 
 package http

diff --git a/scripts/copywrite-exceptions.sh b/scripts/copywrite-exceptions.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Used as a stopgap for copywrite bot in MPL-licensed subdirs, detects BUSL licensed
+# headers and deletes them, then runs the copywrite bot to utilize local subdir config
+# to inject correct headers.
+
+find . -type f -name '*.go' | while read line; do
+  if grep "SPDX-License-Identifier: BUSL-1.1" $line; then
+    sed -i '/SPDX-License-Identifier: BUSL-1.1/d' $line
+    sed -i '/Copyright (c) HashiCorp, Inc./d' $line
+  fi
+done
+
+copywrite headers --plan
diff --git a/sdk/.copywrite.hcl b/sdk/.copywrite.hcl
@@ -0,0 +1,9 @@
+
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2024
+
+  header_ignore = []
+}
diff --git a/sdk/helper/testcluster/consts.go b/sdk/helper/testcluster/consts.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package testcluster
 
 const (

diff --git a/sdk/helper/testcluster/replication.go b/sdk/helper/testcluster/replication.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package testcluster
 
 import (

diff --git a/sdk/helper/testhelpers/output.go b/sdk/helper/testhelpers/output.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package testhelpers
 
 import (

diff --git a/sdk/helper/testhelpers/output_test.go b/sdk/helper/testhelpers/output_test.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package testhelpers
 
 import (

diff --git a/sdk/logical/events_test.go b/sdk/logical/events_test.go
@@ -1,3 +1,7 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+
 package logical
 
 import (

@@ -0,0 +1,9 @@
+
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2024
+
+  header_ignore = []
+}
diff --git a/ui/app/components/resultant-acl-banner.hbs b/ui/app/components/resultant-acl-banner.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Alert @type="inline" @color="critical" data-test-resultant-acl-banner as |A|>
   <A.Title>Resultant ACL check failed</A.Title>
   <A.Description>

diff --git a/ui/app/components/resultant-acl-banner.js b/ui/app/components/resultant-acl-banner.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 

diff --git a/ui/app/models/kv/config.js b/ui/app/models/kv/config.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Model, { attr } from '@ember-data/model';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
 import { withFormFields } from 'vault/decorators/model-form-fields';

diff --git a/ui/app/styles/components/secrets-engines-card.scss b/ui/app/styles/components/secrets-engines-card.scss
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 .secrets-engines-card {
   min-height: 480px;
 }
diff --git a/ui/app/templates/components/clients/no-data.hbs b/ui/app/templates/components/clients/no-data.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 {{#if (eq @config.enabled "On")}}
   <EmptyState
     @title="No data received {{if @dateRangeMessage @dateRangeMessage}}"

diff --git a/ui/app/templates/components/dashboard/client-count-card.hbs b/ui/app/templates/components/dashboard/client-count-card.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Card::Container @hasBorder={{true}} class="has-padding-l" data-test-card="client-count">
   <div class="is-flex-between">
     <h3 class="title is-4 has-bottom-margin-xxs" data-test-client-count-title>

diff --git a/ui/app/templates/components/dashboard/learn-more-card.hbs b/ui/app/templates/components/dashboard/learn-more-card.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Card::Container @hasBorder={{true}} class="has-padding-l" data-test-card="learn-more">
   <h3 class="title is-4 has-bottom-margin-xxs" data-test-learn-more-title>Learn more</h3>
   <div class="sub-text" data-test-learn-more-subtext>

diff --git a/ui/app/templates/components/dashboard/overview.hbs b/ui/app/templates/components/dashboard/overview.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Dashboard::VaultVersionTitle @version={{@version}} />
 
 <div class="has-bottom-margin-xl">

diff --git a/ui/app/templates/components/dashboard/quick-actions-card.hbs b/ui/app/templates/components/dashboard/quick-actions-card.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Card::Container @hasBorder={{true}} class="has-padding-l" data-test-card="quick-actions">
   <h3 class="title is-4">Quick actions</h3>
   {{#if this.filteredSecretEngines}}

diff --git a/ui/app/templates/components/dashboard/secrets-engines-card.hbs b/ui/app/templates/components/dashboard/secrets-engines-card.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Card::Container
   @hasBorder={{true}}
   class="has-padding-l {{if this.filteredSecretsEngines 'secrets-engines-card'}}"

diff --git a/ui/app/templates/components/dashboard/survey-link-text.hbs b/ui/app/templates/components/dashboard/survey-link-text.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <div class="has-top-padding-xs has-bottom-padding-xs has-top-margin-m" data-test-feedback-form>
   <small>
     Don't see what you're looking for on this page? Let us know via our

diff --git a/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs b/ui/app/templates/components/dashboard/vault-configuration-details-card.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Hds::Card::Container @hasBorder={{true}} class="has-padding-l" data-test-card="configuration-details">
   <h3 class="title is-4" data-test-configuration-details-title>Configuration details</h3>
 

diff --git a/ui/app/templates/components/dashboard/vault-version-title.hbs b/ui/app/templates/components/dashboard/vault-version-title.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <PageHeader as |p|>
   <p.levelLeft>
     <h1 class="title is-3" data-test-dashboard-version-header>

diff --git a/ui/app/templates/vault/cluster/dashboard.hbs b/ui/app/templates/vault/cluster/dashboard.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <Dashboard::Overview
   @replication={{this.model.replication}}
   @secretsEngines={{this.model.secretsEngines}}

diff --git a/ui/app/transforms/mount-visibility.js b/ui/app/transforms/mount-visibility.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Transform from '@ember-data/serializer/transform';
 
 /**

diff --git a/ui/lib/core/addon/components/copy-secret-dropdown.hbs b/ui/lib/core/addon/components/copy-secret-dropdown.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 {{! @onWrap is recommend to be a concurrency task! see <Page::Secret::Details> in KV addon for example }}
 <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" @onClose={{@onClose}} as |D|>
   <D.Trigger data-test-copy-menu-trigger class="toolbar-link {{if D.isOpen 'is-active'}}" @htmlTag="button">

diff --git a/ui/lib/core/addon/components/filter-input.hbs b/ui/lib/core/addon/components/filter-input.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <div class="field">
   <p class="control has-icons-left">
     <input

diff --git a/ui/lib/core/addon/components/secrets-engine-mount-config.hbs b/ui/lib/core/addon/components/secrets-engine-mount-config.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <div ...attributes>
   <ToggleButton
     @isOpen={{this.showConfig}}

diff --git a/ui/lib/core/addon/components/secrets-engine-mount-config.ts b/ui/lib/core/addon/components/secrets-engine-mount-config.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 

diff --git a/ui/lib/core/addon/utils/sanitize-path.js b/ui/lib/core/addon/utils/sanitize-path.js
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 export function sanitizePath(path) {
   if (!path) return '';
   //remove whitespace + remove trailing and leading slashes

diff --git a/ui/lib/core/app/components/copy-secret-dropdown.js b/ui/lib/core/app/components/copy-secret-dropdown.js
@@ -1 +1,6 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
 export { default } from 'core/components/copy-secret-dropdown';
diff --git a/ui/lib/kv/addon/components/kv-delete-modal.hbs b/ui/lib/kv/addon/components/kv-delete-modal.hbs
@@ -1,3 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+  SPDX-License-Identifier: BUSL-1.1
+~}}
+
 <button type="button" class="toolbar-link" {{on "click" (fn (mut this.modalOpen) true)}} data-test-kv-delete={{@mode}}>
   {{yield}}
 </button>