github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resource: default peername to local in list endpoints (#19340)

pull/19320/head
Semir Patel 2023-10-23 16:30:47 -05:00 committed by GitHub
parent ee2f046383
commit 96606d114c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/grpc-external/services/resource/server.go
View File

@ -205,6 +205,11 @@ func validateWildcardTenancy(tenancy *pbresource.Tenancy, namePrefix string) err
return status.Errorf(codes.InvalidArgument, "name_prefix invalid: must be lowercase alphanumeric, got: %v", namePrefix) return status.Errorf(codes.InvalidArgument, "name_prefix invalid: must be lowercase alphanumeric, got: %v", namePrefix)
} }
// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
if tenancy.PeerName == "" {
tenancy.PeerName = resource.DefaultPeerName
}
return nil return nil
} }

9
agent/grpc-external/services/resource/server_test.go
View File

@ -157,6 +157,15 @@ func wildcardTenancyCases() map[string]struct {
PeerName: "local", PeerName: "local",
}, },
}, },
// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
"namespaced type with empty peername": {
typ: demo.TypeV2Artist,
tenancy: &pbresource.Tenancy{
Partition: resource.DefaultPartitionName,
Namespace: resource.DefaultNamespaceName,
PeerName: "",
},
},
"namespaced type with empty partition and namespace": { "namespaced type with empty partition and namespace": {
typ: demo.TypeV2Artist, typ: demo.TypeV2Artist,
tenancy: &pbresource.Tenancy{ tenancy: &pbresource.Tenancy{