Updated SDK commit to use the latest SDK code

CMakeLists.txt.awssdk

@@ -5,7 +5,7 @@ project(aws-iot-device-sdk-cpp-v2-download NONE)
 include(ExternalProject)
 ExternalProject_Add(aws-iot-device-sdk-cpp-v2
         GIT_REPOSITORY          https://github.com/aws/aws-iot-device-sdk-cpp-v2.git
-        GIT_TAG                 ac3ba3774b031dde1b988e698880d6064d53b9d9
+        GIT_TAG                 b12656085b9bf1ecff1a0b8a4c7d496acc3f684f
         SOURCE_DIR              "${CMAKE_BINARY_DIR}/aws-iot-device-sdk-cpp-v2-src"
         BINARY_DIR              "${CMAKE_BINARY_DIR}/aws-iot-device-sdk-cpp-v2-build"
         CONFIGURE_COMMAND       ""

source/SharedCrtResourceManager.cpp

@@ -39,7 +39,6 @@ bool SharedCrtResourceManager::initialize(
     std::shared_ptr<Util::FeatureRegistry> featureRegistry)
 {
     features = featureRegistry;
-    initializeAllocator(config);
     initialized = buildClient(config) == SharedCrtResourceManager::SUCCESS;
     return initialized;
 }
@@ -174,22 +173,22 @@ bool SharedCrtResourceManager::setupLogging(const PlainConfig &config) const
     return true;
 }
 
-void SharedCrtResourceManager::initializeAllocator(const PlainConfig &config)
+void SharedCrtResourceManager::initializeAllocator(const aws_mem_trace_level &configMemTraceLevel)
 {
-    allocator = aws_default_allocator();
-    memTraceLevel = config.memTraceLevel;
+    memTraceLevel = configMemTraceLevel;
     if (memTraceLevel != AWS_MEMTRACE_NONE)
     {
         // If memTraceLevel == AWS_MEMTRACE_STACKS(2), then by default 8 frames per stack are used.
         allocator = aws_mem_tracer_new(allocator, nullptr, memTraceLevel, 0);
     }
-}
 
-int SharedCrtResourceManager::buildClient(const PlainConfig &config)
-{
     // We MUST declare an instance of the ApiHandle to perform global initialization
     // of the SDK libraries
     apiHandle = unique_ptr<ApiHandle>(new ApiHandle());
+}
+
+int SharedCrtResourceManager::buildClient(const PlainConfig &config)
+{
     if (config.logConfig.sdkLoggingEnabled)
     {
         if (!setupLogging(config))
@@ -516,6 +515,12 @@ Aws::Crt::Io::ClientBootstrap *SharedCrtResourceManager::getClientBootstrap()
 void SharedCrtResourceManager::disconnect()
 {
     LOG_DEBUG(TAG, "Attempting to disconnect MQTT connection");
+    if (connection == NULL)
+    {
+        LOG_WARN(TAG, "Tried to disconnect MQTT connection but the MQTT connection has not yet been established!");
+        return;
+    }
+
     if (connection->Disconnect())
     {
         if (connectionClosedPromise.get_future().wait_for(std::chrono::seconds(DEFAULT_WAIT_TIME_SECONDS)) ==

source/SharedCrtResourceManager.h

@@ -49,8 +49,6 @@ namespace Aws
 
                 int buildClient(const PlainConfig &config);
 
-                void initializeAllocator(const PlainConfig &config);
-
               protected:
                 /**
                  * inheritable for testing
@@ -80,6 +78,8 @@ namespace Aws
 
                 bool initialize(const PlainConfig &config, std::shared_ptr<Util::FeatureRegistry> featureRegistry);
 
+                void initializeAllocator(const aws_mem_trace_level &config);
+
                 void initializeAWSHttpLib();
 
                 int establishConnection(const PlainConfig &config);

source/config/Config.cpp

@@ -287,7 +287,7 @@ bool PlainConfig::LoadFromCliArgs(const CliArgs &cliArgs)
     return loadFeatureCliArgs;
 }
 
-bool PlainConfig::LoadFromEnvironment()
+void PlainConfig::LoadMemTraceLevelFromEnvironment()
 {
     const char *memTraceLevelStr = std::getenv("AWS_CRT_MEMORY_TRACING");
     if (memTraceLevelStr)
@@ -306,7 +306,10 @@ bool PlainConfig::LoadFromEnvironment()
                 break;
         }
     }
+}
 
+bool PlainConfig::LoadFromEnvironment()
+{
     const char *lockFilePathIn = std::getenv("LOCK_FILE_PATH");
     if (lockFilePathIn)
     {

source/config/Config.h

@@ -472,6 +472,7 @@ namespace Aws
                     mutable std::vector<SensorSettings> settings;
                 };
                 SensorPublish sensorPublish;
+                void LoadMemTraceLevelFromEnvironment();
             };
 
             class Config

source/main.cpp

@@ -289,12 +289,20 @@ namespace Aws
 
 int main(int argc, char *argv[])
 {
-    CliArgs cliArgs;
+
     if (Config::CheckTerminalArgs(argc, argv))
     {
         LoggerFactory::getLoggerInstance()->shutdown();
         return 0;
     }
+
+    resourceManager = std::make_shared<SharedCrtResourceManager>();
+
+    config.config.LoadMemTraceLevelFromEnvironment();
+
+    resourceManager.get()->initializeAllocator(config.config.memTraceLevel);
+
+    CliArgs cliArgs;
     if (!Config::ParseCliArgs(argc, argv, cliArgs) || !config.init(cliArgs))
     {
         LOGM_ERROR(
@@ -321,6 +329,19 @@ int main(int argc, char *argv[])
         LOG_WARN(TAG, "Unable to append current working directory to PATH environment variable.");
     }
 
+#if !defined(DISABLE_MQTT)
+    /**
+     * init() is currently responsible for making sure only 1 instance of Device Client is running at a given time.
+     * In the future, we may want to move other Device Client startup logic into this function.
+     * returns false if an exception is thrown
+     */
+    if (!init(argc, argv))
+    {
+        LOGM_ERROR(TAG, "*** %s: An instance of Device Client is already running.", DC_FATAL_ERROR);
+        deviceClientAbort("An instance of Device Client is already running.");
+    }
+#endif
+
     features = make_shared<FeatureRegistry>();
 
     LOGM_INFO(TAG, "Now running AWS IoT Device Client version %s", DEVICE_CLIENT_VERSION_FULL);
@@ -334,8 +355,6 @@ int main(int argc, char *argv[])
     sigprocmask(SIG_BLOCK, &sigset, nullptr);
 
     auto listener = std::make_shared<DefaultClientBaseNotifier>();
-    resourceManager = std::make_shared<SharedCrtResourceManager>();
-
     if (!resourceManager.get()->initialize(config.config, features))
     {
         LOGM_ERROR(TAG, "*** %s: Failed to initialize AWS CRT SDK.", DC_FATAL_ERROR);
@@ -346,16 +365,6 @@ int main(int argc, char *argv[])
     if (config.config.fleetProvisioning.enabled &&
         !config.config.fleetProvisioningRuntimeConfig.completedFleetProvisioning)
     {
-        /**
-         * init() is currently responsible for making sure only 1 instance of Device Client is running at a given time.
-         * In the future, we may want to move other Device Client startup logic into this function.
-         * returns false if an exception is thrown
-         */
-        if (!init(argc, argv))
-        {
-            LOGM_ERROR(TAG, "*** %s: An instance of Device Client is already running.", DC_FATAL_ERROR);
-            deviceClientAbort("An instance of Device Client is already running.");
-        }
         /*
          * Establish MQTT connection using claim certificates and private key to provision the device/thing.
          */
@@ -394,16 +403,6 @@ int main(int argc, char *argv[])
 #endif
 
 #if !defined(DISABLE_MQTT)
-    /**
-     * init() is currently responsible for making sure only 1 instance of Device Client is running at a given time.
-     * In the future, we may want to move other Device Client startup logic into this function.
-     * returns false if an exception is thrown
-     */
-    if (!init(argc, argv))
-    {
-        LOGM_ERROR(TAG, "*** %s: An instance of Device Client is already running.", DC_FATAL_ERROR);
-        deviceClientAbort("An instance of Device Client is already running.");
-    }
     /*
      * Establish MQTT connection using permanent certificate and private key to start and run AWS IoT Device Client
      * features.

test/config/TestConfig.cpp

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+#include "../../source/SharedCrtResourceManager.h"
 #include "../../source/config/Config.h"
 #include "../../source/util/FileUtils.h"
 #include "../../source/util/UniqueString.h"
@@ -33,6 +34,7 @@ class ConfigTestFixture : public ::testing::Test
   public:
     ConfigTestFixture() = default;
     string outputPath;
+    shared_ptr<SharedCrtResourceManager> resourceManager;
 
     void SetUp() override
     {
@@ -61,6 +63,12 @@ class ConfigTestFixture : public ::testing::Test
         outputPathStream << Config::DEFAULT_SAMPLE_SHADOW_OUTPUT_DIR << Config::DEFAULT_SAMPLE_SHADOW_DOCUMENT_FILE;
 
         outputPath = FileUtils::ExtractExpandedPath(outputPathStream.str().c_str());
+
+        resourceManager = std::make_shared<SharedCrtResourceManager>();
+
+        PlainConfig configuration;
+        configuration.LoadMemTraceLevelFromEnvironment();
+        resourceManager.get()->initializeAllocator(configuration.memTraceLevel);
     }
 
     void TearDown() override
@@ -1729,7 +1737,7 @@ TEST(Config, MemoryTrace)
     {
         auto levelstr = std::to_string(level);
         ::setenv("AWS_CRT_MEMORY_TRACING", levelstr.c_str(), 1);
-        ASSERT_TRUE(config.LoadFromEnvironment()) << "read AWS_CRT_MEMORY_TRACING=" << level;
+        config.LoadMemTraceLevelFromEnvironment();
         ASSERT_EQ(config.memTraceLevel, level);
     }
 }

test/config/TestConfigSerialization.cpp

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+#include "../../source/SharedCrtResourceManager.h"
 #include "../../source/config/Config.h"
 #include "../../source/util/FileUtils.h"
 #include "../../source/util/UniqueString.h"
@@ -20,32 +21,16 @@ using namespace Aws::Crt;
 using namespace Aws::Iot::DeviceClient;
 using namespace Aws::Iot::DeviceClient::Util;
 
-class SerializeConfigTestFixture : public ::testing::TestWithParam<const char *>
+TEST(SerializeConfigTestFixture, SerializeConfigTest)
 {
-  protected:
-    const char *jsonString;
-};
+    shared_ptr<SharedCrtResourceManager> resourceManager;
+    resourceManager = std::make_shared<SharedCrtResourceManager>();
 
-TEST_P(SerializeConfigTestFixture, SerializeConfigTest)
-{
-    const char *jsonString = GetParam();
     PlainConfig config;
-    JsonObject jsonObject(jsonString);
-    config.LoadFromJson(jsonObject.View());
-    auto inputJsonString = jsonObject.View().WriteCompact();
-
-    JsonObject serializedConfig;
-    config.SerializeToObject(serializedConfig);
-    auto serializedJsonString = serializedConfig.View().WriteCompact();
-
-    ASSERT_STREQ(inputJsonString.c_str(), serializedJsonString.c_str());
-}
+    config.LoadMemTraceLevelFromEnvironment();
+    resourceManager.get()->initializeAllocator(config.memTraceLevel);
 
-INSTANTIATE_TEST_CASE_P(
-    SerializationTests,
-    SerializeConfigTestFixture,
-    ::testing::Values(
-        R"(
+    constexpr char jsonString[] = R"(
 {
     "endpoint": "endpoint value",
     "cert": "/tmp/aws-iot-device-client-test-file",
@@ -138,45 +123,14 @@ INSTANTIATE_TEST_CASE_P(
             }
         ]
     }
-})",
-        R"({
-    "logging": {
-        "level": "DEBUG",
-        "type": "file",
-        "file": "./aws-iot-device-client.log",
-        "enable-sdk-logging": false,
-        "sdk-log-level": "TRACE",
-        "sdk-log-file": "/var/log/aws-iot-device-client/sdk.log"
-    },
-    "jobs": {
-        "enabled": true,
-        "handler-directory": "" 
-    },
-    "tunneling": {
-        "enabled": true
-    },
-    "device-defender": {
-        "enabled": true,
-        "interval": 300
-    },
-    "fleet-provisioning": {
-        "enabled": true
-    },
-    "runtime-config": {
-        "completed-fp": false
-     },
-    "samples": {
-		"pub-sub": {
-			"enabled": true
-		}
-	},
-    "config-shadow": {
-        "enabled": true
-      },
-    "sample-shadow": {
-        "enabled": true
-      },
-    "secure-element": {
-        "enabled": true
-      }
-})"));
+})";
+    JsonObject jsonObject(jsonString);
+    config.LoadFromJson(jsonObject.View());
+    auto inputJsonString = jsonObject.View().WriteCompact();
+
+    JsonObject serializedConfig;
+    config.SerializeToObject(serializedConfig);
+    auto serializedJsonString = serializedConfig.View().WriteCompact();
+
+    ASSERT_STREQ(inputJsonString.c_str(), serializedJsonString.c_str());
+}

test/devicedefender/TestDeviceDefender.cpp

@@ -83,8 +83,11 @@ class TestDeviceDefender : public testing::Test
   public:
     void SetUp()
     {
-        deviceDefender = unique_ptr<MockDDFeature>(new MockDDFeature());
         manager = shared_ptr<SharedCrtResourceManager>(new SharedCrtResourceManager());
+        config.LoadMemTraceLevelFromEnvironment();
+        manager.get()->initializeAllocator(config.memTraceLevel);
+
+        deviceDefender = unique_ptr<MockDDFeature>(new MockDDFeature());
         notifier = shared_ptr<MockNotifier>(new MockNotifier());
         task = shared_ptr<MockReportTask>(new MockReportTask());
         config = getSimpleDDConfig();

test/fleetprovisioning/TestFleetProvisioning.cpp

@@ -9,15 +9,31 @@
 using namespace std;
 using namespace Aws::Iot::DeviceClient::FleetProvisioningNS;
 
-TEST(FleetProvisioning, EmptyTemplateParameters)
+class FleetProvisioningFeature : public ::testing::Test
+{
+  public:
+    FleetProvisioningFeature() = default;
+    shared_ptr<Aws::Iot::DeviceClient::SharedCrtResourceManager> resourceManager;
+
+    void SetUp() override
+    {
+        resourceManager = std::make_shared<Aws::Iot::DeviceClient::SharedCrtResourceManager>();
+
+        Aws::Iot::DeviceClient::PlainConfig configuration;
+        configuration.LoadMemTraceLevelFromEnvironment();
+        resourceManager.get()->initializeAllocator(configuration.memTraceLevel);
+    }
+};
+
+TEST_F(FleetProvisioningFeature, EmptyTemplateParameters)
 {
     Aws::Crt::Optional<std::string> params; // start with empty value
     FleetProvisioning fp;
     ASSERT_TRUE(fp.MapParameters(params));
     params = "{}"; // test empty JSON
 }
 
-TEST(FleetProvisioning, MalformedTemplateParameters)
+TEST_F(FleetProvisioningFeature, MalformedTemplateParameters)
 {
     Aws::Crt::Optional<std::string> params("{\"SerialNumber\" \"Device-SN\"}"); // test missing colon
     FleetProvisioning fp;
@@ -28,7 +44,7 @@ TEST(FleetProvisioning, MalformedTemplateParameters)
     ASSERT_FALSE(fp.MapParameters(params));
 }
 
-TEST(FleetProvisioning, ValidTemplateParameters)
+TEST_F(FleetProvisioningFeature, ValidTemplateParameters)
 {
     Aws::Crt::Optional<std::string> params("{\"SerialNumber\": \"Device-SN\"}"); // test single JSON property
     FleetProvisioning fp;