Skip to content

Commit b31c6a2

Browse files
authored
update loopback to normalize endpoint_url (#5603)
1 parent ea7ed5c commit b31c6a2

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/hashicorp/go-secure-stdlib/kv-builder v0.1.2
4646
github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9
4747
github.com/hashicorp/go-secure-stdlib/mlock v0.1.3
48-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8
48+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0
4949
github.com/hashicorp/go-secure-stdlib/password v0.1.3
5050
github.com/hashicorp/go-secure-stdlib/permitpool v1.0.0
5151
github.com/hashicorp/go-secure-stdlib/pluginutil/v2 v2.0.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9 h1:0S0ctJ7Ra8O7ap+/3fZ
235235
github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9/go.mod h1:TNNdgtjLgVDbrgFcyCKrlAicIl3dZF94swJltyGUX2M=
236236
github.com/hashicorp/go-secure-stdlib/mlock v0.1.3 h1:kH3Rhiht36xhAfhuHyWJDgdXXEx9IIZhDGRk24CDhzg=
237237
github.com/hashicorp/go-secure-stdlib/mlock v0.1.3/go.mod h1:ov1Q0oEDjC3+A4BwsG2YdKltrmEw8sf9Pau4V9JQ4Vo=
238-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc=
239-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0=
238+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 h1:U+kC2dOhMFQctRfhK0gRctKAPTloZdMU5ZJxaesJ/VM=
239+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0/go.mod h1:Ll013mhdmsVDuoIXVfBtvgGJsXDYkTw1kooNcoCXuE0=
240240
github.com/hashicorp/go-secure-stdlib/password v0.1.3 h1:/2S3qhBDGbI0DoSgSC8m9EaiRelgGrJmApZIDb/8Xv8=
241241
github.com/hashicorp/go-secure-stdlib/password v0.1.3/go.mod h1:JPOgAG+z70auO30+LCRhvZKxGAh8cfXorXNJWGlFiVQ=
242242
github.com/hashicorp/go-secure-stdlib/permitpool v1.0.0 h1:U6y5MXGiDVOOtkWJ6o/tu1TxABnI0yKTQWJr7z6BpNk=

internal/host/plugin/repository_host_catalog.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ func normalizeCatalogAttributes(ctx context.Context, plgClient plgpb.HostPluginS
5151
})
5252
switch {
5353
case err == nil:
54+
// TODO: this should be updated to return these attributes rather than updating them in-place
5455
if ret.Attributes != nil {
5556
plgHc.Attrs = &pb.HostCatalog_Attributes{
5657
Attributes: ret.Attributes,

internal/plugin/loopback/storage.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717

1818
"github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/storagebuckets"
1919
plgpb "github.com/hashicorp/boundary/sdk/pbs/plugin"
20+
"github.com/hashicorp/go-secure-stdlib/parseutil"
2021
"google.golang.org/grpc/codes"
2122
"google.golang.org/grpc/status"
2223
"google.golang.org/protobuf/types/known/structpb"
@@ -141,9 +142,15 @@ func (l *LoopbackStorage) normalizeStorageBucketData(ctx context.Context, req *p
141142
if req.GetAttributes() == nil {
142143
return nil, status.Errorf(codes.InvalidArgument, "%s: missing attributes", op)
143144
}
145+
attrs := req.GetAttributes()
146+
if endpoint, ok := attrs.GetFields()["endpoint_url"]; ok {
147+
if endpoint, err := parseutil.NormalizeAddr(endpoint.GetStringValue()); err == nil {
148+
attrs.Fields["endpoint_url"] = structpb.NewStringValue(endpoint)
149+
}
150+
}
144151
l.normalizations++
145152
return &plgpb.NormalizeStorageBucketDataResponse{
146-
Attributes: req.GetAttributes(),
153+
Attributes: attrs,
147154
}, nil
148155
}
149156

0 commit comments

Comments
 (0)