Restrict the set of structs for which we generate legacy definitions. (…

…#24309) * Restrict the set of structs for which we generate legacy definitions. Most of the things in af-structs.h are not used, and fixing the names of some of them causes bad name collisions due to lack of namespacing. Just stop generating all of them except the ones we really use. * Address review comment
project-chip · Aug 29, 2023 · 1025213 · 1025213
1 parent eecc535
commit 1025213
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 584 deletions.
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.28
+            image: connectedhomeip/chip-build:0.6.30
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.28
+            image: connectedhomeip/chip-build:0.6.30
         defaults:
             run:
                 shell: sh

diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=451e602649b8b37ba6c9aab8ba5e30747293f778
 # 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.01.05-nightly
+ARG ZAP_VERSION=v2023.01.06-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

diff --git a/src/app/common/templates/legacy-struct-list.yaml b/src/app/common/templates/legacy-struct-list.yaml
@@ -0,0 +1,4 @@
+# List of structs for which we output a legacy definition in af-structs.h
+# Ideally this list should become empty.
+- DlCredential
+- ApplicationBasicApplication
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
@@ -9,7 +9,8 @@
         "templates/chip/helper.js"
     ],
     "resources": {
-        "weak-enum-list": "weak-enum-list.yaml"
+        "weak-enum-list": "weak-enum-list.yaml",
+        "legacy-struct-list": "legacy-struct-list.yaml"
     },
     "override": "../../zap-templates/common/override.js",
     "partials": [

diff --git a/src/app/zap-templates/templates/app/af-structs.zapt b/src/app/zap-templates/templates/app/af-structs.zapt
@@ -15,6 +15,7 @@
 
 {{#zcl_structs}}
 
+{{#if (isLegacyStruct (asUnderlyingType label))}}
 {{#if itemCnt}}
 // Struct for {{label}}
 typedef struct _{{asType label}} {
@@ -27,4 +28,5 @@ typedef struct _{{asType label}} {
 // this will result in all the references to the data being as uint8_t*
 typedef uint8_t {{asUnderlyingType label}};
 {{/if}}
+{{/if}}
 {{/zcl_structs}}