Update code gen interface for connect

Author: yourslab

eventstreamrpc/source/EventStreamClient.cpp

@@ -253,6 +253,7 @@ namespace Aws
 
         bool ConnectionLifecycleHandler::OnErrorCallback(int errorCode)
         {
+            (void) errorCode;
             /* Returning true implies that the connection will close upon receiving an error. */
             return true;
         }

ipc/include/aws/greengrass/GreengrassCoreIpcClient.h

@@ -28,7 +28,7 @@ namespace Aws
                 Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
             std::future<RpcError> Connect(
                 ConnectionLifecycleHandler &lifecycleHandler,
-                const ConnectionConfig &connectionConfig = DefaultConnectionConfig()) noexcept;
+                ConnectionConfig connectionConfig = DefaultConnectionConfig()) noexcept;
             void Close() noexcept;
             SubscribeToIoTCoreOperation NewSubscribeToIoTCore(SubscribeToIoTCoreStreamHandler &) noexcept;
             PublishToIoTCoreOperation NewPublishToIoTCore() noexcept;

ipc/source/GreengrassCoreIpcClient.cpp

@@ -38,8 +38,14 @@ namespace Aws
 
         std::future<RpcError> GreengrassCoreIpcClient::Connect(
             ConnectionLifecycleHandler &lifecycleHandler,
-            const ConnectionConfig& connectionConfig) noexcept
+            ConnectionConfig connectionConfig) noexcept
         {
+            /* If a client bootstrap has not been set in the config, use the one from the client. */
+            if (connectionConfig.GetClientBootstrap() == nullptr)
+            {
+                connectionConfig.SetClientBootstrap(&m_clientBootstrap);
+            }
+
             return m_connection.Connect(
                 connectionConfig, &lifecycleHandler, connectionConfig.GetConnectMessageAmender(), m_clientBootstrap);
         }

ipc/tests/EchoClientTest.cpp

@@ -40,8 +40,8 @@ static int s_connectToServer(struct aws_allocator *allocator, void *ctx)
 
         ConnectionLifecycleHandler lifecycleHandler;
         Awstest::EchoTestRpcClient client(clientBootstrap);
-        // auto connectedStatus = client.Connect(lifecycleHandler);
-        // ASSERT_TRUE(connectedStatus.get().baseStatus == EVENT_STREAM_RPC_SUCCESS);
+        auto connectedStatus = client.Connect(lifecycleHandler);
+        ASSERT_TRUE(connectedStatus.get().baseStatus == EVENT_STREAM_RPC_SUCCESS);
 
         client.Close();
     }

ipc/tests/EchoTestRpcClient.cpp

@@ -14,9 +14,16 @@ namespace Awstest
 
     std::future<RpcError> EchoTestRpcClient::Connect(
         ConnectionLifecycleHandler &lifecycleHandler,
-        const ConnectionConfig &connectionConfig) noexcept
+        ConnectionConfig connectionConfig) noexcept
     {
-        return m_connection.Connect(connectionConfig, &lifecycleHandler, connectionConfig.GetConnectMessageAmender(), m_clientBootstrap);
+        /* If a client bootstrap has not been set in the config, use the one from the client. */
+        if (connectionConfig.GetClientBootstrap() == nullptr)
+        {
+            connectionConfig.SetClientBootstrap(&m_clientBootstrap);
+        }
+
+        return m_connection.Connect(
+            connectionConfig, &lifecycleHandler, connectionConfig.GetConnectMessageAmender(), m_clientBootstrap);
     }
 
     void EchoTestRpcClient::Close() noexcept { m_connection.Close(); }

ipc/tests/include/awstest/EchoTestRpcClient.h

@@ -26,7 +26,7 @@ namespace Awstest
             Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
         std::future<RpcError> Connect(
             ConnectionLifecycleHandler &lifecycleHandler,
-            const ConnectionConfig &connectionConfig = DefaultConnectionConfig()) noexcept;
+            ConnectionConfig connectionConfig = DefaultConnectionConfig()) noexcept;
         void Close() noexcept;
         GetAllProductsOperation NewGetAllProducts() noexcept;
         CauseServiceErrorOperation NewCauseServiceError() noexcept;