From 5faeb36000ed1b08e53ad70adcb7d051ce8e073d Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Wed, 4 Jan 2023 15:00:31 +0100 Subject: [PATCH] Cleanup and fix username in drone pipeline. --- .drone.yml | 12 ++++++------ .../src/main/java/sysmon/client/ScriptWrapper.java | 7 ++++--- .../sysmon/plugins/base/BaseFilesystemExtension.java | 1 - .../sysmon/server/ComboResultToPointProcessor.java | 1 - .../sysmon/server/MetricResultToPointProcessor.java | 1 - shared/src/main/java/sysmon/shared/Measurement.java | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6377d8b..507f360 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,12 +15,12 @@ steps: from_secret: auth # Name of DroneCI secret exposed above commands: - ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository - - for file in server/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in server/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in client/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in client/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in plugins/build/distributions/*.deb ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in plugins/build/distributions/*.rpm ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in server/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in server/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in client/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in client/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in plugins/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in plugins/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done when: event: - tag diff --git a/client/src/main/java/sysmon/client/ScriptWrapper.java b/client/src/main/java/sysmon/client/ScriptWrapper.java index 9b53a33..ed42b89 100644 --- a/client/src/main/java/sysmon/client/ScriptWrapper.java +++ b/client/src/main/java/sysmon/client/ScriptWrapper.java @@ -9,6 +9,7 @@ import sysmon.shared.MetricScript; import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; public class ScriptWrapper { @@ -20,9 +21,9 @@ public class ScriptWrapper { public ScriptWrapper(String scriptPath, String scriptFile) { try { - Class scriptClass = loader.parseClass(new File(scriptPath, scriptFile)); - script = (GroovyObject) scriptClass.newInstance(); - } catch (IOException |InstantiationException | IllegalAccessException e) { + Class scriptClass = loader.parseClass(new File(scriptPath, scriptFile)); + script = (GroovyObject) scriptClass.getDeclaredConstructor().newInstance(); + } catch (IOException |InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { log.error("ScriptWrapper() - error: {}", e.getMessage()); } } diff --git a/plugins/base/src/main/java/sysmon/plugins/base/BaseFilesystemExtension.java b/plugins/base/src/main/java/sysmon/plugins/base/BaseFilesystemExtension.java index a1495c4..57c842e 100644 --- a/plugins/base/src/main/java/sysmon/plugins/base/BaseFilesystemExtension.java +++ b/plugins/base/src/main/java/sysmon/plugins/base/BaseFilesystemExtension.java @@ -33,7 +33,6 @@ public class BaseFilesystemExtension implements MetricExtension { add("/boot/efi"); }}; - private HardwareAbstractionLayer hardwareAbstractionLayer; private SystemInfo systemInfo; private List fileStores; private int refreshCounter = 0; diff --git a/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java b/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java index 70d6928..a900f87 100644 --- a/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java +++ b/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java @@ -8,7 +8,6 @@ import sysmon.shared.ComboResult; import sysmon.shared.Measurement; import sysmon.shared.MetricResult; -import java.util.Map; import java.util.concurrent.TimeUnit; public class ComboResultToPointProcessor implements Processor { diff --git a/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java b/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java index d95240e..e191091 100644 --- a/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java +++ b/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java @@ -8,7 +8,6 @@ import sysmon.shared.Measurement; import sysmon.shared.MetricResult; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; public class MetricResultToPointProcessor implements Processor { diff --git a/shared/src/main/java/sysmon/shared/Measurement.java b/shared/src/main/java/sysmon/shared/Measurement.java index 499cbd4..c3f4da8 100644 --- a/shared/src/main/java/sysmon/shared/Measurement.java +++ b/shared/src/main/java/sysmon/shared/Measurement.java @@ -1,7 +1,6 @@ package sysmon.shared; import java.io.Serializable; -import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.TreeMap;