Upgraded the dependent go modules (#232) (#161)

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     working_directory: /go/pkg/mod/github.com/admiral
     docker:
-    - image: circleci/golang:1.16
+    - image: circleci/golang:1.17
     steps:
     - checkout
     - run:
@@ -107,7 +107,7 @@ jobs:
             ./run.sh "1.20.14" "1.12.2" "../out"
   publish-github-release:
     docker:
-    - image: circleci/golang:1.16
+    - image: circleci/golang:1.17
     working_directory: /go/pkg/mod/github.com/admiral
     steps:
     - attach_workspace:

Jenkinsfile.iks2

@@ -29,7 +29,7 @@ pipeline {
 
   environment {
     GO_INSTALL = "/go_install"
-    GO_VERSION = "1.13.5.linux-amd64"
+    GO_VERSION = "1.18.linux-amd64"
     GOROOT = "${env.GO_INSTALL + '/go'}"
     GOPRIVATE="github.intuit.com"
     PATH = "${env.PATH + ':' + env.GOROOT + '/bin'}"

admiral/pkg/apis/admiral/routes/handler_test.go

@@ -2,6 +2,7 @@ package routes
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http/httptest"
@@ -17,7 +18,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"istio.io/client-go/pkg/apis/networking/v1alpha3"
 	istiofake "istio.io/client-go/pkg/clientset/versioned/fake"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestReturnSuccessGET(t *testing.T) {
@@ -96,6 +97,7 @@ func TestGetClusters(t *testing.T) {
 }
 
 func TestGetServiceEntriesByCluster(t *testing.T) {
+	ctx := context.Background()
 	url := "https://admiral.com/cluster/cluster1/serviceentries"
 	opts := RouteOpts{
 		RemoteRegistry: clusters.NewRemoteRegistry(nil, common.AdmiralParams{}),
@@ -161,7 +163,7 @@ func TestGetServiceEntriesByCluster(t *testing.T) {
 			}
 			opts.RemoteRegistry = rr
 			if c.name == "success with service entry for cluster" {
-				fakeIstioClient.NetworkingV1alpha3().ServiceEntries("admiral-sync").Create(&v1alpha3.ServiceEntry{})
+				fakeIstioClient.NetworkingV1alpha3().ServiceEntries("admiral-sync").Create(ctx, &v1alpha3.ServiceEntry{}, metaV1.CreateOptions{})
 			}
 			opts.GetServiceEntriesByCluster(w, r)
 			resp := w.Result()
@@ -233,14 +235,14 @@ func TestGetGlobalTrafficPolicyByIdentityAndEnv(t *testing.T) {
 	globalTrafficCache := &mockGlobalTrafficCache{
 		identityCache: map[string]*v1.GlobalTrafficPolicy{
 			"stage.testID": {
-				ObjectMeta: meta_v1.ObjectMeta{
+				ObjectMeta: metaV1.ObjectMeta{
 					Namespace: "stage-testns",
 					Name:      "stage-testapp",
 					Labels:    map[string]string{"identity": "testID", "admiral.io/env": "stage"},
 				},
 			},
 			"default.testID": {
-				ObjectMeta: meta_v1.ObjectMeta{
+				ObjectMeta: metaV1.ObjectMeta{
 					Namespace: "default-testns",
 					Name:      "default-testapp",
 					Labels:    map[string]string{"identity": "testID", "admiral.io/env": "stage"},

admiral/pkg/apis/admiral/routes/handlers.go

@@ -103,11 +103,13 @@ func (opts *RouteOpts) GetServiceEntriesByCluster(w http.ResponseWriter, r *http
 	params := mux.Vars(r)
 	clusterName := strings.Trim(params["clustername"], " ")
 
-	var response []v1alpha3.ServiceEntry
+	var response []*v1alpha3.ServiceEntry
+
+	ctx := r.Context()
 
 	if clusterName != "" {
 
-		serviceEntriesByCluster, err := clusters.GetServiceEntriesByCluster(clusterName, opts.RemoteRegistry)
+		serviceEntriesByCluster, err := clusters.GetServiceEntriesByCluster(ctx, clusterName, opts.RemoteRegistry)
 
 		if err != nil {
 			log.Printf("API call get service entry by cluster failed for clustername %v with Error: %v", clusterName, err.Error())