From c012ebef8ff595f83d903eed416d322f034bea34 Mon Sep 17 00:00:00 2001 From: Petar Date: Mon, 1 May 2023 18:11:03 +0200 Subject: [PATCH 1/4] compile fix due to ImmutableOpenMap removal Signed-off-by: Petar Dzepina --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../IndexStateManagementHistory.kt | 4 ++-- .../indexstatemanagement/ManagedIndexRunner.kt | 2 +- .../indexstatemanagement/MetadataService.kt | 2 +- .../opensearchapi/OpenSearchExtensions.kt | 2 +- .../step/shrink/AttemptMoveShardsStep.kt | 4 ++-- .../step/shrink/WaitForMoveShardsStep.kt | 8 ++++---- .../step/shrink/WaitForShrinkStep.kt | 2 +- .../action/explain/TransportExplainAction.kt | 2 +- .../indexmanagement/rollup/RollupMapperService.kt | 2 +- .../util/RollupFieldValueExpressionResolver.kt | 2 +- .../opensearch/indexmanagement/util/IndexUtils.kt | 2 +- .../IndexStateManagementIntegTestCase.kt | 2 +- .../indexstatemanagement/MetadataServiceTests.kt | 3 +-- .../step/AttemptTransitionStepTests.kt | 3 +-- .../rollup/RollupMapperServiceTests.kt | 7 ++----- .../indexmanagement/snapshotmanagement/TestUtils.kt | 13 ++++++------- 17 files changed, 28 insertions(+), 34 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..774fae876 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt index 9c46489d8..99a55d02f 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementHistory.kt @@ -176,7 +176,7 @@ class IndexStateManagementHistory( clusterStateRequest, object : ActionListener { override fun onResponse(clusterStateResponse: ClusterStateResponse) { - if (!clusterStateResponse.state.metadata.indices.isEmpty) { + if (clusterStateResponse.state.metadata.indices.isNotEmpty()) { val indicesToDelete = getIndicesToDelete(clusterStateResponse) logger.info("Deleting old history indices viz $indicesToDelete") deleteAllOldHistoryIndices(indicesToDelete) @@ -199,7 +199,7 @@ class IndexStateManagementHistory( val creationTime = indexMetaData.creationDate if ((Instant.now().toEpochMilli() - creationTime) > historyRetentionPeriod.millis) { - val alias = indexMetaData.aliases.firstOrNull { IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias } + val alias = indexMetaData.aliases.entries.firstOrNull { IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias } if (alias != null && historyEnabled) { // If index has write alias and history is enable, don't delete the index. continue diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt index a6fdfdba8..3939da165 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt @@ -846,7 +846,7 @@ object ManagedIndexRunner : val response: ClusterStateResponse = client.admin().cluster().suspendUntil { state(clusterStateRequest, it) } - indexMetaData = response.state.metadata.indices.firstOrNull()?.value + indexMetaData = response.state.metadata.indices.entries.firstOrNull()?.value } catch (e: Exception) { logger.error("Failed to get IndexMetaData from cluster manager cluster state for index=$index", e) } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt index c42682f71..7bd3407d2 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataService.kt @@ -111,7 +111,7 @@ class MetadataService( val indexUuidMap = mutableMapOf() clusterStateManagedIndexMetadata.forEach { (indexName, metadata) -> val indexMetadata = indicesMetadata[indexName] - val currentIndexUuid = indexMetadata.indexUUID + val currentIndexUuid = indexMetadata!!.indexUUID if (currentIndexUuid != metadata?.indexUuid) { corruptManagedIndices.add(indexMetadata.index) } else { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/opensearchapi/OpenSearchExtensions.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/opensearchapi/OpenSearchExtensions.kt index 157676f00..9d6306f9f 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/opensearchapi/OpenSearchExtensions.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/opensearchapi/OpenSearchExtensions.kt @@ -199,7 +199,7 @@ fun XContentBuilder.buildMetadata(name: String, metadata: ToXContentFragment, pa // Get the oldest rollover time or null if index was never rolled over fun IndexMetadata.getOldestRolloverTime(): Instant? { - return this.rolloverInfos.values() + return this.rolloverInfos.entries .map { it.value.time } .minOrNull() // oldest should be min as its epoch time ?.let { Instant.ofEpochMilli(it) } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt index a08e5beaf..728c76c3d 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt @@ -84,7 +84,7 @@ class AttemptMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name, val (statsStore, statsDocs, shardStats) = getIndexStats(indexName, client) ?: return this val indexSize = statsStore.sizeInBytes // Get stats of current and target shards - val numOriginalShards = context.clusterService.state().metadata.indices[indexName].numberOfShards + val numOriginalShards = context.clusterService.state().metadata.indices[indexName]!!.numberOfShards val numTargetShards = getNumTargetShards(numOriginalShards, indexSize) if (shouldFailTooManyDocuments(statsDocs, numTargetShards)) return this @@ -215,7 +215,7 @@ class AttemptMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name, private fun shouldFailUnsafe(clusterService: ClusterService, indexName: String): Boolean { // If forceUnsafe is set and is true, then we don't even need to check the number of replicas if (action.forceUnsafe == true) return false - val numReplicas = clusterService.state().metadata.indices[indexName].numberOfReplicas + val numReplicas = clusterService.state().metadata.indices.get(indexName)!!.numberOfReplicas val shouldFailForceUnsafeCheck = numReplicas == 0 if (shouldFailForceUnsafeCheck) { logger.info(UNSAFE_FAILURE_MESSAGE) diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForMoveShardsStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForMoveShardsStep.kt index e4f27686b..6fc9b2e70 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForMoveShardsStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForMoveShardsStep.kt @@ -33,7 +33,7 @@ class WaitForMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name, val numShardsInSync = getNumShardsInSync(shardStats, context.clusterService.state(), indexName) val nodeToMoveOnto = localShrinkActionProperties.nodeName val numShardsOnNode = getNumShardsWithCopyOnNode(shardStats, context.clusterService.state(), nodeToMoveOnto) - val numPrimaryShards = context.clusterService.state().metadata.indices[indexName].numberOfShards + val numPrimaryShards = context.clusterService.state().metadata.indices[indexName]!!.numberOfShards // If a copy of each shard is on the node, and all shards are in sync, move on if (numShardsOnNode >= numPrimaryShards && numShardsInSync >= numPrimaryShards) { @@ -49,8 +49,8 @@ class WaitForMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name, // Returns the number of shard IDs where all primary and replicas are in sync private fun getNumShardsInSync(shardStats: Array, state: ClusterState, indexName: String): Int { - val numReplicas = state.metadata.indices[indexName].numberOfReplicas - val inSyncAllocations = state.metadata.indices[indexName].inSyncAllocationIds + val numReplicas = state.metadata.indices[indexName]!!.numberOfReplicas + val inSyncAllocations = state.metadata.indices[indexName]!!.inSyncAllocationIds var numShardsInSync = 0 for (shard: ShardStats in shardStats) { val routingInfo = shard.shardRouting @@ -58,7 +58,7 @@ class WaitForMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name, if (routingInfo.primary()) { // All shards must be in sync as it isn't known which shard (replica or primary) will be // moved to the target node and used in the shrink. - if (inSyncAllocations[routingInfo.id].size == (numReplicas + 1)) { + if (inSyncAllocations[routingInfo.id]!!.size == (numReplicas + 1)) { numShardsInSync++ } } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt index 6eb783a85..ca0d94c60 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt @@ -54,7 +54,7 @@ class WaitForShrinkStep(private val action: ShrinkAction) : ShrinkStep(name, tru private suspend fun shrinkNotDone(targetIndex: String, targetNumShards: Int, client: Client, clusterService: ClusterService): Boolean { val numPrimaryShardsStarted = getNumPrimaryShardsStarted(client, targetIndex) - val numPrimaryShards = clusterService.state().metadata.indices[targetIndex].numberOfShards + val numPrimaryShards = clusterService.state().metadata.indices[targetIndex]!!.numberOfShards return numPrimaryShards != targetNumShards || numPrimaryShardsStarted != targetNumShards } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt index a007e2868..6aa258190 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt @@ -269,7 +269,7 @@ class TransportExplainAction @Inject constructor( clusterStateRequest, object : ActionListener { override fun onResponse(response: ClusterStateResponse) { - val clusterStateIndexMetadatas = response.state.metadata.indices.associate { it.key to it.value } + val clusterStateIndexMetadatas = response.state.metadata.indices.entries.associate { it.key to it.value } getMetadataMap(clusterStateIndexMetadatas, threadContext) } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt index 2f44f4389..f5d527260 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt @@ -343,7 +343,7 @@ class RollupMapperService( return RollupJobValidationResult.Failure(getMappingsResult.message, getMappingsResult.cause) } - val indexMapping: MappingMetadata = res.mappings[targetIndexResolvedName] + val indexMapping: MappingMetadata = res.mappings[targetIndexResolvedName]!! return if (((indexMapping.sourceAsMap?.get(_META) as Map<*, *>?)?.get(ROLLUPS) as Map<*, *>?)?.containsKey(rollup.id) == true) { RollupJobValidationResult.Valid diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/util/RollupFieldValueExpressionResolver.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/util/RollupFieldValueExpressionResolver.kt index fe2c38801..b1de9b516 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/util/RollupFieldValueExpressionResolver.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/util/RollupFieldValueExpressionResolver.kt @@ -59,7 +59,7 @@ object RollupFieldValueExpressionResolver { open fun hasAlias(index: String): Boolean { val aliases = this.clusterService.state().metadata().indices.get(index)?.aliases if (aliases != null) { - return aliases.size() > 0 + return aliases.isNotEmpty() } return false } diff --git a/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt b/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt index 5c5af20f3..a8ac390d3 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt @@ -134,7 +134,7 @@ class IndexUtils { actionListener: ActionListener ) { if (clusterState.metadata.indices.containsKey(index)) { - if (shouldUpdateIndex(clusterState.metadata.indices[index], schemaVersion)) { + if (shouldUpdateIndex(clusterState.metadata.indices[index]!!, schemaVersion)) { val putMappingRequest: PutMappingRequest = PutMappingRequest(index).source(mapping, XContentType.JSON) client.putMapping(putMappingRequest, actionListener) } else { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementIntegTestCase.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementIntegTestCase.kt index 8d37f4805..95a1b115f 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementIntegTestCase.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementIntegTestCase.kt @@ -113,7 +113,7 @@ abstract class IndexStateManagementIntegTestCase : OpenSearchIntegTestCase() { return client().admin().cluster().prepareState() .setIndices(indexName) .setMetadata(true).get() - .state.metadata.indices[indexName] + .state.metadata.indices[indexName]!! } // reuse utility fun from RestTestCase diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataServiceTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataServiceTests.kt index ecbfda5f4..7f59a7a8f 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataServiceTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataServiceTests.kt @@ -22,7 +22,6 @@ import org.opensearch.client.ClusterAdminClient import org.opensearch.cluster.ClusterState import org.opensearch.cluster.metadata.Metadata import org.opensearch.cluster.service.ClusterService -import org.opensearch.common.collect.ImmutableOpenMap import org.opensearch.indexmanagement.IndexManagementIndices import org.opensearch.test.OpenSearchTestCase import kotlin.test.assertFailsWith @@ -40,7 +39,7 @@ class MetadataServiceTests : OpenSearchTestCase() { fun setup() { whenever(clusterService.state()).doReturn(clusterState) whenever(clusterState.metadata).doReturn(metadata) - whenever(metadata.indices).doReturn(ImmutableOpenMap.of()) + whenever(metadata.indices).doReturn(mutableMapOf()) } fun `test config index not exists`() = runBlocking { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt index aeeedd7c9..f6430b2f0 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt @@ -23,7 +23,6 @@ import org.opensearch.cluster.ClusterState import org.opensearch.cluster.metadata.IndexMetadata import org.opensearch.cluster.metadata.Metadata import org.opensearch.cluster.service.ClusterService -import org.opensearch.common.collect.ImmutableOpenMap import org.opensearch.common.settings.ClusterSettings import org.opensearch.common.settings.Settings import org.opensearch.index.shard.DocsStats @@ -50,7 +49,7 @@ class AttemptTransitionStepTests : OpenSearchTestCase() { private val indexUUID: String = "indexUuid" @Suppress("UNCHECKED_CAST") private val indexMetadata: IndexMetadata = mock { - on { rolloverInfos } doReturn ImmutableOpenMap.builder().build() + on { rolloverInfos } doReturn mutableMapOf() on { indexUUID } doReturn indexUUID } private val metadata: Metadata = mock { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperServiceTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperServiceTests.kt index f606e207b..9896dc024 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperServiceTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperServiceTests.kt @@ -21,7 +21,6 @@ import org.opensearch.client.IndicesAdminClient import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.metadata.MappingMetadata import org.opensearch.cluster.service.ClusterService -import org.opensearch.common.collect.ImmutableOpenMap import org.opensearch.common.xcontent.XContentType import org.opensearch.indexmanagement.rollup.model.RollupJobValidationResult import org.opensearch.test.OpenSearchTestCase @@ -292,16 +291,14 @@ class RollupMapperServiceTests : OpenSearchTestCase() { private fun getMappingResponse(indexName: String, emptyMapping: Boolean = false): GetMappingsResponse { val mappings = if (emptyMapping) { - ImmutableOpenMap.Builder().build() + mutableMapOf() } else { val mappingSourceMap = createParser( XContentType.JSON.xContent(), javaClass.classLoader.getResource("mappings/kibana-sample-data.json").readText() ).map() val mappingMetadata = MappingMetadata("_doc", mappingSourceMap) // it seems it still expects a type, i.e. _doc now - ImmutableOpenMap.Builder() - .fPut(indexName, mappingMetadata) - .build() + mutableMapOf(indexName to mappingMetadata) } return GetMappingsResponse(mappings) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt index b4bebcf11..1be9dea3c 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt @@ -14,17 +14,16 @@ import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse import org.opensearch.action.index.IndexResponse import org.opensearch.cluster.SnapshotsInProgress import org.opensearch.common.UUIDs -import org.opensearch.common.collect.ImmutableOpenMap import org.opensearch.common.unit.TimeValue import org.opensearch.common.xcontent.LoggingDeprecationHandler +import org.opensearch.common.xcontent.XContentFactory +import org.opensearch.common.xcontent.XContentType import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.core.xcontent.ToXContent -import org.opensearch.common.xcontent.XContentFactory import org.opensearch.core.xcontent.XContentParser -import org.opensearch.common.xcontent.XContentType -import org.opensearch.indexmanagement.opensearchapi.string import org.opensearch.index.seqno.SequenceNumbers import org.opensearch.indexmanagement.indexstatemanagement.randomChannel +import org.opensearch.indexmanagement.opensearchapi.string import org.opensearch.indexmanagement.opensearchapi.toMap import org.opensearch.indexmanagement.randomCronSchedule import org.opensearch.indexmanagement.randomInstant @@ -39,9 +38,9 @@ import org.opensearch.snapshots.Snapshot import org.opensearch.snapshots.SnapshotId import org.opensearch.snapshots.SnapshotInfo import org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength -import org.opensearch.test.OpenSearchTestCase.randomBoolean -import org.opensearch.test.OpenSearchTestCase.randomIntBetween import org.opensearch.test.OpenSearchTestCase.randomNonNegativeLong +import org.opensearch.test.OpenSearchTestCase.randomIntBetween +import org.opensearch.test.OpenSearchTestCase.randomBoolean import org.opensearch.test.rest.OpenSearchRestTestCase import java.time.Instant import java.time.temporal.ChronoUnit @@ -242,7 +241,7 @@ fun mockInProgressSnapshotInfo( emptyList(), randomNonNegativeLong(), randomNonNegativeLong(), - ImmutableOpenMap.of(), + mapOf(), "", mapOf("sm_policy" to "daily-snapshot"), Version.CURRENT, From 47c930fdae47301d760a9eeb00ec9373abb87a6d Mon Sep 17 00:00:00 2001 From: Petar Dzepina Date: Mon, 1 May 2023 19:17:38 +0200 Subject: [PATCH 2/4] ec Signed-off-by: Petar Dzepina From 9150f9adfb6491f56543b2cdacea24087f28a7dc Mon Sep 17 00:00:00 2001 From: Petar Dzepina Date: Thu, 4 May 2023 18:27:27 +0200 Subject: [PATCH 3/4] up'd gradle version to 8.1.1 Signed-off-by: Petar Dzepina --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 774fae876..fae08049a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From fdaa2d85fa4cc055ae5c70cf9e092fccc7114edb Mon Sep 17 00:00:00 2001 From: Petar Dzepina Date: Sun, 7 May 2023 18:47:01 +0200 Subject: [PATCH 4/4] gradle fix Signed-off-by: Petar Dzepina --- build-tools/coverage.gradle | 4 ++-- build-tools/pkgbuild.gradle | 12 +++++------- build.gradle | 2 +- spi/build.gradle | 17 ++++++++--------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/build-tools/coverage.gradle b/build-tools/coverage.gradle index fd9530964..dd4545a31 100644 --- a/build-tools/coverage.gradle +++ b/build-tools/coverage.gradle @@ -51,8 +51,8 @@ jacocoTestReport { sourceDirectories.from = "src/main/kotlin" classDirectories.from = sourceSets.main.output reports { - html.enabled = true // human readable - xml.enabled = true // for coverlay + html.required = true // human readable + xml.required = true // for coverlay } } diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle index 6425d1e78..a6df367fd 100644 --- a/build-tools/pkgbuild.gradle +++ b/build-tools/pkgbuild.gradle @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -apply plugin: 'nebula.ospackage' +apply plugin: 'com.netflix.nebula.ospackage' // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name afterEvaluate { @@ -44,9 +44,8 @@ afterEvaluate { task renameRpm(type: Copy) { from("$buildDir/distributions") into("$buildDir/distributions") - include archiveName - rename archiveName, "${packageName}-${version}.rpm" - doLast { delete file("$buildDir/distributions/$archiveName") } + rename "$archiveFileName", "${packageName}-${archiveVersion}.rpm" + doLast { delete file("$buildDir/distributions/$archiveFileName") } } } buildDeb { @@ -56,9 +55,8 @@ afterEvaluate { task renameDeb(type: Copy) { from("$buildDir/distributions") into("$buildDir/distributions") - include archiveName - rename archiveName, "${packageName}-${version}.deb" - doLast { delete file("$buildDir/distributions/$archiveName") } + rename "$archiveFileName", "${packageName}-${archiveVersion}.deb" + doLast { delete file("$buildDir/distributions/$archiveFileName") } } } } diff --git a/build.gradle b/build.gradle index 1d6a2dc9e..6048f5098 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ buildscript { } plugins { - id 'nebula.ospackage' version "8.3.0" + id 'com.netflix.nebula.ospackage' version "11.0.0" id "com.dorongold.task-tree" version "2.1.1" } diff --git a/spi/build.gradle b/spi/build.gradle index 4b398668a..4054d3350 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -25,13 +25,13 @@ ext { jacoco { toolVersion = '0.8.7' - reportsDir = file("$buildDir/JacocoReport") + reportsDirectory = file("$buildDir/JacocoReport") } jacocoTestReport { reports { - xml.enabled false - csv.enabled false + xml.required = false + csv.required = false html.destination file("${buildDir}/jacoco/") } } @@ -70,7 +70,7 @@ idea.module { } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } @@ -84,12 +84,11 @@ test { } task integTest(type: RestIntegTestTask) { - description 'Run integ test with opensearch test framework' - group 'verification' - systemProperty 'tests.security.manager', 'false' - dependsOn test + description = "Run integration tests against integTest cluster" + testClassesDirs = sourceSets.test.output.classesDirs + classpath = sourceSets.test.runtimeClasspath } -check.dependsOn integTest +tasks.named("check").configure { dependsOn(integTest) } testClusters.javaRestTest { testDistribution = 'INTEG_TEST'