Rename sql release artifacts (#1007)

opendistro-for-elasticsearch · Jan 26, 2021 · 5c19cca · 5c19cca
1 parent 1101df0
commit 5c19cca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -15,7 +15,7 @@ repositories {
 }
 
 esplugin {
-    name 'opendistro_sql'
+    name 'opendistro-sql'
     description 'Open Distro for Elasticsearch SQL'
     classname 'com.amazon.opendistroforelasticsearch.sql.plugin.SQLPlugin'
     licenseFile rootProject.file("LICENSE.txt")
@@ -121,13 +121,27 @@ afterEvaluate {
 
     buildRpm {
         arch = 'NOARCH'
-        archiveName "${packageName}-${version}.rpm"
         dependsOn 'assemble'
+        finalizedBy 'renameRpm'
+        task renameRpm(type: Copy) {
+            from("$buildDir/distributions")
+            into("$buildDir/distributions")
+            include archiveName
+            rename archiveName, "${packageName}-${version}.rpm"
+            doLast { delete file("$buildDir/distributions/$archiveName") }
+        }
     }
 
     buildDeb {
-        arch = 'amd64'
-        archiveName "${packageName}-${version}.deb"
+        arch = 'all'
         dependsOn 'assemble'
+        finalizedBy 'renameDeb'
+        task renameDeb(type: Copy) {
+            from("$buildDir/distributions")
+            into("$buildDir/distributions")
+            include archiveName
+            rename archiveName, "${packageName}-${version}.deb"
+            doLast { delete file("$buildDir/distributions/$archiveName") }
+        }
     }
 }
diff --git a/sql-odbc/src/odfesqlodbc/es_communication.cpp b/sql-odbc/src/odfesqlodbc/es_communication.cpp
@@ -36,7 +36,7 @@ static const std::string SQL_ENDPOINT_FORMAT_JDBC =
 static const std::string SQL_ENDPOINT_CLOSE_CURSOR = "/_opendistro/_sql/close";
 static const std::string PLUGIN_ENDPOINT_FORMAT_JSON =
     "/_cat/plugins?format=json";
-static const std::string OPENDISTRO_SQL_PLUGIN_NAME = "opendistro_sql";
+static const std::string OPENDISTRO_SQL_PLUGIN_NAME = "opendistro-sql";
 static const std::string ALLOCATION_TAG = "AWS_SIGV4_AUTH";
 static const std::string SERVICE_NAME = "es";
 static const std::string ESODBC_PROFILE_NAME = "elasticsearchodbc";