From db829724ab1f9dcb7f7b089f452671baccc7b3af Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 4 Nov 2024 01:09:48 +0100 Subject: [PATCH 1/3] tests: fix ProtoBuf breaking detection to be wire-only Signed-off-by: Jan Kowalleck --- tools/src/test/proto/buf_breaking-remote.yaml | 1 - tools/src/test/proto/buf_breaking-version.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/src/test/proto/buf_breaking-remote.yaml b/tools/src/test/proto/buf_breaking-remote.yaml index 7c3dbf25..a5f8a6ca 100644 --- a/tools/src/test/proto/buf_breaking-remote.yaml +++ b/tools/src/test/proto/buf_breaking-remote.yaml @@ -3,5 +3,4 @@ version: v1 breaking: # https://buf.build/docs/configuration/v1/buf-yaml#breaking use: # see https://buf.build/docs/breaking/overview#rules-and-categories - - FILE - WIRE_JSON \ No newline at end of file diff --git a/tools/src/test/proto/buf_breaking-version.yaml b/tools/src/test/proto/buf_breaking-version.yaml index fcc81b05..a3e6e3fc 100644 --- a/tools/src/test/proto/buf_breaking-version.yaml +++ b/tools/src/test/proto/buf_breaking-version.yaml @@ -3,7 +3,6 @@ version: v1 breaking: # https://buf.build/docs/configuration/v1/buf-yaml#breaking use: # see https://buf.build/docs/breaking/overview#rules-and-categories - - FILE - WIRE_JSON except: # scope is to detect changes from one version to the other -> so ignore "FILE_SAME_PACKAGE" From a9dac7157c6f209444dc699b922bbb9c98122970 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 4 Nov 2024 01:16:17 +0100 Subject: [PATCH 2/3] adjust test runners Signed-off-by: Jan Kowalleck --- tools/src/test/proto/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/test/proto/test.sh b/tools/src/test/proto/test.sh index 2d793015..0896d3f5 100755 --- a/tools/src/test/proto/test.sh +++ b/tools/src/test/proto/test.sh @@ -69,7 +69,7 @@ function schema-breaking-version () { } compare '1.6' '1.5' - echo '>> skip compare' '1.5' '1.4' >&2 # <-- had breaking changes, which is acknowledged + compare '1.5' '1.4' compare '1.4' '1.3' echo '>> OK.' >&2 From cf72b7f4f397627f5eacceb7cf6aa71e4a9f5a8c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 4 Nov 2024 01:19:13 +0100 Subject: [PATCH 3/3] use only wire Signed-off-by: Jan Kowalleck --- tools/src/test/proto/buf_breaking-remote.yaml | 2 +- tools/src/test/proto/buf_breaking-version.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/src/test/proto/buf_breaking-remote.yaml b/tools/src/test/proto/buf_breaking-remote.yaml index a5f8a6ca..a55e156e 100644 --- a/tools/src/test/proto/buf_breaking-remote.yaml +++ b/tools/src/test/proto/buf_breaking-remote.yaml @@ -3,4 +3,4 @@ version: v1 breaking: # https://buf.build/docs/configuration/v1/buf-yaml#breaking use: # see https://buf.build/docs/breaking/overview#rules-and-categories - - WIRE_JSON \ No newline at end of file + - WIRE \ No newline at end of file diff --git a/tools/src/test/proto/buf_breaking-version.yaml b/tools/src/test/proto/buf_breaking-version.yaml index a3e6e3fc..d86b10e9 100644 --- a/tools/src/test/proto/buf_breaking-version.yaml +++ b/tools/src/test/proto/buf_breaking-version.yaml @@ -3,7 +3,7 @@ version: v1 breaking: # https://buf.build/docs/configuration/v1/buf-yaml#breaking use: # see https://buf.build/docs/breaking/overview#rules-and-categories - - WIRE_JSON + - WIRE except: # scope is to detect changes from one version to the other -> so ignore "FILE_SAME_PACKAGE" - FILE_SAME_PACKAGE \ No newline at end of file