chore: Use constant for HTTP port name

Author: siegfriedweber

rust/operator-binary/src/controller.rs

@@ -53,6 +53,11 @@ mod dereference;
 mod update_status;
 mod validate;
 
+pub const HTTP_PORT_NAME: &str = "http";
+pub const HTTP_PORT: Port = Port(9200);
+pub const TRANSPORT_PORT_NAME: &str = "transport";
+pub const TRANSPORT_PORT: Port = Port(9300);
+
 /// Names in the controller context which are passed to the submodules of the controller
 ///
 /// The names are not directly defined in [`Context`] because not every submodule requires a

rust/operator-binary/src/controller/build/role_builder.rs

@@ -22,10 +22,8 @@ use stackable_operator::{
 
 use crate::{
     controller::{
-        ContextNames, ValidatedCluster,
-        build::role_group_builder::{
-            HTTP_PORT, HTTP_PORT_NAME, RoleGroupBuilder, TRANSPORT_PORT, TRANSPORT_PORT_NAME,
-        },
+        ContextNames, HTTP_PORT, HTTP_PORT_NAME, TRANSPORT_PORT, TRANSPORT_PORT_NAME,
+        ValidatedCluster, build::role_group_builder::RoleGroupBuilder,
     },
     framework::{
         NameIsValidLabelValue,

rust/operator-binary/src/controller/build/role_group_builder.rs

@@ -41,7 +41,8 @@ use super::{
 use crate::{
     constant,
     controller::{
-        ContextNames, OpenSearchRoleGroupConfig, ValidatedCluster,
+        ContextNames, HTTP_PORT, HTTP_PORT_NAME, OpenSearchRoleGroupConfig, TRANSPORT_PORT,
+        TRANSPORT_PORT_NAME, ValidatedCluster,
         build::product_logging::config::{
             MAX_OPENSEARCH_SERVER_LOG_FILES_SIZE, vector_config_file_extra_env_vars,
         },
@@ -61,7 +62,6 @@ use crate::{
         },
         role_group_utils::ResourceNames,
         types::{
-            common::Port,
             kubernetes::{
                 ListenerName, PersistentVolumeClaimName, SecretClassName, ServiceAccountName,
                 ServiceName, VolumeName,
@@ -71,11 +71,6 @@ use crate::{
     },
 };
 
-pub const HTTP_PORT_NAME: &str = "http";
-pub const HTTP_PORT: Port = Port(9200);
-pub const TRANSPORT_PORT_NAME: &str = "transport";
-pub const TRANSPORT_PORT: Port = Port(9300);
-
 constant!(CONFIG_VOLUME_NAME: VolumeName = "config");
 
 constant!(LOG_CONFIG_VOLUME_NAME: VolumeName = "log-config");

rust/operator-binary/src/controller/validate.rs

@@ -14,7 +14,7 @@ use super::{
     ValidatedLogging, ValidatedOpenSearchConfig,
 };
 use crate::{
-    controller::{DereferencedObjects, ValidatedDiscoveryEndpoint},
+    controller::{DereferencedObjects, HTTP_PORT_NAME, ValidatedDiscoveryEndpoint},
     crd::v1alpha1::{self},
     framework::{
         builder::pod::container::{EnvVarName, EnvVarSet},
@@ -146,7 +146,11 @@ pub fn validate(
         role_group_configs.insert(role_group_name, validated_role_group_config);
     }
 
-    let validated_discovery_endpoint = validate_discovery_endpoint(dereferenced_objects)?;
+    let validated_discovery_endpoint = validate_discovery_endpoint(
+        dereferenced_objects
+            .maybe_discovery_service_listener
+            .as_ref(),
+    )?;
 
     Ok(ValidatedCluster::new(
         product_image,
@@ -259,11 +263,13 @@ fn validate_logging_configuration(
     })
 }
 
+/// Return the validated discovery endpoint if a Listener is given with a status containing the
+/// endpoint
 fn validate_discovery_endpoint(
-    dereferenced_objects: &DereferencedObjects,
+    maybe_discovery_service_listener: Option<&listener::v1alpha1::Listener>,
 ) -> Result<Option<ValidatedDiscoveryEndpoint>> {
     let validated_discovery_endpoint = if let Some(discovery_service_listener) =
-        &dereferenced_objects.maybe_discovery_service_listener
+        maybe_discovery_service_listener
     {
         if let Some((hostname, port)) = extract_listener_ingresses(discovery_service_listener)? {
             tracing::info!(
@@ -293,6 +299,7 @@ fn validate_discovery_endpoint(
     Ok(validated_discovery_endpoint)
 }
 
+/// Return the first address and the HTTP port from the given Listener if it has a status
 fn extract_listener_ingresses(
     discovery_service_listener: &listener::v1alpha1::Listener,
 ) -> Result<Option<(Hostname, Port)>> {
@@ -311,8 +318,7 @@ fn extract_listener_ingresses(
 
         let raw_port = *ingress_address
             .ports
-            // TODO Use HTTP_PORT_NAME somehow
-            .get("http")
+            .get(HTTP_PORT_NAME)
             .context(GetListenerStatusPortSnafu)?;
         let port = Port::try_from(raw_port).context(ParseListenerStatusPortSnafu)?;