From 91cba75f5c3c5a83adf9d45c807d2bfc35880f0c Mon Sep 17 00:00:00 2001 From: James Rasell Date: Wed, 3 Jan 2024 08:58:53 +0000 Subject: [PATCH] copywrite: fix and add copywrite config enterprise comments. (#19590) Nomad CI checks for copywrite headers using multiple config files for specific exemption paths. This means the top-level config file does not take effect when running the copywrite script within these sub-folders. Exempt files therefore need to be added to the sub-config files, along with the top level. --- .copywrite.hcl | 4 ++-- api/.copywrite.hcl | 6 +++++- demo/.copywrite.hcl | 6 +++++- drivers/shared/.copywrite.hcl | 6 +++++- jobspec/.copywrite.hcl | 6 +++++- jobspec2/.copywrite.hcl | 6 +++++- plugins/.copywrite.hcl | 6 +++++- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.copywrite.hcl b/.copywrite.hcl index 54845ca7a..653fc2e54 100644 --- a/.copywrite.hcl +++ b/.copywrite.hcl @@ -12,8 +12,8 @@ project { "command/agent/bindata_assetfs.go", "ui/node_modules", - // Enterprise files do not fall under the open source licensing. OSS-ENT - // merge conflicts might happen here, please be sure to put new OSS + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE // exceptions above this comment. ] } diff --git a/api/.copywrite.hcl b/api/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/api/.copywrite.hcl +++ b/api/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] } diff --git a/demo/.copywrite.hcl b/demo/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/demo/.copywrite.hcl +++ b/demo/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] } diff --git a/drivers/shared/.copywrite.hcl b/drivers/shared/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/drivers/shared/.copywrite.hcl +++ b/drivers/shared/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] } diff --git a/jobspec/.copywrite.hcl b/jobspec/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/jobspec/.copywrite.hcl +++ b/jobspec/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] } diff --git a/jobspec2/.copywrite.hcl b/jobspec2/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/jobspec2/.copywrite.hcl +++ b/jobspec2/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] } diff --git a/plugins/.copywrite.hcl b/plugins/.copywrite.hcl index c4b09f336..61b20a2c8 100644 --- a/plugins/.copywrite.hcl +++ b/plugins/.copywrite.hcl @@ -4,5 +4,9 @@ project { license = "MPL-2.0" copyright_year = 2024 - header_ignore = [] + header_ignore = [ + // Enterprise files do not fall under the open source licensing. CE-ENT + // merge conflicts might happen here, please be sure to put new CE + // exceptions above this comment. + ] }