Skip to content

Commit 9d0e8c3

Browse files
Update module github.com/nginxinc/nginx-plus-go-client to v2 (#801)
* Update module github.com/nginxinc/nginx-plus-go-client to v2 | datasource | package | from | to | | ---------- | ---------------------------------------- | ------ | ------ | | go | github.com/nginxinc/nginx-plus-go-client | v1.3.0 | v2.0.1 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Use context.TODO for now --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini <[email protected]>
1 parent 6f2c1f4 commit 9d0e8c3

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

cmd/sync/main.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"flag"
56
"fmt"
67
"io"
@@ -11,7 +12,7 @@ import (
1112
"syscall"
1213
"time"
1314

14-
nginx "github.com/nginxinc/nginx-plus-go-client/client"
15+
nginx "github.com/nginxinc/nginx-plus-go-client/v2/client"
1516
)
1617

1718
var (
@@ -76,10 +77,11 @@ func main() {
7677
}
7778

7879
for _, ups := range upstreams {
80+
ctx := context.TODO()
7981
if ups.Kind == "http" {
80-
err = nginxClient.CheckIfUpstreamExists(ups.Name)
82+
err = nginxClient.CheckIfUpstreamExists(ctx, ups.Name)
8183
} else {
82-
err = nginxClient.CheckIfStreamUpstreamExists(ups.Name)
84+
err = nginxClient.CheckIfStreamUpstreamExists(ctx, ups.Name)
8385
}
8486

8587
if err != nil {
@@ -106,6 +108,7 @@ func main() {
106108
log.Printf("Couldn't get the IP addresses for %v: %v", upstream.ScalingGroup, err)
107109
continue
108110
}
111+
ctx := context.TODO()
109112

110113
if upstream.Kind == "http" {
111114
var upsServers []nginx.UpstreamServer
@@ -120,7 +123,7 @@ func main() {
120123
})
121124
}
122125

123-
added, removed, updated, err := nginxClient.UpdateHTTPServers(upstream.Name, upsServers)
126+
added, removed, updated, err := nginxClient.UpdateHTTPServers(ctx, upstream.Name, upsServers)
124127
if err != nil {
125128
log.Printf("Couldn't update HTTP servers in NGINX: %v", err)
126129
continue
@@ -146,7 +149,7 @@ func main() {
146149
})
147150
}
148151

149-
added, removed, updated, err := nginxClient.UpdateStreamServers(upstream.Name, upsServers)
152+
added, removed, updated, err := nginxClient.UpdateStreamServers(ctx, upstream.Name, upsServers)
150153
if err != nil {
151154
log.Printf("Couldn't update Steam servers in NGINX: %v", err)
152155
continue

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14
1212
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.44.1
1313
github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0
14-
github.com/nginxinc/nginx-plus-go-client v1.3.0
14+
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
1515
gopkg.in/yaml.v3 v3.0.1
1616
)
1717

@@ -36,6 +36,7 @@ require (
3636
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
3737
golang.org/x/crypto v0.25.0 // indirect
3838
golang.org/x/net v0.27.0 // indirect
39+
golang.org/x/sync v0.8.0 // indirect
3940
golang.org/x/sys v0.22.0 // indirect
4041
golang.org/x/text v0.16.0 // indirect
4142
)

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
6161
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6262
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
6363
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
64-
github.com/nginxinc/nginx-plus-go-client v1.3.0 h1:q/aeT4B5k0KLwWlefoBzfLfraBBvIKLuDg+lLFWAo4I=
65-
github.com/nginxinc/nginx-plus-go-client v1.3.0/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4=
64+
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=
65+
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1/go.mod h1:He+1izxYxVVO5/C9ZTukwOpvkAx5eS19nRQgKXDhX5I=
6666
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
6767
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
6868
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -76,6 +76,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
7676
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
7777
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
7878
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
79+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
80+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
7981
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8082
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
8183
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

0 commit comments

Comments
 (0)