Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jul 27, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dcc138
Added Logic to Resolve Inconsistent Nil Slice In API Response
dealako Jul 27, 2021
05b5cae
Resolved Nil Slice Issue in Response Model
dealako Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cla-backend-go/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/branch_protection/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/branch_protection/mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cla-backend-go/github/branch_protection/protected_branch.go
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion cla-backend-go/github/branch_protection/protected_branch_limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cla-backend-go/github/github_installation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/github_org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/github_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/github_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/github/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
32 changes: 11 additions & 21 deletions cla-backend-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
)
Loading