Fix build and remove test key when not in debug build

Author: mkardous-silabs

examples/platform/silabs/MatterConfig.cpp

@@ -58,9 +58,9 @@ static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeys
 #include <app/InteractionModelEngine.h>
 #include <app/TimerDelegates.h>
 
-#if SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
-#include "SilabsTestEventTriggerDelegate.h"
-#endif // SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+#include "SilabsTestEventTriggerDelegate.h" // nogncheck
+#endif
 
 #if CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED
 #include <app/reporting/SynchronizedReportSchedulerImpl.h>
@@ -277,7 +277,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 
     initParams.reportScheduler = &sReportScheduler;
 
-#if SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
+#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
     static SilabsTestEventTriggerDelegate sTestEventTriggerDelegate;
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
 #endif // SL_MATTER_TEST_EVENT_TRIGGER_ENABLED

examples/platform/silabs/SiWx917/BUILD.gn

@@ -78,10 +78,11 @@ config("chip_examples_project_config") {
 }
 
 config("test-event-trigger-config") {
-  defines = [
-    "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED",
-    "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"",
-  ]
+  defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
+
+  if (is_debug) {
+    defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
+  }
 }
 
 source_set("test-event-trigger") {

examples/platform/silabs/SilabsTestEventTriggerDelegate.cpp

@@ -25,8 +25,8 @@ namespace chip {
 
 bool SilabsTestEventTriggerDelegate::DoesEnableKeyMatch(const ByteSpan & enableKey) const
 {
-    uint8_t enableKey[TestEventTriggerDelegate::kEnableKeyLength];
-    MutableByteSpan enableKeySpan(mEnableKey);
+    uint8_t storedEnableKey[TestEventTriggerDelegate::kEnableKeyLength];
+    MutableByteSpan enableKeySpan(storedEnableKey);
 
     // Return false if we were not able to get the enableKey
     VerifyOrReturnValue(

examples/platform/silabs/efr32/BUILD.gn

@@ -95,10 +95,11 @@ config("chip_examples_project_config") {
 }
 
 config("test-event-trigger-config") {
-  defines = [
-    "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED",
-    "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"",
-  ]
+  defines = [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLED" ]
+
+  if (is_debug) {
+    defines += [ "SL_MATTER_TEST_EVENT_TRIGGER_ENABLE_KEY=\"${sl_test_event_trigger_enable_key}\"" ]
+  }
 }
 
 source_set("test-event-trigger") {