Fixed dependencies?

Author: ratgr

src/app/chip_data_model.gni

@@ -357,6 +357,14 @@ template("chip_data_model") {
           "${_app_root}/clusters/${cluster}/resource-monitoring-cluster-objects.cpp",
           "${_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" ]
+      } 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",
+        ]
       } else if (cluster == "concentration-measurement-server") {
         sources += [
           "${_app_root}/clusters/${cluster}/${cluster}.h",
@@ -390,6 +398,7 @@ 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",
         ]
       } else if (cluster == "diagnostic-logs-server") {
         sources += [
@@ -410,6 +419,7 @@ 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",
         ]
       } else if (cluster == "thread-network-diagnostics-server") {
         sources += [

src/app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h

@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/util/util.h>
-#include <clusters/Resou
 #include <cstdint>
 #include <utility>
 

src/app/clusters/resource-monitoring-server/resource-monitoring-server.cpp

@@ -197,7 +197,7 @@ CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & clust
     {
         ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
         // Maybe add interface to provide this entry dynamically for the alias?
-        return builder.Append(ResetCondition::kMetadataEntry);
+        return builder.Append({ ResetCondition::Id });
     }
 
     return CHIP_NO_ERROR;

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

@@ -182,7 +182,7 @@ SoftwareDiagnosticsCommandHandler::EnumerateAcceptedCommands(const ConcreteClust
         return CHIP_NO_ERROR;
     }
     ReturnErrorOnFailure(builder.EnsureAppendCapacity(1));
-    return builder.Append({ ResetWatermarks::Id, {}, Priv::kManage });
+    return builder.Append(ResetWatermarks::kMetadataEntry);
 }
 
 } // anonymous namespace