fixup! fixup! fix: Honor c8y.mqtt setting on tedge connect thin-edge#…

…2787

crates/common/tedge_config/src/tedge_config_cli/models/host_port.rs

@@ -58,14 +58,6 @@ impl<const P: u16> HostPort<P> {
     pub fn port(&self) -> Port {
         self.port
     }
-
-    /// Returns a string representation of the host.
-    ///
-    /// In practice, it just returns the input string used to construct the
-    /// struct.
-    pub fn as_str(&self) -> &str {
-        &self.input
-    }
 }
 
 impl<const P: u16> From<HostPort<P>> for String {

crates/core/c8y_api/src/http_proxy.rs

@@ -107,7 +107,7 @@ impl C8yEndPoint {
 
         let (_, host) = url_host.split_once('.').unwrap_or((url_host, ""));
         let (_, c8y_host) = tenant_uri.split_once('.').unwrap();
-        (host == c8y_host).then_some(url)
+        (c8y_host.starts_with(host)).then_some(url)
     }
 }
 

crates/core/tedge/src/cli/certificate/upload.rs

@@ -82,7 +82,7 @@ impl UploadCertCmd {
         // and therefore we need to get tenant_id.
         let tenant_id = get_tenant_id_blocking(
             &client,
-            build_get_tenant_id_url(self.host.as_str())?,
+            build_get_tenant_id_url(&self.host.to_string())?,
             &self.username,
             &password,
         )?;
@@ -95,7 +95,7 @@ impl UploadCertCmd {
         tenant_id: &str,
         password: &str,
     ) -> Result<(), CertError> {
-        let post_url = build_upload_certificate_url(self.host.as_str(), tenant_id)?;
+        let post_url = build_upload_certificate_url(&self.host.to_string(), tenant_id)?;
 
         let post_body = UploadCertBody {
             auto_registration_enabled: true,