From 1ee3ee6854e67a5a33d93cf908eaca99e460a964 Mon Sep 17 00:00:00 2001
From: Laukik Hase <laukik.hase@espressif.com>
Date: Fri, 27 May 2022 09:35:46 +0530
Subject: [PATCH] protobuf: Fix v4.21.0 (python) compatibility issue - Added
 auto-generated protobuf files (proto-c and python to   pre-commit hook ignore
 lists

---
 .flake8                         |  1 -
 .pre-commit-config.yaml         | 14 +++++++++++++-
 tools/ci/sonar_exclude_list.txt |  8 ++++++++
 tools/esp_prov/requirements.txt |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.flake8 b/.flake8
index 3c9277cc64..48d3265614 100644
--- a/.flake8
+++ b/.flake8
@@ -160,7 +160,6 @@ exclude =
         components/wifi_provisioning/python/wifi_config_pb2.py,
         components/wifi_provisioning/python/wifi_constants_pb2.py,
         components/esp_local_ctrl/python/esp_local_ctrl_pb2.py,
-        examples/provisioning/legacy/custom_config/components/custom_provisioning/python/custom_config_pb2.py,
 
 per-file-ignores =
     # Sphinx conf.py files use star imports to setup config variables
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index af69c571cd..d9a476c8d7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,12 +12,16 @@ repos:
         # 2 - any file matching *test*/*expected* (for host tests, if possible use this naming pattern always)
         # 3 - any directory named 'testdata'
         # 4 - IDF monitor test data
+        # 5 - protobuf auto-generated files
         exclude: &whitespace_excludes |
           (?x)^(
             .+\.(md|rst|map|bin)|
             .+test.*\/.*expected.*|
             .+\/testdata\/.+|
-            .+test_idf_monitor\/tests\/.+
+            .+test_idf_monitor\/tests\/.+|
+            .*_pb2.py|
+            .*.pb-c.h|
+            .*.pb-c.c
           )$
       - id: end-of-file-fixer
         exclude: *whitespace_excludes
@@ -35,6 +39,10 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
+        exclude: >
+          (?x)^(
+              .*_pb2.py
+          )$
   - repo: local
     hooks:
       - id: check-executables
@@ -98,6 +106,10 @@ repos:
           - 'mypy-extensions==0.4.3'
           - 'types-setuptools==57.4.14'
           - 'types-PyYAML==0.1.9'
+        exclude: >
+          (?x)^(
+              .*_pb2.py
+          )$
         language: python
         types: [python]
       - id: check-copyright
diff --git a/tools/ci/sonar_exclude_list.txt b/tools/ci/sonar_exclude_list.txt
index c1a4447911..b2be3463f9 100644
--- a/tools/ci/sonar_exclude_list.txt
+++ b/tools/ci/sonar_exclude_list.txt
@@ -20,3 +20,11 @@ components/http_parser/*.h
 
 # FATFS upstream code
 components/fatfs/src/**
+
+# Protobuf auto-generated files
+components/esp_local_ctrl/proto-c/**
+components/esp_local_ctrl/python/**
+components/protocomm/proto-c/**
+components/protocomm/python/**
+components/wifi_provisioning/proto-c/**
+components/wifi_provisioning/python/**
diff --git a/tools/esp_prov/requirements.txt b/tools/esp_prov/requirements.txt
index bedbc9c18a..0476ddd093 100644
--- a/tools/esp_prov/requirements.txt
+++ b/tools/esp_prov/requirements.txt
@@ -1,3 +1,3 @@
 future
-protobuf<4.0.0  # IDFCI-1278
 cryptography
+protobuf