Added Logic to Resolve Inconsistent Nil Slice In API Response (#3065)

communitybridge · Jul 27, 2021 · 7137777 · 7137777
1 parent e77b645
commit 7137777
Show file tree

Hide file tree

Showing 23 changed files with 405 additions and 236 deletions.
diff --git a/cla-backend-go/Makefile b/cla-backend-go/Makefile
@@ -41,7 +41,8 @@ setup: $(LINT_TOOL) setup-dev setup-deploy
 tool-setup:
 	@echo "Installing gobin for installing tools..."
 	@# gobin is the equivalent of 'go get' whilst in module-aware mode but this does not modify your go.mod
-	GO111MODULE=off go get -u github.com/myitcv/gobin
+	#GO111MODULE=off go get -u github.com/myitcv/gobin
+	go get -u github.com/myitcv/gobin
 
 setup_dev: setup-dev
 setup-dev: tool-setup
@@ -199,7 +200,7 @@ run:
 
 deps:
 	go env -w GOPRIVATE=github.com/LF-Engineering/*
-	go mod download
+	go mod download -x
 
 build: build-linux
 build-linux: deps

diff --git a/cla-backend-go/github/branch_protection/interfaces.go b/cla-backend-go/github/branch_protection/interfaces.go
@@ -6,7 +6,7 @@ package branch_protection
 import (
 	"context"
 
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 	"github.com/shurcooL/githubv4"
 )
 

diff --git a/cla-backend-go/github/branch_protection/mock.go b/cla-backend-go/github/branch_protection/mock.go
diff --git a/cla-backend-go/github/branch_protection/protected_branch.go b/cla-backend-go/github/branch_protection/protected_branch.go
@@ -14,7 +14,7 @@ import (
 
 	log "github.com/communitybridge/easycla/cla-backend-go/logging"
 
-	githubpkg "github.com/google/go-github/v33/github"
+	githubpkg "github.com/google/go-github/v37/github"
 )
 
 const (

diff --git a/cla-backend-go/github/branch_protection/protected_branch_limiter.go b/cla-backend-go/github/branch_protection/protected_branch_limiter.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/communitybridge/easycla/cla-backend-go/github"
-	githubpkg "github.com/google/go-github/v33/github"
+	githubpkg "github.com/google/go-github/v37/github"
 	"github.com/shurcooL/githubv4"
 	"go.uber.org/ratelimit"
 	"golang.org/x/time/rate"

diff --git a/cla-backend-go/github/client.go b/cla-backend-go/github/client.go
@@ -13,7 +13,7 @@ import (
 	"github.com/shurcooL/githubv4"
 
 	"github.com/bradleyfalzon/ghinstallation"
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 	"golang.org/x/oauth2"
 )
 

diff --git a/cla-backend-go/github/github_installation.go b/cla-backend-go/github/github_installation.go
@@ -11,7 +11,7 @@ import (
 	"github.com/communitybridge/easycla/cla-backend-go/utils"
 	"github.com/sirupsen/logrus"
 
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 
 	log "github.com/communitybridge/easycla/cla-backend-go/logging"
 )
@@ -40,15 +40,15 @@ func GetInstallationRepositories(ctx context.Context, installationID int64) ([]*
 	}
 
 	for {
-		repos, resp, err := client.Apps.ListRepos(ctx, opts)
+		listReposResponse, resp, err := client.Apps.ListRepos(ctx, opts)
 		if err != nil {
 			msg := fmt.Sprintf("error while getting repositories associated for installation, error: %+v", err)
 			log.WithFields(f).WithError(err).Warn(msg)
 			return nil, errors.New(msg)
 		}
 
-		log.WithFields(f).Debugf("fetched %d records...", len(repos))
-		allRepos = append(allRepos, repos...)
+		log.WithFields(f).Debugf("fetched %d records...", len(listReposResponse.Repositories))
+		allRepos = append(allRepos, listReposResponse.Repositories...)
 		if resp.NextPage == 0 {
 			break
 		}

diff --git a/cla-backend-go/github/github_org.go b/cla-backend-go/github/github_org.go
@@ -12,7 +12,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	log "github.com/communitybridge/easycla/cla-backend-go/logging"
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 )
 
 // errors

diff --git a/cla-backend-go/github/github_repository.go b/cla-backend-go/github/github_repository.go
@@ -13,7 +13,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/communitybridge/easycla/cla-backend-go/logging"
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 )
 
 // errors

diff --git a/cla-backend-go/github/github_user.go b/cla-backend-go/github/github_user.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/communitybridge/easycla/cla-backend-go/logging"
 
-	"github.com/google/go-github/v33/github"
+	"github.com/google/go-github/v37/github"
 )
 
 // GetUserDetails return github users details

diff --git a/cla-backend-go/github/handlers.go b/cla-backend-go/github/handlers.go
@@ -20,7 +20,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/gofrs/uuid"
-	ghLib "github.com/google/go-github/v33/github"
+	ghLib "github.com/google/go-github/v37/github"
 	"github.com/savaki/dynastore"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"

diff --git a/cla-backend-go/go.mod b/cla-backend-go/go.mod
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 module github.com/communitybridge/easycla/cla-backend-go
 
-go 1.15
+go 1.16
 
 replace github.com/awslabs/aws-lambda-go-api-proxy => github.com/LF-Engineering/aws-lambda-go-api-proxy v0.3.2
 
@@ -19,7 +19,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fnproject/fdk-go v0.0.2
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/gin-gonic/gin v1.7.2
 	github.com/go-openapi/errors v0.19.6
 	github.com/go-openapi/loads v0.19.5
@@ -31,50 +30,41 @@ require (
 	github.com/go-playground/validator/v10 v10.7.0 // indirect
 	github.com/go-resty/resty/v2 v2.3.0
 	github.com/gofrs/uuid v4.0.0+incompatible
-	github.com/golang/mock v1.4.4
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-github/v33 v33.0.0
+	github.com/golang/mock v1.6.0
+	github.com/google/go-github/v37 v37.0.0
 	github.com/google/uuid v1.1.4
 	github.com/gorilla/sessions v1.2.1 // indirect
 	github.com/imroc/req v0.3.0
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/juju/mempool v0.0.0-20160205104927-24974d6c264f // indirect
 	github.com/juju/zip v0.0.0-20160205105221-f6b1e93fa2e2
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mitchellh/mapstructure v1.3.2
+	github.com/mitchellh/mapstructure v1.4.1
 	github.com/mozillazg/request v0.8.0 // indirect
 	github.com/pdfcpu/pdfcpu v0.3.5-0.20200802160406-be1e0eb55afc
-	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/rs/cors v1.7.0
 	github.com/savaki/dynastore v0.0.0-20171109173440-28d8558bb429
 	github.com/shurcooL/githubv4 v0.0.0-20201206200315-234843c633fa
 	github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/afero v1.3.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.1
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.6.1
+	github.com/spf13/viper v1.8.1
+	github.com/stretchr/testify v1.7.0
 	github.com/tencentyun/scf-go-lib v0.0.0-20200116145541-9a6ea1bf75b8
 	github.com/ugorji/go v1.2.6 // indirect
 	github.com/verdverm/frisby v0.0.0-20170604211311-b16556248a9a
 	github.com/xanzy/go-gitlab v0.50.1
 	go.uber.org/ratelimit v0.1.0
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
+	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
+	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/ini.v1 v1.57.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ import ( @@
     	log "github.com/communitybridge/easycla/cla-backend-go/logging"
-    	githubpkg "github.com/google/go-github/v33/github"
+    	githubpkg "github.com/google/go-github/v37/github"
     )
     const (
@@ Expand Down @@