Merge pull request #224 from nais/repoauth

Regenerate API proto and dereference removed field
nais · Jun 27, 2024 · 36f87b6 · 36f87b6
2 parents 049ad8a + 8f6f6a2
commit 36f87b6
Show file tree

Hide file tree

Showing 7 changed files with 257 additions and 300 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ K8S_VERSION := 1.27.1
 LAST_COMMIT = $(shell git rev-parse --short HEAD)
 VERSION ?= $(DATE)-$(LAST_COMMIT)
 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)
-NAIS_API_COMMIT_SHA := 0f2590f0befcdc5473474007174bb4a5d0b1f97e
+NAIS_API_COMMIT_SHA := e1c532d516dfdd586dc98e6f7e5275d91c53dcf5
 NAIS_API_TARGET_DIR=pkg/naisapi/protoapi
 arch := $(shell uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/)
 os := $(shell uname -s | tr '[:upper:]' '[:lower:]')

diff --git a/pkg/naisapi/naisapi.go b/pkg/naisapi/naisapi.go
@@ -32,9 +32,8 @@ func NewClient(target string, insecureConnection bool) (*Client, error) {
 
 func (c *Client) IsAuthorized(ctx context.Context, repo, team string) bool {
 	resp, err := c.client.IsRepositoryAuthorized(ctx, &protoapi.IsRepositoryAuthorizedRequest{
-		TeamSlug:      team,
-		Repository:    repo,
-		Authorization: protoapi.RepositoryAuthorization_DEPLOY,
+		TeamSlug:   team,
+		Repository: repo,
 	})
 	if err != nil {
 		log.WithError(err).Error("checking repo authorization in teams")

diff --git a/pkg/naisapi/protoapi/pagination.pb.go b/pkg/naisapi/protoapi/pagination.pb.go
diff --git a/pkg/naisapi/protoapi/teams.pb.go b/pkg/naisapi/protoapi/teams.pb.go
diff --git a/pkg/naisapi/protoapi/teams_grpc.pb.go b/pkg/naisapi/protoapi/teams_grpc.pb.go
diff --git a/pkg/naisapi/protoapi/users.pb.go b/pkg/naisapi/protoapi/users.pb.go
diff --git a/pkg/naisapi/protoapi/users_grpc.pb.go b/pkg/naisapi/protoapi/users_grpc.pb.go