From 7fb2723e59063a4277579cff64a201e7351407a2 Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Wed, 4 Dec 2019 10:18:39 -0800 Subject: [PATCH] Fix error in samples when "--ca_file" not provided (#81) --- samples/jobs/describe_job_execution/main.cpp | 11 +++++++---- samples/shadow/shadow_sync/main.cpp | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/samples/jobs/describe_job_execution/main.cpp b/samples/jobs/describe_job_execution/main.cpp index 59d2b2f8b..c5b64992e 100644 --- a/samples/jobs/describe_job_execution/main.cpp +++ b/samples/jobs/describe_job_execution/main.cpp @@ -124,10 +124,13 @@ int main(int argc, char *argv[]) exit(-1); } - auto clientConfig = Aws::Iot::MqttClientConnectionConfigBuilder(certificatePath.c_str(), keyPath.c_str()) - .WithEndpoint(endpoint) - .WithCertificateAuthority(caFile.c_str()) - .Build(); + auto clientConfigBuilder = Aws::Iot::MqttClientConnectionConfigBuilder(certificatePath.c_str(), keyPath.c_str()); + clientConfigBuilder.WithEndpoint(endpoint); + if (!caFile.empty()) + { + clientConfigBuilder.WithCertificateAuthority(caFile.c_str()); + } + auto clientConfig = clientConfigBuilder.Build(); if (!clientConfig) { diff --git a/samples/shadow/shadow_sync/main.cpp b/samples/shadow/shadow_sync/main.cpp index b3375faa0..0d618de9e 100644 --- a/samples/shadow/shadow_sync/main.cpp +++ b/samples/shadow/shadow_sync/main.cpp @@ -164,10 +164,13 @@ int main(int argc, char *argv[]) exit(-1); } - auto clientConfig = Aws::Iot::MqttClientConnectionConfigBuilder(certificatePath.c_str(), keyPath.c_str()) - .WithEndpoint(endpoint) - .WithCertificateAuthority(caFile.c_str()) - .Build(); + auto clientConfigBuilder = Aws::Iot::MqttClientConnectionConfigBuilder(certificatePath.c_str(), keyPath.c_str()); + clientConfigBuilder.WithEndpoint(endpoint); + if (!caFile.empty()) + { + clientConfigBuilder.WithCertificateAuthority(caFile.c_str()); + } + auto clientConfig = clientConfigBuilder.Build(); if (!clientConfig) {