[yaml] Add discoverOnce as an optional argument to CommissionerComman…

…ds::PairWithCode (#25048)

* [yaml] Add discoverOnce as an optional argument to CommissionerCommands::PairWithCode

* Update zap version

* Add ClustersWithShutdownFunctions to config-data.yaml in order to get ZAP to run

* Update generated simulated clusters code

integrations/docker/images/chip-cert-bins/Dockerfile

@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.02.09-nightly
+ARG ZAP_VERSION=v2023.02.16-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

scripts/setup/zap.json

@@ -8,7 +8,7 @@
                 "mac-arm64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2023.02.09-nightly.1"]
+            "tags": ["version:2@v2023.02.16-nightly.1"]
         }
     ]
 }

scripts/tools/zap/zap_execution.py

@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.2.9'
+MIN_ZAP_VERSION = '2023.2.16'
 
 
 class ZapTool:

src/app/common/templates/config-data.yaml

@@ -65,3 +65,5 @@ ClustersWithPreAttributeChangeFunctions:
     - Mode Select
     - Fan Control
     - Thermostat
+
+ClustersWithShutdownFunctions: []

src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp

@@ -33,6 +33,8 @@ CommissionerCommands::PairWithCode(const char * identity,
     memcpy(code, value.payload.data(), value.payload.size());
     ChipLogError(chipTool, "Pairing Code is %s", code);
 
+    mDiscoverOnce = value.discoverOnce;
+
     // To reduce the scanning latency in some setups, and since the primary use for PairWithCode is to commission a device to
     // another commissioner, assume that the commissionable device is available on the network.
     chip::Controller::DiscoveryType discoveryType = chip::Controller::DiscoveryType::kDiscoveryNetworkOnly;
@@ -128,6 +130,11 @@ void CommissionerCommands::OnStatusUpdate(DevicePairingDelegate::Status status)
         OnResponse(ConvertToStatusIB(CHIP_ERROR_INCORRECT_STATE), nullptr);
         break;
     case DevicePairingDelegate::Status::SecurePairingDiscoveringMoreDevices:
+        if (mDiscoverOnce.ValueOr(false))
+        {
+            ChipLogError(chipTool, "Secure Pairing Failed");
+            OnResponse(ConvertToStatusIB(CHIP_ERROR_INCORRECT_STATE), nullptr);
+        }
         break;
     }
 }

src/app/tests/suites/commands/commissioner/CommissionerCommands.h

@@ -45,4 +45,7 @@ class CommissionerCommands : public chip::Controller::DevicePairingDelegate
     void OnPairingComplete(CHIP_ERROR error) override;
     void OnPairingDeleted(CHIP_ERROR error) override;
     void OnCommissioningComplete(chip::NodeId deviceId, CHIP_ERROR error) override;
+
+private:
+    chip::Optional<bool> mDiscoverOnce;
 };