Fix protoc lint uses different version than docker image (#125)

.github/workflows/ci.yml

@@ -25,6 +25,8 @@ jobs:
             name: Check typing with mypy
           - id: pytest
             name: Run tests with pytest
+          - id: protoc
+            name: Check protobuf files match
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -69,3 +71,14 @@ jobs:
         if: ${{ matrix.id == 'mypy' }}
       - run: pytest -vv --tb=native tests
         if: ${{ matrix.id == 'pytest' }}
+      - run: |
+          docker run \
+            -v "$PWD":/aioesphomeapi \
+            ghcr.io/esphome/aioesphomeapi-proto-builder:latest
+          if ! git diff --quiet; then
+            echo "You have altered the generated proto files but they do not match what is expected."
+            echo "Please run the following to update the generated files:"
+            echo 'docker run -v "$PWD":/aioesphomeapi ghcr.io/esphome/aioesphomeapi-proto-builder:latest'
+            exit 1
+          fi
+        if: ${{ matrix.id == 'protoc' }}

.github/workflows/protoc-lint.yml

@@ -1,37 +0,0 @@
-name: Check protobuf generated files
-
-on:
-  pull_request:
-    paths:
-      - aioesphomeapi/api_options_pb2.py
-      - aioesphomeapi/api_pb2.py
-
-jobs:
-  protoc-update:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-      - name: Install protoc
-        run: |
-          sudo apt-get install protobuf-compiler
-      - name: Set up Python environment
-        run: |
-          pip3 install -e .
-          pip3 install -r requirements_test.txt
-
-      - name: Generate protoc
-        run: |
-          script/gen-protoc
-
-      - name: Check changes
-        run: |
-          if ! git diff --quiet; then
-            echo "You have altered the generated proto files but they do not match what is expected."
-            echo "Please check your local protobuf-compiler version."
-            protoc --version
-            exit 1
-          fi

.github/workflows/protoc-update.yml

@@ -1,36 +0,0 @@
-name: Update protobuf generated files
-
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  protoc-update:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-      - name: Install protoc
-        run: |
-          sudo apt-get install protobuf-compiler
-      - name: Set up Python environment
-        run: |
-          pip3 install -e .
-          pip3 install -r requirements_test.txt
-
-      - name: Generate protoc
-        run: |
-          script/gen-protoc
-      # github actions email from here: https://github.community/t/github-actions-bot-email-address/17204
-      - name: Commit changes
-        run: |
-          if ! git diff --quiet; then
-            git config --global user.name "github-actions[bot]"
-            git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git commit -am "Update protobuf files"
-            git push
-          fi

Dockerfile

@@ -1,7 +1,13 @@
-FROM python:3.9
+FROM python:3.10
 
-RUN apt-get update && \
-    apt-get install -y protobuf-compiler
+RUN \
+    apt-get update \
+    && apt-get install -y --no-install-recommends \
+        protobuf-compiler=3.12.4-1 \
+    && rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
 
 WORKDIR /aioesphomeapi
 

aioesphomeapi/api_options_pb2.py

@@ -1,9 +1,8 @@
 # type: ignore
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: api_options.proto
 
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
 from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
@@ -22,7 +21,8 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   package='',
   syntax='proto2',
   serialized_options=None,
-  serialized_pb=_b('\n\x11\x61pi_options.proto\x1a google/protobuf/descriptor.proto\"\x06\n\x04void*F\n\rAPISourceType\x12\x0f\n\x0bSOURCE_BOTH\x10\x00\x12\x11\n\rSOURCE_SERVER\x10\x01\x12\x11\n\rSOURCE_CLIENT\x10\x02:E\n\x16needs_setup_connection\x12\x1e.google.protobuf.MethodOptions\x18\x8e\x08 \x01(\x08:\x04true:C\n\x14needs_authentication\x12\x1e.google.protobuf.MethodOptions\x18\x8f\x08 \x01(\x08:\x04true:/\n\x02id\x12\x1f.google.protobuf.MessageOptions\x18\x8c\x08 \x01(\r:\x01\x30:M\n\x06source\x12\x1f.google.protobuf.MessageOptions\x18\x8d\x08 \x01(\x0e\x32\x0e.APISourceType:\x0bSOURCE_BOTH:/\n\x05ifdef\x12\x1f.google.protobuf.MessageOptions\x18\x8e\x08 \x01(\t:3\n\x03log\x12\x1f.google.protobuf.MessageOptions\x18\x8f\x08 \x01(\x08:\x04true:9\n\x08no_delay\x12\x1f.google.protobuf.MessageOptions\x18\x90\x08 \x01(\x08:\x05\x66\x61lse')
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x11\x61pi_options.proto\x1a google/protobuf/descriptor.proto\"\x06\n\x04void*F\n\rAPISourceType\x12\x0f\n\x0bSOURCE_BOTH\x10\x00\x12\x11\n\rSOURCE_SERVER\x10\x01\x12\x11\n\rSOURCE_CLIENT\x10\x02:E\n\x16needs_setup_connection\x12\x1e.google.protobuf.MethodOptions\x18\x8e\x08 \x01(\x08:\x04true:C\n\x14needs_authentication\x12\x1e.google.protobuf.MethodOptions\x18\x8f\x08 \x01(\x08:\x04true:/\n\x02id\x12\x1f.google.protobuf.MessageOptions\x18\x8c\x08 \x01(\r:\x01\x30:M\n\x06source\x12\x1f.google.protobuf.MessageOptions\x18\x8d\x08 \x01(\x0e\x32\x0e.APISourceType:\x0bSOURCE_BOTH:/\n\x05ifdef\x12\x1f.google.protobuf.MessageOptions\x18\x8e\x08 \x01(\t:3\n\x03log\x12\x1f.google.protobuf.MessageOptions\x18\x8f\x08 \x01(\x08:\x04true:9\n\x08no_delay\x12\x1f.google.protobuf.MessageOptions\x18\x90\x08 \x01(\x08:\x05\x66\x61lse'
   ,
   dependencies=[google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,])
 
@@ -31,19 +31,23 @@ _APISOURCETYPE = _descriptor.EnumDescriptor(
   full_name='APISourceType',
   filename=None,
   file=DESCRIPTOR,
+  create_key=_descriptor._internal_create_key,
   values=[
     _descriptor.EnumValueDescriptor(
       name='SOURCE_BOTH', index=0, number=0,
       serialized_options=None,
-      type=None),
+      type=None,
+      create_key=_descriptor._internal_create_key),
     _descriptor.EnumValueDescriptor(
       name='SOURCE_SERVER', index=1, number=1,
       serialized_options=None,
-      type=None),
+      type=None,
+      create_key=_descriptor._internal_create_key),
     _descriptor.EnumValueDescriptor(
       name='SOURCE_CLIENT', index=2, number=2,
       serialized_options=None,
-      type=None),
+      type=None,
+      create_key=_descriptor._internal_create_key),
   ],
   containing_type=None,
   serialized_options=None,
@@ -64,7 +68,7 @@ needs_setup_connection = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=True,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 NEEDS_AUTHENTICATION_FIELD_NUMBER = 1039
 needs_authentication = _descriptor.FieldDescriptor(
   name='needs_authentication', full_name='needs_authentication', index=1,
@@ -72,7 +76,7 @@ needs_authentication = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=True,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 ID_FIELD_NUMBER = 1036
 id = _descriptor.FieldDescriptor(
   name='id', full_name='id', index=2,
@@ -80,7 +84,7 @@ id = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=0,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 SOURCE_FIELD_NUMBER = 1037
 source = _descriptor.FieldDescriptor(
   name='source', full_name='source', index=3,
@@ -88,15 +92,15 @@ source = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=0,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 IFDEF_FIELD_NUMBER = 1038
 ifdef = _descriptor.FieldDescriptor(
   name='ifdef', full_name='ifdef', index=4,
   number=1038, type=9, cpp_type=9, label=1,
-  has_default_value=False, default_value=_b("").decode('utf-8'),
+  has_default_value=False, default_value=b"".decode('utf-8'),
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 LOG_FIELD_NUMBER = 1039
 log = _descriptor.FieldDescriptor(
   name='log', full_name='log', index=5,
@@ -104,7 +108,7 @@ log = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=True,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 NO_DELAY_FIELD_NUMBER = 1040
 no_delay = _descriptor.FieldDescriptor(
   name='no_delay', full_name='no_delay', index=6,
@@ -112,7 +116,7 @@ no_delay = _descriptor.FieldDescriptor(
   has_default_value=True, default_value=False,
   message_type=None, enum_type=None, containing_type=None,
   is_extension=True, extension_scope=None,
-  serialized_options=None, file=DESCRIPTOR)
+  serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key)
 
 
 _VOID = _descriptor.Descriptor(
@@ -121,6 +125,7 @@ _VOID = _descriptor.Descriptor(
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -149,11 +154,11 @@ DESCRIPTOR.extensions_by_name['log'] = log
 DESCRIPTOR.extensions_by_name['no_delay'] = no_delay
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-void = _reflection.GeneratedProtocolMessageType('void', (_message.Message,), dict(
-  DESCRIPTOR = _VOID,
-  __module__ = 'api_options_pb2'
+void = _reflection.GeneratedProtocolMessageType('void', (_message.Message,), {
+  'DESCRIPTOR' : _VOID,
+  '__module__' : 'api_options_pb2'
   # @@protoc_insertion_point(class_scope:void)
-  ))
+  })
 _sym_db.RegisterMessage(void)
 
 google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(needs_setup_connection)