Merge pull request #153 from sentrysoftware/feature/issue-115-develop…

…-http-extension

Issue #115: Develop HTTP Extension

metricshub-agent/src/main/java/org/sentrysoftware/metricshub/agent/config/protocols/ProtocolsConfig.java

@@ -59,7 +59,8 @@ public class ProtocolsConfig {
 	private WmiProtocolConfig wmi;
 
 	@JsonSetter(nulls = SKIP)
-	private HttpProtocolConfig http;
+	@JsonDeserialize(using = ExtensionConfigDeserializer.class)
+	private IConfiguration http;
 
 	@JsonSetter(nulls = SKIP)
 	private OsCommandProtocolConfig osCommand;

metricshub-agent/src/main/java/org/sentrysoftware/metricshub/agent/helper/ConfigHelper.java

@@ -69,7 +69,6 @@
 import org.sentrysoftware.metricshub.agent.config.ResourceConfig;
 import org.sentrysoftware.metricshub.agent.config.ResourceGroupConfig;
 import org.sentrysoftware.metricshub.agent.config.protocols.AbstractProtocolConfig;
-import org.sentrysoftware.metricshub.agent.config.protocols.HttpProtocolConfig;
 import org.sentrysoftware.metricshub.agent.config.protocols.IpmiProtocolConfig;
 import org.sentrysoftware.metricshub.agent.config.protocols.OsCommandProtocolConfig;
 import org.sentrysoftware.metricshub.agent.config.protocols.ProtocolsConfig;
@@ -110,7 +109,6 @@
 public class ConfigHelper {
 
 	private static final String OS_COMMAND = "OSCommand";
-	private static final String HTTP_PROTOCOL = "HTTP";
 	private static final String WMI_PROTOCOL = "WMI";
 	private static final String WBEM_PROTOCOL = "WBEM";
 	private static final String SSH_PROTOCOL = "SSH";
@@ -971,9 +969,9 @@ private static void validateProtocols(@NonNull final String resourceKey, final R
 			validateWmiInfo(resourceKey, wmiConfig.getTimeout());
 		}
 
-		final HttpProtocolConfig httpConfig = protocolsConfig.getHttp();
+		final IConfiguration httpConfig = protocolsConfig.getHttp();
 		if (httpConfig != null) {
-			validateHttpInfo(resourceKey, httpConfig.getTimeout(), httpConfig.getPort());
+			httpConfig.validateConfiguration(resourceKey);
 		}
 
 		final OsCommandProtocolConfig osCommandConfig = protocolsConfig.getOsCommand();
@@ -1125,29 +1123,6 @@ static void validateWmiInfo(final String resourceKey, final Long timeout) throws
 		);
 	}
 
-	/**
-	 * Validate the given HTTP information (timeout and port)
-	 *
-	 * @param resourceKey Resource unique identifier
-	 * @param timeout     How long until the HTTP request times out
-	 * @param port        The HTTP port number used to perform REST queries
-	 * @throws InvalidConfigurationException
-	 */
-	static void validateHttpInfo(final String resourceKey, final Long timeout, final Integer port)
-		throws InvalidConfigurationException {
-		StringHelper.validateConfigurationAttribute(
-			timeout,
-			INVALID_TIMEOUT_CHECKER,
-			() -> String.format(TIMEOUT_ERROR, resourceKey, HTTP_PROTOCOL, timeout)
-		);
-
-		StringHelper.validateConfigurationAttribute(
-			port,
-			INVALID_PORT_CHECKER,
-			() -> String.format(PORT_ERROR, resourceKey, HTTP_PROTOCOL, port)
-		);
-	}
-
 	/**
 	 * Validate the given OS Command information: timeout
 	 *
@@ -1184,7 +1159,6 @@ static HostConfiguration buildHostConfiguration(
 				Stream
 					.of(
 						protocols.getSsh(),
-						protocols.getHttp(),
 						protocols.getWbem(),
 						protocols.getWmi(),
 						protocols.getOsCommand(),
@@ -1202,7 +1176,7 @@ static HostConfiguration buildHostConfiguration(
 			? new HashMap<>()
 			: new HashMap<>(
 				Stream
-					.of(protocols.getSnmp())
+					.of(protocols.getSnmp(), protocols.getHttp())
 					.filter(Objects::nonNull)
 					.collect(Collectors.toMap(IConfiguration::getClass, Function.identity()))
 			);

metricshub-agent/src/main/java/org/sentrysoftware/metricshub/cli/service/protocol/HttpConfigCli.java

@@ -21,17 +21,23 @@
  * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
  */
 
+import com.fasterxml.jackson.databind.node.BooleanNode;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.sentrysoftware.metricshub.engine.configuration.HttpConfiguration;
+import org.sentrysoftware.metricshub.cli.service.CliExtensionManager;
+import org.sentrysoftware.metricshub.engine.common.exception.InvalidConfigurationException;
 import org.sentrysoftware.metricshub.engine.configuration.IConfiguration;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
 
 /**
  * This class is used by MetricsHubCliService to configure Http protocol when using the MetricsHub CLI.
- * It create the engine's {@link HttpConfiguration} object that is used to monitor a specific resource through REST.
+ * It create the engine's {@link IConfiguration} for HTTP object that is used to monitor a specific resource through REST.
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -92,23 +98,31 @@ public static class HttpOrHttps {
 		defaultValue = "" + DEFAULT_TIMEOUT,
 		description = "Timeout in seconds for HTTP operations (default: ${DEFAULT-VALUE} s)"
 	)
-	private long timeout;
+	private String timeout;
 
 	/**
 	 * @param defaultUsername Username specified at the top level of the CLI (with the --username option)
 	 * @param defaultPassword Password specified at the top level of the CLI (with the --password option)
 	 * @return an HttpProtocol instance corresponding to the options specified by the user in the CLI
+	 * @throws InvalidConfigurationException
 	 */
 	@Override
-	public IConfiguration toProtocol(String defaultUsername, char[] defaultPassword) {
-		return HttpConfiguration
-			.builder()
-			.https(isHttps())
-			.port(getOrDeducePortNumber())
-			.username(username == null ? defaultUsername : username)
-			.password(username == null ? defaultPassword : password)
-			.timeout(timeout)
-			.build();
+	public IConfiguration toProtocol(String defaultUsername, char[] defaultPassword)
+		throws InvalidConfigurationException {
+		final ObjectNode configuration = JsonNodeFactory.instance.objectNode();
+		configuration.set("https", BooleanNode.valueOf(isHttps()));
+		configuration.set("username", new TextNode(username == null ? defaultUsername : username));
+		configuration.set(
+			"password",
+			new TextNode(username == null ? String.valueOf(defaultPassword) : String.valueOf(password))
+		);
+		configuration.set("port", new IntNode(getOrDeducePortNumber()));
+		configuration.set("timeout", new TextNode(timeout));
+
+		return CliExtensionManager
+			.getExtensionManagerSingleton()
+			.buildConfigurationFromJsonNode("http", configuration, value -> value)
+			.orElseThrow();
 	}
 
 	/**

metricshub-agent/src/test/java/org/sentrysoftware/metricshub/agent/extension/HttpTestConfiguration.java

@@ -0,0 +1,74 @@
+package org.sentrysoftware.metricshub.agent.extension;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.sentrysoftware.metricshub.engine.common.exception.InvalidConfigurationException;
+import org.sentrysoftware.metricshub.engine.common.helpers.StringHelper;
+import org.sentrysoftware.metricshub.engine.configuration.IConfiguration;
+import org.sentrysoftware.metricshub.engine.deserialization.TimeDeserializer;
+
+/**
+ * The HttpConfiguration class represents the configuration for HTTP connections in the MetricsHub engine.
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class HttpTestConfiguration implements IConfiguration {
+
+	@Default
+	private final Boolean https = true;
+
+	@Default
+	private final Integer port = 443;
+
+	@Default
+	@JsonDeserialize(using = TimeDeserializer.class)
+	private final Long timeout = 120L;
+
+	private String username;
+	private char[] password;
+
+	@Override
+	public String toString() {
+		return String.format(
+			"%s/%d%s",
+			Boolean.TRUE.equals(https) ? "HTTPS" : "HTTP",
+			port,
+			username != null ? " as " + username : ""
+		);
+	}
+
+	@Override
+	public void validateConfiguration(String resourceKey) throws InvalidConfigurationException {
+		StringHelper.validateConfigurationAttribute(
+			timeout,
+			attr -> attr == null || attr < 0L,
+			() ->
+				String.format(
+					"Resource %s - Timeout value is invalid for protocol %s." +
+					" Timeout value returned: %s. This resource will not be monitored. Please verify the configured timeout value.",
+					resourceKey,
+					"HTTP",
+					timeout
+				)
+		);
+
+		StringHelper.validateConfigurationAttribute(
+			port,
+			attr -> attr == null || attr < 1 || attr > 65535,
+			() ->
+				String.format(
+					"Resource %s - Invalid port configured for protocol %s. Port value returned: %s." +
+					" This resource will not be monitored. Please verify the configured port value.",
+					resourceKey,
+					"HTTP",
+					port
+				)
+		);
+	}
+}