Skip to content

Commit 609758a

Browse files
authored
Greengrass IPC update including MQTT 5 models (#576)
1 parent a9919b5 commit 609758a

File tree

7 files changed

+1705
-1582
lines changed

7 files changed

+1705
-1582
lines changed

eventstream_rpc/tests/EchoTestRpcModel.cpp

Lines changed: 151 additions & 151 deletions
Large diffs are not rendered by default.

eventstream_rpc/tests/include/awstest/EchoTestRpcClient.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ namespace Awstest
2828
Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
2929
/**
3030
* Connect the client to the server
31-
* @param lifecycleHandler An interface that is called upon when lifecycle
32-
* events relating to the connection occur.
33-
* @param connectionConfig The configuration parameters used for establishing
34-
* the connection.
35-
* @return An `RpcError` that can be used to check whether the connection was
36-
* established.
31+
* @param lifecycleHandler An interface that is called upon when lifecycle events relating to the connection
32+
* occur.
33+
* @param connectionConfig The configuration parameters used for establishing the connection.
34+
* @return An `RpcError` that can be used to check whether the connection was established.
3735
*/
3836
std::future<RpcError> Connect(
3937
ConnectionLifecycleHandler &lifecycleHandler,

eventstream_rpc/tests/include/awstest/EchoTestRpcModel.h

Lines changed: 119 additions & 154 deletions
Large diffs are not rendered by default.

greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcClient.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ namespace Aws
3030
Aws::Crt::Allocator *allocator = Aws::Crt::g_allocator) noexcept;
3131
/**
3232
* Connect the client to the server
33-
* @param lifecycleHandler An interface that is called upon when lifecycle
34-
* events relating to the connection occur.
35-
* @param connectionConfig The configuration parameters used for establishing
36-
* the connection.
37-
* @return An `RpcError` that can be used to check whether the connection was
38-
* established.
33+
* @param lifecycleHandler An interface that is called upon when lifecycle events relating to the connection
34+
* occur.
35+
* @param connectionConfig The configuration parameters used for establishing the connection.
36+
* @return An `RpcError` that can be used to check whether the connection was established.
3937
*/
4038
std::future<RpcError> Connect(
4139
ConnectionLifecycleHandler &lifecycleHandler,

greengrass_ipc/include/aws/greengrass/GreengrassCoreIpcModel.h

Lines changed: 591 additions & 697 deletions
Large diffs are not rendered by default.

greengrass_ipc/source/GreengrassCoreIpcClient.cpp

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3-
* SPDX-License-Identifier: Apache-2.0.
4-
*
5-
* This file is generated.
6-
*/
7-
81
/**
92
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
103
* SPDX-License-Identifier: Apache-2.0.
@@ -26,21 +19,27 @@ namespace Aws
2619
: m_connection(allocator), m_clientBootstrap(clientBootstrap), m_allocator(allocator),
2720
m_asyncLaunchMode(std::launch::deferred)
2821
{
22+
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
23+
Aws::Crt::String("aws.greengrass#InvalidArgumentsError"), InvalidArgumentsError::s_allocateFromPayload);
24+
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
25+
Aws::Crt::String("aws.greengrass#ServiceError"), ServiceError::s_allocateFromPayload);
26+
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
27+
Aws::Crt::String("aws.greengrass#UnauthorizedError"), UnauthorizedError::s_allocateFromPayload);
2928
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
3029
Aws::Crt::String("aws.greengrass#InvalidTokenError"), InvalidTokenError::s_allocateFromPayload);
30+
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
31+
Aws::Crt::String("aws.greengrass#ConflictError"), ConflictError::s_allocateFromPayload);
32+
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
33+
Aws::Crt::String("aws.greengrass#ResourceNotFoundError"), ResourceNotFoundError::s_allocateFromPayload);
3134
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
3235
Aws::Crt::String("aws.greengrass#FailedUpdateConditionCheckError"),
3336
FailedUpdateConditionCheckError::s_allocateFromPayload);
34-
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
35-
Aws::Crt::String("aws.greengrass#ConflictError"), ConflictError::s_allocateFromPayload);
3637
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
3738
Aws::Crt::String("aws.greengrass#ComponentNotFoundError"),
3839
ComponentNotFoundError::s_allocateFromPayload);
3940
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
4041
Aws::Crt::String("aws.greengrass#InvalidCredentialError"),
4142
InvalidCredentialError::s_allocateFromPayload);
42-
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
43-
Aws::Crt::String("aws.greengrass#ResourceNotFoundError"), ResourceNotFoundError::s_allocateFromPayload);
4443
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
4544
Aws::Crt::String("aws.greengrass#InvalidArtifactsDirectoryPathError"),
4645
InvalidArtifactsDirectoryPathError::s_allocateFromPayload);
@@ -50,12 +49,6 @@ namespace Aws
5049
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
5150
Aws::Crt::String("aws.greengrass#InvalidClientDeviceAuthTokenError"),
5251
InvalidClientDeviceAuthTokenError::s_allocateFromPayload);
53-
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
54-
Aws::Crt::String("aws.greengrass#InvalidArgumentsError"), InvalidArgumentsError::s_allocateFromPayload);
55-
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
56-
Aws::Crt::String("aws.greengrass#ServiceError"), ServiceError::s_allocateFromPayload);
57-
m_greengrassCoreIpcServiceModel.AssignModelNameToErrorResponse(
58-
Aws::Crt::String("aws.greengrass#UnauthorizedError"), UnauthorizedError::s_allocateFromPayload);
5952
}
6053

6154
std::future<RpcError> GreengrassCoreIpcClient::Connect(

0 commit comments

Comments
 (0)