From b1179f2ab132324436dbc1a19814acb72112a849 Mon Sep 17 00:00:00 2001 From: bjernie Date: Thu, 2 Feb 2023 14:49:31 +0100 Subject: [PATCH 1/3] Moved RequiredWith from AppMesh match service_name to method_name --- internal/service/appmesh/route.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appmesh/route.go b/internal/service/appmesh/route.go index e2a8f18ace2b..53a4f11ff9ed 100644 --- a/internal/service/appmesh/route.go +++ b/internal/service/appmesh/route.go @@ -201,6 +201,7 @@ func ResourceRoute() *schema.Resource { "method_name": { Type: schema.TypeString, Optional: true, + RequiredWith: []string{"spec.0.grpc_route.0.match.0.service_name"}, }, "prefix": { @@ -212,7 +213,6 @@ func ResourceRoute() *schema.Resource { "service_name": { Type: schema.TypeString, Optional: true, - RequiredWith: []string{"spec.0.grpc_route.0.match.0.method_name"}, }, "port": { From c263258c74ab9b43e8b1d202469417f9f5337ea7 Mon Sep 17 00:00:00 2001 From: bjernie Date: Thu, 2 Feb 2023 15:03:03 +0100 Subject: [PATCH 2/3] Moved RequiredWith from appmesh route spec.0.grpc_route.0.match.0.service_name to spec.0.grpc_route.0.match.0.method_name --- internal/service/appmesh/route.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/appmesh/route.go b/internal/service/appmesh/route.go index 53a4f11ff9ed..36df02063025 100644 --- a/internal/service/appmesh/route.go +++ b/internal/service/appmesh/route.go @@ -199,8 +199,8 @@ func ResourceRoute() *schema.Resource { }, "method_name": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, RequiredWith: []string{"spec.0.grpc_route.0.match.0.service_name"}, }, @@ -211,8 +211,8 @@ func ResourceRoute() *schema.Resource { }, "service_name": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, }, "port": { From e3832f2512ac626093858d7f4e1554a3de19def9 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 10 Feb 2023 11:32:49 -0500 Subject: [PATCH 3/3] chore: changelog --- .changelog/29217.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/29217.txt diff --git a/.changelog/29217.txt b/.changelog/29217.txt new file mode 100644 index 000000000000..d0b4ae722867 --- /dev/null +++ b/.changelog/29217.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_appmesh_route: Fix RequiredWith setting for `spec.0.grpc_route.0.match.0.method_name` attribute +```