Return CONSTRAINT_ERROR on user labels that are too long (instead of …

…FAILURE) (#20553) * Mark constraint error as the error to return on overly long values * Zap regen * Fix return code * Update TC-ULABEL-2.3 for using constraint_error * Zap regen
project-chip · Jul 20, 2023 · 2327496 · 2327496
1 parent b3d8525
commit 2327496
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/app/clusters/user-label-server/user-label-server.cpp b/src/app/clusters/user-label-server/user-label-server.cpp
@@ -129,7 +129,7 @@ CHIP_ERROR UserLabelAttrAccess::WriteLabelList(const ConcreteDataAttributePath &
         LabelList::TypeInfo::DecodableType decodablelist;
 
         ReturnErrorOnFailure(aDecoder.Decode(decodablelist));
-        ReturnErrorCodeIf(!IsValidLabelEntryList(decodablelist), CHIP_ERROR_INVALID_ARGUMENT);
+        ReturnErrorCodeIf(!IsValidLabelEntryList(decodablelist), CHIP_IM_GLOBAL_STATUS(ConstraintError));
 
         auto iter = decodablelist.begin();
         while (iter.Next())
@@ -146,7 +146,7 @@ CHIP_ERROR UserLabelAttrAccess::WriteLabelList(const ConcreteDataAttributePath &
         Structs::LabelStruct::DecodableType entry;
 
         ReturnErrorOnFailure(aDecoder.Decode(entry));
-        ReturnErrorCodeIf(!IsValidLabelEntry(entry), CHIP_ERROR_INVALID_ARGUMENT);
+        ReturnErrorCodeIf(!IsValidLabelEntry(entry), CHIP_IM_GLOBAL_STATUS(ConstraintError));
 
         return provider->AppendUserLabel(endpoint, entry);
     }

diff --git a/src/app/tests/suites/TestUserLabelClusterConstraints.yaml b/src/app/tests/suites/TestUserLabelClusterConstraints.yaml
@@ -40,7 +40,7 @@ tests:
                   },
               ]
       response:
-          error: FAILURE
+          error: CONSTRAINT_ERROR
 
     - label: "Attempt to write overly long item for value"
       command: "writeAttribute"
@@ -54,4 +54,4 @@ tests:
                   },
               ]
       response:
-          error: FAILURE
+          error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml
@@ -44,7 +44,7 @@ tests:
                   },
               ]
       response:
-          error: FAILURE
+          error: CONSTRAINT_ERROR
 
     - label: "TH reads LabelList attribute of the DUT"
       PICS: ULABEL.S.A0000
@@ -59,4 +59,4 @@ tests:
                   },
               ]
       response:
-          error: FAILURE
+          error: CONSTRAINT_ERROR
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h