Skip to content

Commit dc8ed92

Browse files
authored
Merge pull request #237 from christianang/bump-alb-sdk
Fix query parameter encoding for Avi 30.1.1+
2 parents 9fe1641 + 7c480f3 commit dc8ed92

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/satori/go.uuid v1.2.0
1313
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20221104044415-a462bbe793b9
14-
github.com/vmware/alb-sdk v0.0.0-20230202152455-af9d49bac7ea
14+
github.com/vmware/alb-sdk v0.0.0-20240502042605-947bfcf176dd
1515
github.com/vmware/load-balancer-and-ingress-services-for-kubernetes v0.0.0-20231012053946-537d99c1eba2
1616
go.uber.org/zap v1.27.0
1717
gopkg.in/yaml.v3 v3.0.1
@@ -82,4 +82,3 @@ require (
8282
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8383
sigs.k8s.io/yaml v1.4.0 // indirect
8484
)
85-

go.sum

+2-3
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
153153
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
154154
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20221104044415-a462bbe793b9 h1:6syWK17nxSy26pyziCVSzd2ugTSqU3b2Rbx5Sx6djNY=
155155
github.com/vmware-tanzu/tanzu-framework/apis/run v0.0.0-20221104044415-a462bbe793b9/go.mod h1:QiVC4POQPEu3/eNLZOHFrjyRGwWp6AVpZRADBIK1uEc=
156-
github.com/vmware/alb-sdk v0.0.0-20230202152455-af9d49bac7ea h1:ZcleA18Of+bECNwSMGPmGehqCuaJhq5SXxY6ETP0m6g=
157-
github.com/vmware/alb-sdk v0.0.0-20230202152455-af9d49bac7ea/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
156+
github.com/vmware/alb-sdk v0.0.0-20240502042605-947bfcf176dd h1:90FBuhMMWHNCDwRS+YIIyy21iiK8sayvaE6iPV6gjsc=
157+
github.com/vmware/alb-sdk v0.0.0-20240502042605-947bfcf176dd/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
158158
github.com/vmware/load-balancer-and-ingress-services-for-kubernetes v0.0.0-20231012053946-537d99c1eba2 h1:KrokECCnbfSUM0CHUGltyue5RIzBU0UILAxpN06t1Zo=
159159
github.com/vmware/load-balancer-and-ingress-services-for-kubernetes v0.0.0-20231012053946-537d99c1eba2/go.mod h1:BBFHwD7OvIQ+C9+MKwfdwJyJWf/hrYLJj6XiPdjjZqY=
160160
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -280,4 +280,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
280280
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
281281
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
282282
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
283-

pkg/aviclient/client.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"crypto/x509"
1212
"encoding/json"
1313
"net/http"
14+
"net/url"
1415
"regexp"
1516
"strings"
1617

@@ -190,7 +191,7 @@ func (r *realAviClient) GetControllerVersion() (string, error) {
190191
}
191192

192193
func (r *realAviClient) GetObjectByName(obj string, name string, cloudName string, result interface{}, options ...session.ApiOptionsParams) error {
193-
uri := "/api/" + obj + "/?include_name&name=" + name + "&cloud_ref.name=" + cloudName
194+
uri := "/api/" + obj + "/?include_name&name=" + url.QueryEscape(name) + "&cloud_ref.name=" + url.QueryEscape(cloudName)
194195
res, err := r.AviSession.GetCollectionRaw(uri, options...)
195196
if err != nil {
196197
return err

0 commit comments

Comments
 (0)