Merge pull request #2865 from reubenmiller/fix-connect-domain-check

fix(cli): ignore port when comparing cloud urls
thin-edge · May 8, 2024 · e018063 · e018063
2 parents de11169 + 77a9f56
commit e018063
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs
@@ -139,8 +139,7 @@ impl Command for ConnectCommand {
                         .c8y
                         .mqtt
                         .or_none()
-                        .cloned()
-                        .map(|u| u.to_string())
+                        .map(|u| u.host().to_string())
                         .unwrap_or_default(),
                 );
             }

diff --git a/tests/RobotFramework/tests/tedge_connect/tedge_connect_test.robot b/tests/RobotFramework/tests/tedge_connect/tedge_connect_test.robot
@@ -33,6 +33,7 @@ tedge_connect_test_sm_services
     Should Contain    ${output}    Successfully created bridge connection!
     Should Contain    ${output}    tedge-agent service successfully started and enabled!
     Should Contain    ${output}    tedge-mapper-c8y service successfully started and enabled!
+    Should Not Contain  ${output}    Warning:    message=Warning should not be displayed if the port does not match. Issue #2863
 
 tedge_disconnect_test_sm_services
     ${output}=    Execute Command    sudo tedge disconnect c8y