Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing default integtest.sh (1.1). #149

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*Description of changes:*

*CheckList:*
[ ] Commits are signed per the DCO using --signoff
- [ ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check [here](https://github.com/opensearch-project/index-management/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
4 changes: 2 additions & 2 deletions .github/draft-release-notes-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ replacers:
- search: '##'
replace: '###'

# Organizing the tagged PRs into unified ODFE categories
# Organizing the tagged PRs into unified OpenSearch categories
categories:
- title: 'Breaking changes'
labels:
Expand Down Expand Up @@ -45,4 +45,4 @@ categories:
- 'backwards-compatibility'
- title: 'Refactoring'
labels:
- 'Refactor'
- 'refactor'
40 changes: 0 additions & 40 deletions .github/workflows/multi-node-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 14
# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal
# dependencies: common-utils
- name: Checkout common-utils
uses: actions/checkout@v2
with:
repository: 'opensearch-project/common-utils'
path: common-utils
ref: 'main'
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# dependencies: job-scheduler
- name: Checkout job-scheduler
uses: actions/checkout@v2
with:
repository: 'opensearch-project/job-scheduler'
path: job-scheduler
ref: 'main'
- name: Build job-scheduler
working-directory: ./job-scheduler
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# dependencies: alerting-notification
- name: Checkout alerting
uses: actions/checkout@v2
with:
repository: 'opensearch-project/alerting'
path: alerting
ref: 'main'
- name: Build alerting
working-directory: ./alerting
run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# index-management
- name: Checkout Branch
uses: actions/checkout@v2
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 14
# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal
# dependencies: common-utils
- name: Checkout common-utils
uses: actions/checkout@v2
with:
repository: 'opensearch-project/common-utils'
path: common-utils
ref: 'main'
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# dependencies: job-scheduler
- name: Checkout job-scheduler
uses: actions/checkout@v2
with:
repository: 'opensearch-project/job-scheduler'
path: job-scheduler
ref: 'main'
- name: Build job-scheduler
working-directory: ./job-scheduler
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# dependencies: alerting-notification
- name: Checkout alerting
uses: actions/checkout@v2
with:
repository: 'opensearch-project/alerting'
path: alerting
ref: 'main'
- name: Build alerting
working-directory: ./alerting
run: ./gradlew :alerting-notification:publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
# build index management
- name: Checkout Branch
uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.gradle/
build/
out/
.idea/
.idea/*
!.idea/copyright
*.ipr
*.iws
.DS_Store
Expand Down
6 changes: 6 additions & 0 deletions .idea/copyright/OpenSearch.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 2 additions & 12 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
OpenSearch
Copyright 2021 OpenSearch Contributors

This product includes software developed by
Elasticsearch (http://www.elastic.co).
Copyright 2009-2018 Elasticsearch

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).

This product includes software developed by
Joda.org (http://www.joda.org/).
OpenSearch (https://opensearch.org/)
Copyright OpenSearch Contributors
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ This project is licensed under the [Apache v2.0 License](./LICENSE)

## Copyright

Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright OpenSearch Contributors. See [NOTICE](NOTICE) for details.
5 changes: 5 additions & 0 deletions build-tools/coverage.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down
5 changes: 5 additions & 0 deletions build-tools/pkgbuild.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ buildscript {
}

repositories {
mavenLocal()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
Expand Down Expand Up @@ -182,7 +182,7 @@ dependencies {
}

repositories {
mavenLocal()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

plugins.withId('java') {
Expand All @@ -192,7 +192,6 @@ plugins.withId('java') {
plugins.withId('org.jetbrains.kotlin.jvm') {
compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = "1.8"
compileKotlin.dependsOn ktlint

}

javadoc.enabled = false // turn off javadoc as it barfs on Kotlin code
Expand Down
2 changes: 1 addition & 1 deletion docs/rfc.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ After building Index State Management API, we will build an administrative panel

## Providing Feedback

If you have comments or feedback on our plans for Index Management, please comment on [the RFC Github issue](../../issues/1) in this project to discuss.
If you have comments or feedback on our plans for Index Management, please comment on [the RFC Github issue](https://github.com/opendistro-for-elasticsearch/index-management/issues/1) in this project to discuss.
77 changes: 0 additions & 77 deletions integtest.sh

This file was deleted.

23 changes: 23 additions & 0 deletions release-notes/opensearch-index-management.release-notes-1.1.0.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Version 1.1.0.0 2021-09-03

Compatible with OpenSearch 1.1.0

### Infrastructure

* Upgrade dependencies to 1.1 and build snapshot by default. ([#121](https://github.com/opensearch-project/index-management/pull/121))

### Features

* Storing user information as part of the job when security plugin is installed ([#113](https://github.com/opensearch-project/index-management/pull/113))
* Storing user object in all APIs and enabling filter of response based on user ([#115](https://github.com/opensearch-project/index-management/pull/115))
* Security improvements ([#126](https://github.com/opensearch-project/index-management/pull/126))
* Updating security filtering logic ([#137](https://github.com/opensearch-project/index-management/pull/137))

### Enhancements

* Enhance ISM template ([#105](https://github.com/opensearch-project/index-management/pull/105))

### Bug Fixes

* Removing Usages of Action Get Call and using listeners ([#100](https://github.com/opensearch-project/index-management/pull/100))
* Explain response still use old opendistro policy id ([#109](https://github.com/opensearch-project/index-management/pull/109))
Original file line number Diff line number Diff line change
Expand Up @@ -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() },
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

/*
* Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
Expand Down