Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export function to get target from address #321

Merged
merged 3 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions v2/workloadapi/addr.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ func GetDefaultAddress() (string, bool) {
// a Workload API endpoint exposed as either a Unix
// Domain Socket or TCP socket.
func ValidateAddress(addr string) error {
_, err := parseTargetFromStringAddr(addr)
_, err := TargetFromAddress(addr)
return err
}

// parseTargetFromStringAddr parses the endpoint address and returns a gRPC target
// TargetFromAddress parses the endpoint address and returns a gRPC target
// string for dialing.
func parseTargetFromStringAddr(addr string) (string, error) {
func TargetFromAddress(addr string) (string, error) {
u, err := url.Parse(addr)
if err != nil {
return "", errors.New("workload endpoint socket is not a valid URI: " + err.Error())
Expand Down
2 changes: 1 addition & 1 deletion v2/workloadapi/client_posix.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ func (c *Client) setAddress() error {
}

var err error
c.config.address, err = parseTargetFromStringAddr(c.config.address)
c.config.address, err = TargetFromAddress(c.config.address)
return err
}
2 changes: 1 addition & 1 deletion v2/workloadapi/client_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (c *Client) setAddress() error {
c.config.dialOptions = append(c.config.dialOptions, grpc.WithContextDialer(winio.DialPipeContext))
}

c.config.address, err = parseTargetFromStringAddr(c.config.address)
c.config.address, err = TargetFromAddress(c.config.address)
return err
}

Expand Down