[nrf toup] Add cleanup argument to FabricTable::Delete

Add cleanup parameter that indicates if FabricTable should try to
cleanup all fabric data regardless if fabric was initialized.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/credentials/FabricTable.cpp

@@ -948,7 +948,7 @@ FabricTable::AddOrUpdateInner(FabricIndex fabricIndex, bool isAddition, Crypto::
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
+CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex, bool cleanup)
 {
     MATTER_TRACE_SCOPE("Delete", "Fabric");
     VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
@@ -1002,39 +1002,46 @@ CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
         }
     }
 
-    if (!fabricIsInitialized)
+    if (fabricIsInitialized)
     {
-        // Make sure to return the error our API promises, not whatever storage
-        // chose to return.
-        return CHIP_ERROR_NOT_FOUND;
-    }
-
-    // Since fabricIsInitialized was true, fabric is not null.
-    fabricInfo->Reset();
-
-    if (!mNextAvailableFabricIndex.HasValue())
-    {
-        // We must have been in a situation where CHIP_CONFIG_MAX_FABRICS is 254
-        // and our fabric table was full, so there was no valid next index.  We
-        // have a single available index now, though; use it as
-        // mNextAvailableFabricIndex.
-        mNextAvailableFabricIndex.SetValue(fabricIndex);
-    }
-    // If StoreFabricIndexInfo fails here, that's probably OK.  When we try to
-    // read things from storage later we will realize there is nothing for this
-    // index.
-    StoreFabricIndexInfo();
+        // Since fabricIsInitialized was true, fabric is not null.
+        fabricInfo->Reset();
 
-    // If we ever start moving the FabricInfo entries around in the array on
-    // delete, we should update DeleteAllFabrics to handle that.
-    if (mFabricCount == 0)
-    {
-        ChipLogError(FabricProvisioning, "Trying to delete a fabric, but the current fabric count is already 0");
+        if (!mNextAvailableFabricIndex.HasValue())
+        {
+            // We must have been in a situation where CHIP_CONFIG_MAX_FABRICS is 254
+            // and our fabric table was full, so there was no valid next index.  We
+            // have a single available index now, though; use it as
+            // mNextAvailableFabricIndex.
+            mNextAvailableFabricIndex.SetValue(fabricIndex);
+        }
+        // If StoreFabricIndexInfo fails here, that's probably OK.  When we try to
+        // read things from storage later we will realize there is nothing for this
+        // index.
+        StoreFabricIndexInfo();
+
+        // If we ever start moving the FabricInfo entries around in the array on
+        // delete, we should update DeleteAllFabrics to handle that.
+        if (mFabricCount == 0)
+        {
+            ChipLogError(FabricProvisioning, "Trying to delete a fabric, but the current fabric count is already 0");
+        }
+        else
+        {
+            mFabricCount--;
+            ChipLogProgress(FabricProvisioning, "Fabric (0x%x) deleted.", static_cast<unsigned>(fabricIndex));
+        }
     }
     else
     {
-        mFabricCount--;
-        ChipLogProgress(FabricProvisioning, "Fabric (0x%x) deleted.", static_cast<unsigned>(fabricIndex));
+        // Don't return here if we're doing a cleanup, as we want to remove all data,
+        // even if incomplete.
+        if (!cleanup)
+        {
+            // Make sure to return the error our API promises, not whatever storage
+            // chose to return.
+            return CHIP_ERROR_NOT_FOUND;
+        }
     }
 
     if (mDelegateListRoot != nullptr)
@@ -1050,10 +1057,14 @@ CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
         }
     }
 
-    // Only return error after trying really hard to remove everything we could
-    ReturnErrorOnFailure(metadataErr);
-    ReturnErrorOnFailure(opKeyErr);
-    ReturnErrorOnFailure(opCertsErr);
+    // Don't return error if we're doing a cleanup, some data may be missing.
+    if (!cleanup)
+    {
+        // Only return error after trying really hard to remove everything we could
+        ReturnErrorOnFailure(metadataErr);
+        ReturnErrorOnFailure(opKeyErr);
+        ReturnErrorOnFailure(opCertsErr);
+    }
 
     return CHIP_NO_ERROR;
 }

src/credentials/FabricTable.h

@@ -385,14 +385,14 @@ class DLL_EXPORT FabricTable
         /**
          * Gets called when a fabric in Fabric Table is persisted to storage, by CommitPendingFabricData.
          **/
-        virtual void OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex){};
+        virtual void OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex) {};
 
         /**
          * Gets called when operational credentials are changed, which may not be persistent.
          *
          * Can be used to affect what is needed for UpdateNOC prior to commit.
          **/
-        virtual void OnFabricUpdated(const FabricTable & fabricTable, FabricIndex fabricIndex){};
+        virtual void OnFabricUpdated(const FabricTable & fabricTable, FabricIndex fabricIndex) {};
 
         // Intrusive list pointer for FabricTable to manage the entries.
         Delegate * next = nullptr;
@@ -413,7 +413,7 @@ class DLL_EXPORT FabricTable
     };
 
     // Returns CHIP_ERROR_NOT_FOUND if there is no fabric for that index.
-    CHIP_ERROR Delete(FabricIndex fabricIndex);
+    CHIP_ERROR Delete(FabricIndex fabricIndex, bool cleanup = false);
     void DeleteAllFabrics();
 
     // TODO this #if CONFIG_BUILD_FOR_HOST_UNIT_TEST is temporary. There is a change incoming soon