From 8c4866386fa42b3a83654b53e1b2f9e3a7ce2f00 Mon Sep 17 00:00:00 2001 From: Bowen Lan <62091230+bowenlan-amzn@users.noreply.github.com> Date: Thu, 9 Sep 2021 17:07:32 -0700 Subject: [PATCH] License header check (#142) * Provide default copyright header using IDE feature Signed-off-by: bowenlan-amzn * Address #103 history write index is rolled over even if the history indices are disabled --- .gitignore | 3 ++- .idea/copyright/OpenSearch.xml | 6 ++++++ .idea/copyright/profiles_settings.xml | 7 +++++++ build-tools/coverage.gradle | 5 +++++ build-tools/pkgbuild.gradle | 5 +++++ .../IndexStateManagementHistory.kt | 2 +- .../util/DummyFileForLicenseCheck.java | 12 ++++++++++++ .../indexmanagement/util/ScheduledJobUtils.kt | 5 +++++ 8 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 .idea/copyright/OpenSearch.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 src/main/kotlin/org/opensearch/indexmanagement/util/DummyFileForLicenseCheck.java diff --git a/.gitignore b/.gitignore index 79f0b4012..037f7a3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ .gradle/ build/ out/ -.idea/ +.idea/* +!.idea/copyright *.ipr *.iws .DS_Store diff --git a/.idea/copyright/OpenSearch.xml b/.idea/copyright/OpenSearch.xml new file mode 100644 index 000000000..dadc9ed84 --- /dev/null +++ b/.idea/copyright/OpenSearch.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..5f45523cc --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/build-tools/coverage.gradle b/build-tools/coverage.gradle index d24749dc8..33a12c8c7 100644 --- a/build-tools/coverage.gradle +++ b/build-tools/coverage.gradle @@ -1,3 +1,8 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + /* * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle index 7aaa7fe43..ee9c92b4e 100644 --- a/build-tools/pkgbuild.gradle +++ b/build-tools/pkgbuild.gradle @@ -1,3 +1,8 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + /* * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. * diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt index 336dc60cc..fd51d9a09 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt @@ -107,7 +107,7 @@ class IndexStateManagementHistory( override fun onMaster() { try { // try to rollover immediately as we might be restarting the cluster - rolloverHistoryIndex() + if (historyEnabled) rolloverHistoryIndex() // schedule the next rollover for approx MAX_AGE later scheduledRollover = threadPool.scheduleWithFixedDelay( { rolloverAndDeleteHistoryIndex() }, diff --git a/src/main/kotlin/org/opensearch/indexmanagement/util/DummyFileForLicenseCheck.java b/src/main/kotlin/org/opensearch/indexmanagement/util/DummyFileForLicenseCheck.java new file mode 100644 index 000000000..4a9a3dc52 --- /dev/null +++ b/src/main/kotlin/org/opensearch/indexmanagement/util/DummyFileForLicenseCheck.java @@ -0,0 +1,12 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + +package org.opensearch.indexmanagement.util; + +/* + * Need to have a java file, so licenseHeaders task can function + */ +public class DummyFileForLicenseCheck { +} diff --git a/src/main/kotlin/org/opensearch/indexmanagement/util/ScheduledJobUtils.kt b/src/main/kotlin/org/opensearch/indexmanagement/util/ScheduledJobUtils.kt index c7d3e1405..e1ab18187 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/util/ScheduledJobUtils.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/util/ScheduledJobUtils.kt @@ -1,3 +1,8 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + /* * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. *