Greengrass IPC update including MQTT 5 models (#576)

aws · May 9, 2023 · 609758a · 609758a
1 parent a9919b5
commit 609758a
Show file tree

Hide file tree

Showing 7 changed files with 1,705 additions and 1,582 deletions.
diff --git a/eventstream_rpc/tests/EchoTestRpcModel.cpp b/eventstream_rpc/tests/EchoTestRpcModel.cpp
diff --git a/eventstream_rpc/tests/include/awstest/EchoTestRpcClient.h b/eventstream_rpc/tests/include/awstest/EchoTestRpcClient.h
@@ -28,12 +28,10 @@ namespace Awstest
             Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
         /**
          * Connect the client to the server
-         * @param lifecycleHandler An interface that is called upon when lifecycle
-         * events relating to the connection occur.
-         * @param connectionConfig The configuration parameters used for establishing
-         * the connection.
-         * @return An `RpcError` that can be used to check whether the connection was
-         * established.
+         * @param lifecycleHandler An interface that is called upon when lifecycle events relating to the connection
+         * occur.
+         * @param connectionConfig The configuration parameters used for establishing the connection.
+         * @return An `RpcError` that can be used to check whether the connection was established.
          */
         std::future<RpcError> Connect(
             ConnectionLifecycleHandler &lifecycleHandler,

diff --git a/eventstream_rpc/tests/include/awstest/EchoTestRpcModel.h b/eventstream_rpc/tests/include/awstest/EchoTestRpcModel.h
diff --git a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h
@@ -30,12 +30,10 @@ namespace Aws
                 Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
             /**
              * Connect the client to the server
-             * @param lifecycleHandler An interface that is called upon when lifecycle
-             * events relating to the connection occur.
-             * @param connectionConfig The configuration parameters used for establishing
-             * the connection.
-             * @return An `RpcError` that can be used to check whether the connection was
-             * established.
+             * @param lifecycleHandler An interface that is called upon when lifecycle events relating to the connection
+             * occur.
+             * @param connectionConfig The configuration parameters used for establishing the connection.
+             * @return An `RpcError` that can be used to check whether the connection was established.
              */
             std::future<RpcError> Connect(
                 ConnectionLifecycleHandler &lifecycleHandler,

diff --git a/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h b/greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h
diff --git a/greengrass_ipc/source/GreengrassCoreIpcClient.cpp b/greengrass_ipc/source/GreengrassCoreIpcClient.cpp
@@ -1,10 +1,3 @@
-/**
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0.
- *
- * This file is generated.
- */
-
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
@@ -26,21 +19,27 @@ namespace Aws
             : m_connection(allocator), m_clientBootstrap(clientBootstrap), m_allocator(allocator),
               m_asyncLaunchMode(std::launch::deferred)
         {
+            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
+                Aws::Crt::String("aws.greengrass#InvalidArgumentsError"), InvalidArgumentsError::s_allocateFromPayload);
+            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
+                Aws::Crt::String("aws.greengrass#ServiceError"), ServiceError::s_allocateFromPayload);
+            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
+                Aws::Crt::String("aws.greengrass#UnauthorizedError"), UnauthorizedError::s_allocateFromPayload);
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#InvalidTokenError"), InvalidTokenError::s_allocateFromPayload);
+            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
+                Aws::Crt::String("aws.greengrass#ConflictError"), ConflictError::s_allocateFromPayload);
+            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
+                Aws::Crt::String("aws.greengrass#ResourceNotFoundError"), ResourceNotFoundError::s_allocateFromPayload);
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#FailedUpdateConditionCheckError"),
                 FailedUpdateConditionCheckError::s_allocateFromPayload);
-            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
-                Aws::Crt::String("aws.greengrass#ConflictError"), ConflictError::s_allocateFromPayload);
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#ComponentNotFoundError"),
                 ComponentNotFoundError::s_allocateFromPayload);
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#InvalidCredentialError"),
                 InvalidCredentialError::s_allocateFromPayload);
-            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
-                Aws::Crt::String("aws.greengrass#ResourceNotFoundError"), ResourceNotFoundError::s_allocateFromPayload);
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#InvalidArtifactsDirectoryPathError"),
                 InvalidArtifactsDirectoryPathError::s_allocateFromPayload);
@@ -50,12 +49,6 @@ namespace Aws
             m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
                 Aws::Crt::String("aws.greengrass#InvalidClientDeviceAuthTokenError"),
                 InvalidClientDeviceAuthTokenError::s_allocateFromPayload);
-            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
-                Aws::Crt::String("aws.greengrass#InvalidArgumentsError"), InvalidArgumentsError::s_allocateFromPayload);
-            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
-                Aws::Crt::String("aws.greengrass#ServiceError"), ServiceError::s_allocateFromPayload);
-            m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
-                Aws::Crt::String("aws.greengrass#UnauthorizedError"), UnauthorizedError::s_allocateFromPayload);
         }
 
         std::future<RpcError> GreengrassCoreIpcClient::Connect(