Skip to content

Commit 36f87b6

Browse files
authored
Merge pull request #224 from nais/repoauth
Regenerate API proto and dereference removed field
2 parents 049ad8a + 8f6f6a2 commit 36f87b6

File tree

7 files changed

+257
-300
lines changed

7 files changed

+257
-300
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ K8S_VERSION := 1.27.1
66
LAST_COMMIT = $(shell git rev-parse --short HEAD)
77
VERSION ?= $(DATE)-$(LAST_COMMIT)
88
LDFLAGS := -X github.com/nais/deploy/pkg/version.Revision=$(LAST_COMMIT) -X github.com/nais/deploy/pkg/version.Date=$(DATE) -X github.com/nais/deploy/pkg/version.BuildUnixTime=$(BUILDTIME)
9-
NAIS_API_COMMIT_SHA := 0f2590f0befcdc5473474007174bb4a5d0b1f97e
9+
NAIS_API_COMMIT_SHA := e1c532d516dfdd586dc98e6f7e5275d91c53dcf5
1010
NAIS_API_TARGET_DIR=pkg/naisapi/protoapi
1111
arch := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/)
1212
os := $(shell uname -s | tr '[:upper:]' '[:lower:]')

pkg/naisapi/naisapi.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ func NewClient(target string, insecureConnection bool) (*Client, error) {
3232

3333
func (c *Client) IsAuthorized(ctx context.Context, repo, team string) bool {
3434
resp, err := c.client.IsRepositoryAuthorized(ctx, &protoapi.IsRepositoryAuthorizedRequest{
35-
TeamSlug: team,
36-
Repository: repo,
37-
Authorization: protoapi.RepositoryAuthorization_DEPLOY,
35+
TeamSlug: team,
36+
Repository: repo,
3837
})
3938
if err != nil {
4039
log.WithError(err).Error("checking repo authorization in teams")

pkg/naisapi/protoapi/pagination.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/naisapi/protoapi/teams.pb.go

+250-292
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/naisapi/protoapi/teams_grpc.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/naisapi/protoapi/users.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/naisapi/protoapi/users_grpc.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)