Merge branch 'main' into opensearch-serverless

.github/workflows/publish-snapshots.yml

@@ -0,0 +1,30 @@
+name: Publish snapshots to maven
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-publish-snapshots:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: adopt
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
+          aws-region: us-east-1
+      - name: publish snapshots to maven
+        run: |
+          export SONATYPE_USERNAME=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-username --query SecretString --output text)
+          export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
+          ./gradlew --no-daemon publishPublishMavenPublicationToSnapshotsRepository

CHANGELOG.md

@@ -10,6 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add support for signing service name in AwsSdk2Transport ([#324](https://github.com/opensearch-project/opensearch-java/pull/324))
 - Add 1-click release workflows ([#321](https://github.com/opensearch-project/opensearch-java/pull/321))
 - Add new `OpenSearchTransport` based on Apache HttpClient 5 ([#281](https://github.com/opensearch-project/opensearch-java/pull/281))
+- Add workflow to publish snapshots via GHA ([#325](https://github.com/opensearch-project/opensearch-java/pull/325))
 
 ### Dependencies
 - Bumps `classgraph` from 4.8.149 to 4.8.154
@@ -39,6 +40,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Fixed
 - Make ChildrenAggregate as a SingleBucketAggregate ([#306](https://github.com/opensearch-project/opensearch-java/pull/306))
 - Fix /_nodes/stats, /_nodes/info throwing serialization error ([#315](https://github.com/opensearch-project/opensearch-java/pull/315))
+- Fix AwsSdk2TransportOptions.responseCompression ([#322](https://github.com/opensearch-project/opensearch-java/pull/322))
 
 ### Security
 

README.md

@@ -35,7 +35,7 @@ Please see the [USER_GUIDE](USER_GUIDE.md) for code snippets.
 * [Documentation](https://opensearch.org/docs/latest/clients/java/)
 * [JavaDoc](https://www.javadoc.io/doc/org.opensearch.client/opensearch-java/latest/index.html)
 * [Maven Central](https://search.maven.org/artifact/org.opensearch.client/opensearch-java)
-* [Snapshot Builds](https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/client/opensearch-java/)
+* [Snapshot Builds](#snapshot-builds)
 * Need help? Try [Forums](https://discuss.opendistrocommunity.dev/)
 * [Project Principles](https://opensearch.org/#principles)
 * [Contributing to OpenSearch](CONTRIBUTING.md)
@@ -52,6 +52,9 @@ This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUC
 
 See [User Guide](USER_GUIDE.md).
 
+## Snapshot Builds
+The [snapshots builds](https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/client/opensearch-java/) are published to sonatype using [publish-snapshots.yml](./.github/workflows/publish-snapshots.yml) workflow. Each `push` event to the main branch triggers this workflow.
+
 ## Compatibility with OpenSearch
 
 See [Compatibility](COMPATIBILITY.md).

java-client/build.gradle.kts

@@ -259,8 +259,11 @@ publishing {
     repositories{
         if (version.toString().endsWith("SNAPSHOT")) {
             maven("https://aws.oss.sonatype.org/content/repositories/snapshots/") {
-                name = "snapshotRepo"
-                credentials(PasswordCredentials::class)
+                name = "Snapshots"
+                credentials {
+                    username = System.getenv("SONATYPE_USERNAME")
+                    password = System.getenv("SONATYPE_PASSWORD")
+                }
             }
         }
         maven("${rootProject.buildDir}/repository") {

java-client/src/main/java/org/opensearch/client/transport/aws/AwsSdk2TransportOptions.java

@@ -173,6 +173,7 @@ class DefaultImpl extends TransportOptions.DefaultImpl implements AwsSdk2Transpo
             super(builder);
             credentials = builder.credentials;
             requestCompressionSize = builder.requestCompressionSize;
+            responseCompression = builder.responseCompression;
             mapper = builder.mapper;
         }
 

java-client/src/test/java/org/opensearch/client/transport/aws/AwsSdk2TransportOptionsTestCase.java

@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+package org.opensearch.client.transport.aws;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AwsSdk2TransportOptionsTestCase extends Assert {
+    @Test
+    public void testBuilderResponseCompression() throws Exception {
+        AwsSdk2TransportOptions options = AwsSdk2TransportOptions.builder()
+            .setResponseCompression(true)
+            .setRequestCompressionSize(10)
+            .build();
+        assertEquals(10, options.requestCompressionSize().intValue());
+        assertTrue(options.responseCompression());
+    }
+}