[Backport 1.x] Fixes license headers and the linting rules (#1373)

.eslintrc.js

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,35 +28,33 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 /**
- * For new files created by OpenSearch Contributers
+ * For new files created by OpenSearch Contributors
  */
-const OSD_HEADER = `
+const OSD_NEW_HEADER = `
 /*
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
 `;
 
 /**
- * For files that modify or use code with an exsting OSS header
+ * For modified and modified files with external open source code
  */
-const OSS_HEADER = `
+const OSD_HEADER = `
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a 
+ * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 `;
 
-const OSS_MODIFIED_HEADER = `
+const OSD_BAD_HEADER = `
 /*
  * Modifications Copyright OpenSearch Contributors. See
  * GitHub history for details.
@@ -164,14 +165,15 @@ module.exports = {
         '@osd/eslint/require-license-header': [
           'error',
           {
-            licenses: [OSD_HEADER, OSS_HEADER],
+            licenses: [OSD_NEW_HEADER, OSD_HEADER],
           },
         ],
         '@osd/eslint/disallow-license-headers': [
           'error',
           {
             licenses: [
               ELASTIC_LICENSE_HEADER,
+              OSD_BAD_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
               SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -208,6 +210,9 @@ module.exports = {
           {
             licenses: [
               ELASTIC_LICENSE_HEADER,
+              OSD_BAD_HEADER,
+              OSD_NEW_HEADER,
+              OSD_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -229,12 +234,13 @@ module.exports = {
           'error',
           {
             licenses: [
-              OSS_HEADER,
               ELASTIC_LICENSE_HEADER,
+              OSD_BAD_HEADER,
+              OSD_NEW_HEADER,
+              OSD_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
               SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
-              OSS_MODIFIED_HEADER,
             ],
           },
         ],
@@ -253,12 +259,13 @@ module.exports = {
           'error',
           {
             licenses: [
-              OSS_HEADER,
               ELASTIC_LICENSE_HEADER,
+              OSD_BAD_HEADER,
+              OSD_NEW_HEADER,
+              OSD_HEADER,
               APACHE_2_0_LICENSE_HEADER,
               SAFER_LODASH_SET_HEADER,
               SAFER_LODASH_SET_LODASH_HEADER,
-              OSS_MODIFIED_HEADER,
             ],
           },
         ],

Gruntfile.js

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 require('./src/setup_node_env');
 
 module.exports = function (grunt) {

bwctest.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+#
+# Any modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+#
+
 set -e
 
 function usage() {

examples/bfetch_explorer/public/components/count_until/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import useList from 'react-use/lib/useList';

examples/bfetch_explorer/public/components/double_integers/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import useList from 'react-use/lib/useList';

examples/bfetch_explorer/public/components/page/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import * as React from 'react';
 import {
   EuiPageBody,

examples/bfetch_explorer/public/containers/app/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import React from 'react';
 import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
 import { EuiPage } from '@elastic/eui';

examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import * as React from 'react';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { CountUntil } from '../../../../components/count_until';

examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import * as React from 'react';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { DoubleIntegers } from '../../../../components/double_integers';

examples/bfetch_explorer/public/containers/app/sidebar/index.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import React from 'react';
 import { EuiPageSideBar, EuiSideNav } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';

examples/bfetch_explorer/public/hooks/use_deps.ts

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import { useOpenSearchDashboards } from '../../../../src/plugins/opensearch_dashboards_react/public';
 import { BfetchDeps } from '../mount';
 

examples/bfetch_explorer/public/index.ts

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import { BfetchExplorerPlugin } from './plugin';
 
 export const plugin = () => new BfetchExplorerPlugin();

examples/bfetch_explorer/public/mount.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { CoreSetup, CoreStart, AppMountParameters } from 'opensearch-dashboards/public';

examples/bfetch_explorer/public/plugin.tsx

@@ -4,6 +4,9 @@
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
+ *
+ * Any modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
  */
 
 /*
@@ -25,11 +28,6 @@
  * under the License.
  */
 
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
 import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../src/core/public';
 import { BfetchPublicSetup, BfetchPublicStart } from '../../../src/plugins/bfetch/public';
 import { mount } from './mount';