Skip to content

Commit 8acd921

Browse files
committed
Use NGINX go client as dependency
1 parent 2f09ae0 commit 8acd921

File tree

5 files changed

+678
-60
lines changed

5 files changed

+678
-60
lines changed

Gopkg.lock

Lines changed: 27 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@
3636
[prune]
3737
go-tests = true
3838
unused-packages = true
39+
40+
[[constraint]]
41+
name = "github.com/nginxinc/nginx-plus-go-client"
42+
version = "0.4.0"

cmd/sync/main.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import (
1616
"github.com/aws/aws-sdk-go/aws/session"
1717
"github.com/aws/aws-sdk-go/service/autoscaling"
1818
"github.com/aws/aws-sdk-go/service/ec2"
19+
20+
nginx "github.com/nginxinc/nginx-plus-go-client/client"
1921
)
2022

2123
var configFile = flag.String("config_path", "/etc/nginx/aws.yaml", "Path to the config file")
@@ -51,7 +53,7 @@ func main() {
5153
}
5254

5355
httpClient := &http.Client{Timeout: connTimeoutInSecs * time.Second}
54-
nginx, err := NewNginxClient(httpClient, cfg.APIEndpoint)
56+
nginxClient, err := nginx.NewNginxClient(httpClient, cfg.APIEndpoint)
5557

5658
if err != nil {
5759
log.Printf("Couldn't create NGINX client: %v", err)
@@ -66,9 +68,9 @@ func main() {
6668

6769
for _, ups := range cfg.Upstreams {
6870
if ups.Kind == "http" {
69-
err = nginx.CheckIfUpstreamExists(ups.Name)
71+
err = nginxClient.CheckIfUpstreamExists(ups.Name)
7072
} else {
71-
err = nginx.CheckIfStreamUpstreamExists(ups.Name)
73+
err = nginxClient.CheckIfStreamUpstreamExists(ups.Name)
7274
}
7375

7476
if err != nil {
@@ -96,16 +98,17 @@ func main() {
9698
}
9799

98100
if upstream.Kind == "http" {
99-
var upsServers []UpstreamServer
101+
102+
var upsServers []nginx.UpstreamServer
100103
for _, ip := range ips {
101104
backend := fmt.Sprintf("%v:%v", ip, upstream.Port)
102-
upsServers = append(upsServers, UpstreamServer{
105+
upsServers = append(upsServers, nginx.UpstreamServer{
103106
Server: backend,
104107
MaxFails: 1,
105108
})
106109
}
107110

108-
added, removed, err := nginx.UpdateHTTPServers(upstream.Name, upsServers)
111+
added, removed, err := nginxClient.UpdateHTTPServers(upstream.Name, upsServers)
109112
if err != nil {
110113
log.Printf("Couldn't update HTTP servers in NGINX: %v", err)
111114
continue
@@ -115,16 +118,16 @@ func main() {
115118
log.Printf("Updated HTTP servers of %v; Added: %v, Removed: %v", upstream, added, removed)
116119
}
117120
} else {
118-
var upsServers []StreamUpstreamServer
121+
var upsServers []nginx.StreamUpstreamServer
119122
for _, ip := range ips {
120123
backend := fmt.Sprintf("%v:%v", ip, upstream.Port)
121-
upsServers = append(upsServers, StreamUpstreamServer{
124+
upsServers = append(upsServers, nginx.StreamUpstreamServer{
122125
Server: backend,
123126
MaxFails: 1,
124127
})
125128
}
126129

127-
added, removed, err := nginx.UpdateStreamServers(upstream.Name, upsServers)
130+
added, removed, err := nginxClient.UpdateStreamServers(upstream.Name, upsServers)
128131
if err != nil {
129132
log.Printf("Couldn't update Steam servers in NGINX: %v", err)
130133
continue

vendor/github.com/nginxinc/nginx-plus-go-client/LICENSE

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)