Update version to 1.0 beta

.github/workflows/gradle.yml

@@ -52,7 +52,17 @@ jobs:
       run: ./gradlew publishToMavenLocal
     - name: Build PA gradle using the new RCA jar
       working-directory: ./tmp/pa
-      run: rm licenses/performanceanalyzer-rca-1.13.jar.sha1
+      run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1
+    # PA depends on OpenSearch. Checkout and publish to maven local for PA build.
+    - name: Checkout OpenSearch
+      uses: actions/checkout@v2
+      with:
+        repository: 'opensearch-project/OpenSearch'
+        path: OpenSearch
+        ref: '1.0.0-alpha1'
+    - name: Build OpenSearch
+      working-directory: ./OpenSearch
+      run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha1 -Dbuild.snapshot=false
     - name: Update SHA
       working-directory: ./tmp/pa
       run: ./gradlew updateShas

build.gradle

@@ -80,16 +80,16 @@ distZip {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = 'com.amazon.opendistro.opensearch'
+            groupId = 'com.amazon.opensearch'
             artifactId = 'performanceanalyzer-rca'
-            version = '1.13'
+            version = '1.0.0.0-beta1'
             from components.java
         }
     }
 }
 
 ext {
-    opendistroVersion = '1.13'
+    opensearchVersion = '1.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
     gitDefaultBranch = 'main'
 }
@@ -209,7 +209,7 @@ jacocoTestCoverageVerification {
 check.dependsOn jacocoTestCoverageVerification
 
 
-version = "${opendistroVersion}.0"
+version = "${opensearchVersion}.0"
 if (isSnapshot) {
     version += "-SNAPSHOT"
 }
@@ -371,7 +371,7 @@ task cloneGitRepo(type: GitClone) {
 
 task removeLicenses(type: Delete) {
     dependsOn(cloneGitRepo)
-    def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.13.jar.sha1')
+    def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1')
     delete(toDelete)
 }
 
@@ -394,7 +394,7 @@ task copyAllArtifacts(type: Copy) {
     def projectPathStr = getProjectDir().toPath().toString()
     def dockerArtifacts = Paths.get(projectPathStr, 'docker').toString()
     def rcaArtifacts = Paths.get(projectPathStr, 'build', 'distributions', 'performance-analyzer-rca.zip')
-    def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip')
+    def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip')
     // Replace this path to point to opensearch artifact local location
     def opensearchArtifacts = Paths.get('../opensearch-oss-7.10.3-SNAPSHOT-linux-x86_64.tar.gz')
 

docker/Dockerfile

@@ -61,10 +61,10 @@ COPY --chown=1000:0 opensearch.yml log4j2.properties config/
 
 COPY --chown=1000:0 performance-analyzer-rca.zip config/
 
-COPY --chown=1000:0 opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip /tmp/
+COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip /tmp/
 
-RUN opensearch-plugin install --batch file:///tmp/opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip; \
-        rm /tmp/opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip
+RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip; \
+        rm /tmp/opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip
 
 USER 0
 
@@ -74,8 +74,8 @@ RUN chown -R opensearch:0 . && \
 
 RUN unzip config/performance-analyzer-rca.zip
 
-RUN cp -r performance-analyzer-rca/* plugins/opendistro-performance-analyzer/
-RUN chmod 755 /usr/share/opensearch/plugins/opendistro-performance-analyzer/pa_bin/performance-analyzer-agent
+RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/
+RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent
 RUN chmod -R 755 /dev/shm
 ################################################################################
 # Build stage 1 (the actual opendistroforelasticsearch image):
@@ -139,7 +139,7 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \
     chmod 0775 /usr/local/bin/docker-entrypoint.sh
 
 # Bind to all interfaces so that the docker container is accessible from the host machine
-RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/share/opensearch/plugins/opendistro-performance-analyzer/pa_config/performance-analyzer.properties
+RUN sed -i "s|#webservice-bind-host =|webservice-bind-host = 0.0.0.0|g" /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_config/performance-analyzer.properties
 
 EXPOSE 9200 9300 9600 9650
 

docker/docker-entrypoint.sh

@@ -82,13 +82,13 @@ if [[ "$(id -u)" == "0" ]]; then
     fi
 fi
 
-if [[ -d "/usr/share/opensearch/plugins/opendistro_security" ]]; then
+if [[ -d "/usr/share/opensearch/plugins/opensearch_security" ]]; then
     # Install Demo certificates for Security Plugin and update the opensearch.yml
     # file to use those certificates.
-    /usr/share/opensearch/plugins/opendistro_security/tools/install_demo_configuration.sh -y -i -s
+    /usr/share/opensearch/plugins/opensearch_security/tools/install_demo_configuration.sh -y -i -s
 fi
 
-if [[ -d "/usr/share/opensearch/plugins/opendistro-performance-analyzer" ]]; then
+if [[ -d "/usr/share/opensearch/plugins/opensearch-performance-analyzer" ]]; then
     CLK_TCK=`/usr/bin/getconf CLK_TCK`
     DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
     OPENSEARCH_JAVA_OPTS="-Djava.security.policy=file:///usr/share/opensearch/performance-analyzer-rca/pa_config/opensearch_security.policy -Dclk.tck=$CLK_TCK -Djdk.attach.allowAttachSelf=true $OPENSEARCH_JAVA_OPTS"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Tue Jan 28 11:59:31 PST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists