More fixes

Author: ratgr

src/app/chip_data_model.gni

@@ -358,13 +358,9 @@ template("chip_data_model") {
           "${_app_root}/clusters/${cluster}/resource-monitoring-cluster-objects.h",
         ]
       } else if (cluster == "network-commissioning") {
-        sources += [ "${chip_root}/zzz_generated/app-common/clusters/NetworkCommissioning/Metadata.h" ]
+        deps += [ "${chip_root}/zzz_generated/app-common/clusters/NetworkCommissioning:metadata" ]
       } else if (cluster == "software-diagnostics-server") {
-        sources += [
-          "${_app_root}/clusters/${cluster}/${cluster}.cpp",
-          "${_app_root}/clusters/${cluster}/${cluster}.h",
-          "${chip_root}/zzz_generated/app-common/clusters/SoftwareDiagnostics/Metadata.h",
-        ]
+        deps += [ "${chip_root}/zzz_generated/app-common/clusters/SoftwareDiagnostics:metadata" ]
       } else if (cluster == "concentration-measurement-server") {
         sources += [
           "${_app_root}/clusters/${cluster}/${cluster}.h",
@@ -398,7 +394,9 @@ template("chip_data_model") {
           "${_app_root}/clusters/${cluster}/${cluster}.cpp",
           "${_app_root}/clusters/${cluster}/${cluster}.h",
           "${_app_root}/clusters/${cluster}/EnergyEvseTestEventTriggerHandler.h",
-          "${chip_root}/zzz_generated/app-common/clusters/EnergyEvse/Metadata.h",
+        ]
+        deps += [
+          "${chip_root}/zzz_generated/app-common/clusters/EnergyEvse:metadata",
         ]
       } else if (cluster == "diagnostic-logs-server") {
         sources += [
@@ -419,8 +417,9 @@ template("chip_data_model") {
           "${_app_root}/clusters/${cluster}/${cluster}.cpp",
           "${_app_root}/clusters/${cluster}/${cluster}.h",
           "${_app_root}/clusters/${cluster}/DeviceEnergyManagementTestEventTriggerHandler.h",
-          "${chip_root}/zzz_generated/app-common/clusters/DeviceEnergyManagement/Metadata.h",
         ]
+
+        deps += [ "${chip_root}/zzz_generated/app-common/clusters/DeviceEnergyManagement:metadata" ]
       } else if (cluster == "thread-network-diagnostics-server") {
         sources += [
           "${_app_root}/clusters/${cluster}/${cluster}.cpp",

src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp

@@ -175,7 +175,6 @@ SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClust
                                                              ReadOnlyBufferBuilder<DataModel::AcceptedCommandEntry> & builder)
 {
     using namespace Commands;
-    using Priv = Access::Privilege;
     if (!DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
     {
         // No commmands.