From 05505b4600933f1b39c1e7e11a7ed9d3d3204dfe Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:43:40 -0700 Subject: [PATCH] Fix proto definition --- .../CHANGELOG.md | 10 +++------- .../src/Grpc/Proto/settlement.proto | 5 +++-- ...icrosoft.Azure.WebJobs.Extensions.ServiceBus.csproj | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md index 232b8c390f25..3d8334313407 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md @@ -1,15 +1,11 @@ # Release History -## 5.14.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed +## 5.13.2 (2023-10-18) ### Other Changes +- Updated proto service definition to use StringValue rather than string for deadletter error reason and description. + ## 5.13.1 (2023-10-17) ### Bugs Fixed diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/Proto/settlement.proto b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/Proto/settlement.proto index 9360a0d3ed7b..125fff115fd7 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/Proto/settlement.proto +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/Proto/settlement.proto @@ -1,6 +1,7 @@ syntax = "proto3"; import "google/protobuf/empty.proto"; +import "google/protobuf/wrappers.proto"; // this namespace will be shared between isolated worker and WebJobs extension so make it somewhat generic option csharp_namespace = "Microsoft.Azure.ServiceBus.Grpc"; @@ -35,8 +36,8 @@ message AbandonRequest { message DeadletterRequest { string locktoken = 1; bytes propertiesToModify = 2; - string deadletterReason = 3; - string deadletterErrorDescription = 4; + google.protobuf.StringValue deadletterReason = 3; + google.protobuf.StringValue deadletterErrorDescription = 4; } // The defer message request containing the locktoken and properties to modify. diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj index 9600ab78ac57..6935d84a7a3c 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj @@ -3,7 +3,7 @@ netstandard2.0;net6.0 Microsoft Azure WebJobs SDK ServiceBus Extension - 5.14.0-beta.1 + 5.13.2 5.13.1