Rename plugin for more consistent naming convention (#339)

* Rename plugin name * Change buildDeb arch from 'amd64' to 'all' * Add artifact rename tasks for buildRpm and buildDeb
opendistro-for-elasticsearch · Jan 26, 2021 · 6ba2426 · 6ba2426
1 parent 42506c2
commit 6ba2426
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -36,7 +36,7 @@ if (isSnapshot) {
 }
 
 esplugin {
-    name 'opendistro_alerting'
+    name 'opendistro-alerting'
     description 'Amazon OpenDistro alerting plugin'
     classname 'com.amazon.opendistroforelasticsearch.alerting.AlertingPlugin'
     extendedPlugins = ['lang-painless']

diff --git a/...est/kotlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/MonitorRestApiIT.kt b/...est/kotlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/MonitorRestApiIT.kt
@@ -70,7 +70,7 @@ class MonitorRestApiIT : AlertingRestTestCase() {
         for (nodeInfo in nodesInfo.values) {
             val plugins = nodeInfo["plugins"] as List<Map<String, Any>>
             for (plugin in plugins) {
-                if (plugin["name"] == "opendistro_alerting") {
+                if (plugin["name"] == "opendistro-alerting") {
                     return
                 }
             }

diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle
@@ -34,13 +34,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") }
+        }
     }
 }