Skip to content

Commit 58ed63d

Browse files
tcarmelveilleuxrestyled-commits
tcarmelveilleux
and
restyled-commits
authored
Fix ACL XML for MACL and sample conformance (project-chip#35411)
* Fix ACL cluster ZAP XML and regen ZAP - Remove dead event AccessRestrictionEntryChanged - Set response command for ReviewFabricRestrictions - Set correct optionality for FabricRestrictionReviewUpdate * Fix access control server after XML change * Remove unsupportable commnad * Rename RedirectURL field to ARLRequestFlowUrl * Kick CI * Kick CI * Remove non-longer-applicable files * Increase size of event buffer pool in NIM sample * Restyled by clang-format * Fix format * Remove subscription for event that no longer exists --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 7734069 commit 58ed63d

File tree

126 files changed

+585
-1291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+585
-1291
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,10 @@ cluster AccessControl = 31 {
409409
fabric_idx fabricIndex = 254;
410410
}
411411

412-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
413-
fabric_idx fabricIndex = 254;
414-
}
415-
416-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
412+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
417413
int64u token = 0;
418-
nullable long_char_string instruction = 1;
419-
nullable long_char_string redirectURL = 2;
414+
optional long_char_string instruction = 1;
415+
optional long_char_string ARLRequestFlowUrl = 2;
420416
fabric_idx fabricIndex = 254;
421417
}
422418

@@ -443,7 +439,7 @@ cluster AccessControl = 31 {
443439
}
444440

445441
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
446-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
442+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
447443
}
448444

449445
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,10 @@ cluster AccessControl = 31 {
409409
fabric_idx fabricIndex = 254;
410410
}
411411

412-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
413-
fabric_idx fabricIndex = 254;
414-
}
415-
416-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
412+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
417413
int64u token = 0;
418-
nullable long_char_string instruction = 1;
419-
nullable long_char_string redirectURL = 2;
414+
optional long_char_string instruction = 1;
415+
optional long_char_string ARLRequestFlowUrl = 2;
420416
fabric_idx fabricIndex = 254;
421417
}
422418

@@ -443,7 +439,7 @@ cluster AccessControl = 31 {
443439
}
444440

445441
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
446-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
442+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
447443
}
448444

449445
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -811,14 +811,10 @@ cluster AccessControl = 31 {
811811
fabric_idx fabricIndex = 254;
812812
}
813813

814-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
815-
fabric_idx fabricIndex = 254;
816-
}
817-
818-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
814+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
819815
int64u token = 0;
820-
nullable long_char_string instruction = 1;
821-
nullable long_char_string redirectURL = 2;
816+
optional long_char_string instruction = 1;
817+
optional long_char_string ARLRequestFlowUrl = 2;
822818
fabric_idx fabricIndex = 254;
823819
}
824820

@@ -845,7 +841,7 @@ cluster AccessControl = 31 {
845841
}
846842

847843
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
848-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
844+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
849845
}
850846

851847
/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -704,14 +704,10 @@ cluster AccessControl = 31 {
704704
fabric_idx fabricIndex = 254;
705705
}
706706

707-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
708-
fabric_idx fabricIndex = 254;
709-
}
710-
711-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
707+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
712708
int64u token = 0;
713-
nullable long_char_string instruction = 1;
714-
nullable long_char_string redirectURL = 2;
709+
optional long_char_string instruction = 1;
710+
optional long_char_string ARLRequestFlowUrl = 2;
715711
fabric_idx fabricIndex = 254;
716712
}
717713

@@ -738,7 +734,7 @@ cluster AccessControl = 31 {
738734
}
739735

740736
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
741-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
737+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
742738
}
743739

744740
/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */

‎examples/bridge-app/bridge-common/bridge-app.matter

+8-16
Original file line numberDiff line numberDiff line change
@@ -627,14 +627,10 @@ cluster AccessControl = 31 {
627627
fabric_idx fabricIndex = 254;
628628
}
629629

630-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
631-
fabric_idx fabricIndex = 254;
632-
}
633-
634-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
630+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
635631
int64u token = 0;
636-
nullable long_char_string instruction = 1;
637-
nullable long_char_string redirectURL = 2;
632+
optional long_char_string instruction = 1;
633+
optional long_char_string ARLRequestFlowUrl = 2;
638634
fabric_idx fabricIndex = 254;
639635
}
640636

@@ -661,7 +657,7 @@ cluster AccessControl = 31 {
661657
}
662658

663659
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
664-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
660+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
665661
}
666662

667663
/** The Access Control Cluster exposes a data model view of a
@@ -756,14 +752,10 @@ cluster AccessControl = 31 {
756752
fabric_idx fabricIndex = 254;
757753
}
758754

759-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
760-
fabric_idx fabricIndex = 254;
761-
}
762-
763-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
755+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
764756
int64u token = 0;
765-
nullable long_char_string instruction = 1;
766-
nullable long_char_string redirectURL = 2;
757+
optional long_char_string instruction = 1;
758+
optional long_char_string ARLRequestFlowUrl = 2;
767759
fabric_idx fabricIndex = 254;
768760
}
769761

@@ -790,7 +782,7 @@ cluster AccessControl = 31 {
790782
}
791783

792784
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
793-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
785+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
794786
}
795787

796788
/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -704,14 +704,10 @@ cluster AccessControl = 31 {
704704
fabric_idx fabricIndex = 254;
705705
}
706706

707-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
708-
fabric_idx fabricIndex = 254;
709-
}
710-
711-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
707+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
712708
int64u token = 0;
713-
nullable long_char_string instruction = 1;
714-
nullable long_char_string redirectURL = 2;
709+
optional long_char_string instruction = 1;
710+
optional long_char_string ARLRequestFlowUrl = 2;
715711
fabric_idx fabricIndex = 254;
716712
}
717713

@@ -738,7 +734,7 @@ cluster AccessControl = 31 {
738734
}
739735

740736
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
741-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
737+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
742738
}
743739

744740
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,10 @@ cluster AccessControl = 31 {
481481
fabric_idx fabricIndex = 254;
482482
}
483483

484-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
485-
fabric_idx fabricIndex = 254;
486-
}
487-
488-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
484+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
489485
int64u token = 0;
490-
nullable long_char_string instruction = 1;
491-
nullable long_char_string redirectURL = 2;
486+
optional long_char_string instruction = 1;
487+
optional long_char_string ARLRequestFlowUrl = 2;
492488
fabric_idx fabricIndex = 254;
493489
}
494490

@@ -515,7 +511,7 @@ cluster AccessControl = 31 {
515511
}
516512

517513
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
518-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
514+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
519515
}
520516

521517
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,10 @@ cluster AccessControl = 31 {
486486
fabric_idx fabricIndex = 254;
487487
}
488488

489-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
490-
fabric_idx fabricIndex = 254;
491-
}
492-
493-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
489+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
494490
int64u token = 0;
495-
nullable long_char_string instruction = 1;
496-
nullable long_char_string redirectURL = 2;
491+
optional long_char_string instruction = 1;
492+
optional long_char_string ARLRequestFlowUrl = 2;
497493
fabric_idx fabricIndex = 254;
498494
}
499495

@@ -520,7 +516,7 @@ cluster AccessControl = 31 {
520516
}
521517

522518
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
523-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
519+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
524520
}
525521

526522
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,10 @@ cluster AccessControl = 31 {
409409
fabric_idx fabricIndex = 254;
410410
}
411411

412-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
413-
fabric_idx fabricIndex = 254;
414-
}
415-
416-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
412+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
417413
int64u token = 0;
418-
nullable long_char_string instruction = 1;
419-
nullable long_char_string redirectURL = 2;
414+
optional long_char_string instruction = 1;
415+
optional long_char_string ARLRequestFlowUrl = 2;
420416
fabric_idx fabricIndex = 254;
421417
}
422418

@@ -443,7 +439,7 @@ cluster AccessControl = 31 {
443439
}
444440

445441
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
446-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
442+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
447443
}
448444

449445
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -606,14 +606,10 @@ cluster AccessControl = 31 {
606606
fabric_idx fabricIndex = 254;
607607
}
608608

609-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
610-
fabric_idx fabricIndex = 254;
611-
}
612-
613-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
609+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
614610
int64u token = 0;
615-
nullable long_char_string instruction = 1;
616-
nullable long_char_string redirectURL = 2;
611+
optional long_char_string instruction = 1;
612+
optional long_char_string ARLRequestFlowUrl = 2;
617613
fabric_idx fabricIndex = 254;
618614
}
619615

@@ -640,7 +636,7 @@ cluster AccessControl = 31 {
640636
}
641637

642638
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
643-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
639+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
644640
}
645641

646642
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -683,14 +683,10 @@ cluster AccessControl = 31 {
683683
fabric_idx fabricIndex = 254;
684684
}
685685

686-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
687-
fabric_idx fabricIndex = 254;
688-
}
689-
690-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
686+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
691687
int64u token = 0;
692-
nullable long_char_string instruction = 1;
693-
nullable long_char_string redirectURL = 2;
688+
optional long_char_string instruction = 1;
689+
optional long_char_string ARLRequestFlowUrl = 2;
694690
fabric_idx fabricIndex = 254;
695691
}
696692

@@ -717,7 +713,7 @@ cluster AccessControl = 31 {
717713
}
718714

719715
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
720-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
716+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
721717
}
722718

723719
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,10 @@ cluster AccessControl = 31 {
409409
fabric_idx fabricIndex = 254;
410410
}
411411

412-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
413-
fabric_idx fabricIndex = 254;
414-
}
415-
416-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
412+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
417413
int64u token = 0;
418-
nullable long_char_string instruction = 1;
419-
nullable long_char_string redirectURL = 2;
414+
optional long_char_string instruction = 1;
415+
optional long_char_string ARLRequestFlowUrl = 2;
420416
fabric_idx fabricIndex = 254;
421417
}
422418

@@ -443,7 +439,7 @@ cluster AccessControl = 31 {
443439
}
444440

445441
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
446-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
442+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
447443
}
448444

449445
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter

+4-8
Original file line numberDiff line numberDiff line change
@@ -507,14 +507,10 @@ cluster AccessControl = 31 {
507507
fabric_idx fabricIndex = 254;
508508
}
509509

510-
fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
511-
fabric_idx fabricIndex = 254;
512-
}
513-
514-
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
510+
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
515511
int64u token = 0;
516-
nullable long_char_string instruction = 1;
517-
nullable long_char_string redirectURL = 2;
512+
optional long_char_string instruction = 1;
513+
optional long_char_string ARLRequestFlowUrl = 2;
518514
fabric_idx fabricIndex = 254;
519515
}
520516

@@ -541,7 +537,7 @@ cluster AccessControl = 31 {
541537
}
542538

543539
/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
544-
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
540+
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
545541
}
546542

547543
/** This cluster provides attributes and events for determining basic information about Nodes, which supports both

0 commit comments

Comments
 (0)