Update files for compatibility with Go 1.18. go.mod has been set to 1.16

tonibear · Mar 16, 2022 · 83d4052 · 83d4052
1 parent 29047bf
commit 83d4052
Show file tree

Hide file tree

Showing 75 changed files with 421 additions and 7,258 deletions.
diff --git a/cluster/prov_k8s.go b/cluster/prov_k8s.go
@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"context"
 	"encoding/json"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,7 +35,7 @@ func (cluster *Cluster) K8SGetNodes() ([]Agent, error) {
 		cluster.LogPrintf(LvlErr, "Cannot init Kubernetes client API %s ", err)
 		return nil, err
 	}
-	nodes, err := client.CoreV1().Nodes().List(metav1.ListOptions{})
+	nodes, err := client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
 	agents := []Agent{}
 	for _, n := range nodes.Items {
 		var agent Agent

diff --git a/cluster/prov_k8s_db.go b/cluster/prov_k8s_db.go
@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"context"
 	"strconv"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -18,7 +19,7 @@ func (cluster *Cluster) K8SProvisionDatabaseService(s *ServerMonitor) {
 		return
 	}
 	namespace := &apiv1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: cluster.Name}}
-	_, err = client.CoreV1().Namespaces().Create(namespace)
+	_, err = client.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{})
 	if err != nil {
 		cluster.LogPrintf(LvlErr, "Cannot create namespace %s ", err)
 	}
@@ -88,7 +89,7 @@ func (cluster *Cluster) K8SProvisionDatabaseService(s *ServerMonitor) {
 			},
 		},
 	}
-	pvcresult, pvcerr := persistentVolumeClaims.Create(pvc)
+	pvcresult, pvcerr := persistentVolumeClaims.Create(context.TODO(), pvc, metav1.CreateOptions{})
 	if pvcerr != nil {
 		cluster.LogPrintf(LvlErr, "Cannot deploy Kubernetes pvc %s ", pvcerr)
 	}
@@ -182,7 +183,7 @@ func (cluster *Cluster) K8SProvisionDatabaseService(s *ServerMonitor) {
 
 	// Create Deployment
 	cluster.LogPrintf(LvlInfo, "Creating Kubernetes deployment...")
-	result, err := deploymentsClient.Create(deployment)
+	result, err := deploymentsClient.Create(context.TODO(), deployment, metav1.CreateOptions{})
 	if err != nil {
 		cluster.LogPrintf(LvlErr, "Cannot deploy Kubernetes deployment %s ", err)
 	}
@@ -209,7 +210,7 @@ func (cluster *Cluster) K8SProvisionDatabaseService(s *ServerMonitor) {
 		},
 	}
 	cluster.LogPrintf(LvlInfo, "Creating service...")
-	result2, err2 := servicesClient.Create(service)
+	result2, err2 := servicesClient.Create(context.TODO(), service, metav1.CreateOptions{})
 	if err2 != nil {
 		cluster.LogPrintf(LvlErr, "Cannot deploy Kubernetes service %s ", err2)
 		cluster.errorChan <- err2
@@ -238,15 +239,15 @@ func (cluster *Cluster) K8SUnprovisionDatabaseService(s *ServerMonitor) {
 	}
 
 	deletePolicy := metav1.DeletePropagationForeground
-	if err := deploymentsClient.Delete(s.Name, &metav1.DeleteOptions{
+	if err := deploymentsClient.Delete(context.TODO(), s.Name, metav1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}); err != nil {
 		cluster.LogPrintf(LvlErr, "Cannot delete Kubernetes deployment %s %s ", s.Name, err)
 		cluster.errorChan <- err
 	}
 	cluster.LogPrintf(LvlInfo, "Deleted Kubernetes deployment %s.", s.Name)
 	servicesClient := client.CoreV1().Services(cluster.Name)
-	if err := servicesClient.Delete(s.Name, &metav1.DeleteOptions{
+	if err := servicesClient.Delete(context.TODO(), s.Name, metav1.DeleteOptions{
 		PropagationPolicy: &deletePolicy,
 	}); err != nil {
 		cluster.LogPrintf(LvlErr, "Cannot delete Kubernetes service %s %s ", s.Name, err)

diff --git a/cluster/prov_k8s_prx.go b/cluster/prov_k8s_prx.go
@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"context"
 	"errors"
 	"strconv"
 
@@ -57,7 +58,7 @@ func (cluster *Cluster) K8SProvisionProxyService(prx DatabaseProxy) {
 
 	// Create Deployment
 	cluster.LogPrintf(LvlInfo, "Creating deployment...")
-	result, err := deploymentsClient.Create(deployment)
+	result, err := deploymentsClient.Create(context.TODO(), deployment, metav1.CreateOptions{})
 
 	if err != nil {
 		cluster.LogPrintf(LvlErr, "Cannot deploy Kubernetes service %s ", err)

diff --git a/go.mod b/go.mod
@@ -1,173 +1,158 @@
 module github.com/signal18/replication-manager
 
-go 1.12
+go 1.16
 
 replace github.com/kahing/goofys => github.com/georgyo/goofys v0.21.0
 
 require (
 	github.com/Azure/azure-pipeline-go v0.2.2
-	github.com/Azure/azure-sdk-for-go v33.2.0+incompatible
+	github.com/Azure/azure-sdk-for-go v44.0.0+incompatible
 	github.com/Azure/azure-storage-blob-go v0.8.0
-	github.com/Azure/go-autorest v12.2.0+incompatible
-	github.com/Azure/go-autorest/autorest v0.9.0
-	github.com/Azure/go-autorest/autorest/adal v0.6.0
-	github.com/Azure/go-autorest/autorest/azure/auth v0.3.0
-	github.com/Azure/go-autorest/autorest/azure/cli v0.3.0
-	github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect
-	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
+	github.com/Azure/go-autorest/autorest v0.11.0
+	github.com/Azure/go-autorest/autorest/adal v0.9.0
+	github.com/Azure/go-autorest/autorest/azure/auth v0.5.0
+	github.com/Azure/go-autorest/autorest/azure/cli v0.4.0
 	github.com/BurntSushi/toml v0.3.1
 	github.com/JaderDias/movingmedian v0.0.0-20170611140316-de8c410559fa
 	github.com/NYTimes/gziphandler v0.0.0-20180125165240-289a3b81f5ae
-	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/aclements/go-moremath v0.0.0-20170210193428-033754ab1fee
 	github.com/alyu/configparser v0.0.0-20151125021232-26b2fe18bee1
-	github.com/armon/go-metrics v0.0.0-20171117184120-7aa49fde8082
 	github.com/asaskevich/govalidator v0.0.0-20180115102450-4b3d68f87f17
 	github.com/aws/aws-sdk-go v1.29.24
 	github.com/bluele/logrus_slack v0.0.0-20170812021752-74aa3c9b7cc3
-	github.com/bluele/slack v0.0.0-20180528010058-b4b4d354a079
 	github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d
 	github.com/codegangsta/negroni v0.3.0
 	github.com/davecgh/go-spew v1.1.1
-	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dgryski/carbonzipper v0.0.0-20170426152955-d1a3cec4169b
 	github.com/dgryski/go-expirecache v0.0.0-20170314133854-743ef98b2adb
 	github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768
 	github.com/dgryski/go-trigram v0.0.0-20160407183937-79ec494e1ad0
 	github.com/dgryski/httputil v0.0.0-20160116060654-189c2918cd08
 	github.com/dustin/go-humanize v1.0.0
-	github.com/elgs/gojq v0.0.0-20201120033525-b5293fef2759
-	github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect
 	github.com/evmar/gocairo v0.0.0-20160222165215-ddd30f837497
-	github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
-	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a
 	github.com/facebookgo/grace v0.0.0-20170218225239-4afe952a37a4
-	github.com/facebookgo/httpdown v0.0.0-20160323221027-a3b1354551a2
 	github.com/facebookgo/pidfile v0.0.0-20150612191647-f242e2999868
-	github.com/facebookgo/stats v0.0.0-20151006221625-1b76add642e4
-	github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
-	github.com/fsnotify/fsnotify v1.4.7
-	github.com/fsouza/go-dockerclient v1.7.3
-	github.com/gin-contrib/cors v1.3.1
-	github.com/gin-gonic/gin v1.7.2
-	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gogo/protobuf v1.3.2
-	github.com/gonum/blas v0.0.0-20180125090452-e7c5890b24cf
-	github.com/gonum/floats v0.0.0-20180125090339-7de1f4ea7ab5
-	github.com/gonum/internal v0.0.0-20180125090855-fda53f8d2571
-	github.com/gonum/lapack v0.0.0-20180125091020-f0b8b25edece
 	github.com/gonum/matrix v0.0.0-20180124231301-a41cc49d4c29
 	github.com/google/uuid v1.1.2
-	github.com/googleapis/gnostic v0.3.1 // indirect
-	github.com/gorilla/context v1.1.1
 	github.com/gorilla/handlers v1.3.0
 	github.com/gorilla/mux v1.8.0
-	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v0.0.0-20180209192218-6ba88b7f1c1e
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
-	github.com/grpc-ecosystem/grpc-gateway v1.9.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/gwenn/yacr v0.0.0-20180209192453-77093bdc7e72
-	github.com/hashicorp/consul v0.0.0-20180215214858-1ce90e2a19ea
-	github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186
-	github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa
-	github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90
-	github.com/hashicorp/golang-lru v0.5.1
-	github.com/hashicorp/hcl v1.0.0
-	github.com/hashicorp/serf v0.0.0-20180213013805-d4f33d5b6a0b
 	github.com/helloyi/go-sshclient v1.0.0
 	github.com/howeyc/fsnotify v0.0.0-20151003194602-f0c08ee9c607
 	github.com/hpcloud/tail v1.0.0
 	github.com/hydrogen18/stalecucumber v0.0.0-20161215203336-0a94983f3e27
 	github.com/improbable-eng/grpc-web v0.14.0
-	github.com/inconshreveable/mousetrap v1.0.0
 	github.com/iu0v1/gelada v1.2.2
 	github.com/jacobsa/fuse v0.0.0-20211125163655-ffd6c474e806
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/jordan-wright/email v0.0.0-20160301001728-a62870b0c368
-	github.com/juju/errors v0.0.0-20170703010042-c7d06af17c68
-	github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect
-	github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect
-	github.com/kahing/goofys v0.23.1
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9
 	github.com/kisielk/og-rek v0.0.0-20170425174049-dd41cde712de
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20171229092148-f984502973a0
 	github.com/lestrrat/go-strftime v0.0.0-20170113112000-04ef93e28531
 	github.com/lib/pq v1.3.0
-	github.com/lxc/lxd v0.0.0-20210622204105-d8ec22465902
-	github.com/magiconair/properties v1.8.0
 	github.com/magneticio/vamp-router v0.0.0-20151116102511-29379b621548
-	github.com/mattn/go-runewidth v0.0.0-20170510074858-97311d9f7767
 	github.com/mattn/go-sqlite3 v1.9.0
-	github.com/micro/go-log v0.1.0 // indirect
 	github.com/micro/go-micro v0.1.4
-	github.com/micro/misc v0.1.0 // indirect
-	github.com/miekg/dns v1.1.43
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452
-	github.com/mitchellh/mapstructure v1.1.2
 	github.com/mjibson/go-dsp v0.0.0-20170104183934-49dba8372707
 	github.com/nsf/termbox-go v0.0.0-20180129072728-88b7b944be8b
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/pelletier/go-toml v1.2.0
 	github.com/percona/go-mysql v0.0.0-20190307200310-f5cfaf6a5e55
 	github.com/peterbourgon/g2g v0.0.0-20161124161852-0c2bab2b173d
 	github.com/pingcap/dumpling v0.0.0-20200319081211-255ce0d25719
-	github.com/pingcap/errors v0.11.4
-	github.com/pires/go-proxyproto v0.0.0-20190615163442-2c19fd512994
-	github.com/pkg/errors v0.9.1
-	github.com/pmezard/go-difflib v1.0.0
-	github.com/rs/cors v1.7.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/shirou/gopsutil v2.20.2+incompatible
-	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
 	github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
-	github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed
 	github.com/siddontang/go-mysql v0.0.0-20190311123328-7fc3b28d6104
 	github.com/siddontang/go-mysql-elasticsearch v0.0.0-20180201161913-f34f371d4391
 	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/afero v1.1.2
-	github.com/spf13/cast v1.3.0
 	github.com/spf13/cobra v0.0.6
-	github.com/spf13/jwalterweatherman v1.0.0
-	github.com/spf13/pflag v1.0.3
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0
-	github.com/stretchr/testify v1.5.1
-	github.com/swaggest/swgui v1.4.2 // indirect
+	github.com/stretchr/testify v1.6.1
 	github.com/tebeka/strftime v0.1.5
 	github.com/urfave/cli v1.22.3
-	github.com/walle/lll v1.0.1 // indirect
 	github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
 	github.com/xwb1989/sqlparser v0.0.0-20171128062118-da747e0c62c4
 	github.com/yoheimuta/protolint v0.32.0
-	go.uber.org/zap v1.14.0
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/net v0.0.0-20211105192438-b53810dc28af
-	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
-	golang.org/x/text v0.3.6
-	google.golang.org/appengine v1.6.6
+	google.golang.org/api v0.30.0
 	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced
 	google.golang.org/grpc v1.38.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
 	google.golang.org/protobuf v1.26.0
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b
-	gopkg.in/fsnotify/fsnotify.v1 v1.4.7
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/ini.v1 v1.55.0
-	gopkg.in/macaroon-bakery.v2 v2.3.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
-	gopkg.in/retry.v1 v1.0.3 // indirect
-	gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
-	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.0.0-20191016225839-816a9b7df678
-	k8s.io/apimachinery v0.0.0-20191017185446-6e68a40eebf9
-	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
-	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
-	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
+	k8s.io/api v0.18.2
+	k8s.io/apimachinery v0.18.2
+	k8s.io/client-go v0.18.2
+)
+
+require (
+	github.com/Microsoft/go-winio v0.5.0 // indirect
+	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
+	github.com/aclements/go-moremath v0.0.0-20170210193428-033754ab1fee // indirect
+	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
+	github.com/bluele/slack v0.0.0-20180528010058-b4b4d354a079 // indirect
+	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
+	github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect
+	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
+	github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
+	github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect
+	github.com/facebookgo/httpdown v0.0.0-20160323221027-a3b1354551a2 // indirect
+	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
+	github.com/facebookgo/stats v0.0.0-20151006221625-1b76add642e4 // indirect
+	github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
+	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
+	github.com/gin-gonic/gin v1.7.2 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gonum/blas v0.0.0-20180125090452-e7c5890b24cf // indirect
+	github.com/gonum/floats v0.0.0-20180125090339-7de1f4ea7ab5 // indirect
+	github.com/gonum/internal v0.0.0-20180125090855-fda53f8d2571 // indirect
+	github.com/gonum/lapack v0.0.0-20180125091020-f0b8b25edece // indirect
+	github.com/googleapis/gnostic v0.3.1 // indirect
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.1 // indirect
+	github.com/gorilla/sessions v0.0.0-20180209192218-6ba88b7f1c1e // indirect
+	github.com/hashicorp/consul v0.0.0-20180215214858-1ce90e2a19ea // indirect
+	github.com/hashicorp/go-discover v0.0.0-20220105235006-b95dfa40aaed // indirect
+	github.com/hashicorp/go-memdb v1.3.2 // indirect
+	github.com/hashicorp/go-msgpack v1.1.5 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+	github.com/hashicorp/go-syslog v1.0.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/go-version v1.4.0 // indirect
+	github.com/hashicorp/hil v0.0.0-20210521165536-27a72121fd40 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/memberlist v0.3.1 // indirect
+	github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 // indirect
+	github.com/hashicorp/raft v1.3.6 // indirect
+	github.com/hashicorp/raft-boltdb v0.0.0-20211202195631-7d34b9fb3f42 // indirect
+	github.com/hashicorp/serf v0.0.0-20180213013805-d4f33d5b6a0b // indirect
+	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494 // indirect
+	github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
+	github.com/mattn/go-runewidth v0.0.0-20170510074858-97311d9f7767 // indirect
+	github.com/miekg/dns v1.1.43 // indirect
+	github.com/mitchellh/cli v1.1.2 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 // indirect
+	github.com/pkg/xattr v0.4.6
+	github.com/rs/cors v1.7.0 // indirect
+	github.com/siddontang/go-log v0.0.0-20190221022429-1e957dd83bed // indirect
+	github.com/smartystreets/goconvey v1.7.2 // indirect
+	golang.org/x/tools v0.1.7 // indirect
+	google.golang.org/grpc/examples v0.0.0-20220316190256-c4cabf78f4a2 // indirect
 	nhooyr.io/websocket v1.8.7 // indirect
 )