Merge remote-tracking branch 'upstream/main' into auth-error

.gitattributes

@@ -8,7 +8,9 @@
 /docs/docs/cli/*.md linguist-generated=true
 /docs/docs/db/schema.md linguist-generated=true
 /docs/docs/protodocs/proto.md linguist-generated=true
-/pkg/generated/** linguist-generated=true
+/pkg/api/openapi/** linguist-generated=true
+/pkg/api/protobuf/go/mediator/v1/*.pb.go linguist-generated=true
+/pkg/api/protobuf/go/mediator/v1/*.gw.go linguist-generated=true
 /internal/db/db.go linguist-generated=true
 /internal/db/models.go linguist-generated=true
 /internal/db/querier.go linguist-generated=true

Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20.3@sha256:403f48633fb5ebd49f9a2b6ad6719f912df23dae44974a0c9445be331e72ff5e AS builder
+FROM golang:1.21.1@sha256:c416ceeec1cdf037b80baef1ccb402c230ab83a9134b34c0902c542eb4539c82 AS builder
 ENV APP_ROOT=/opt/app-root
 ENV GOPATH=$APP_ROOT
 

Makefile

@@ -48,7 +48,7 @@ gen: ## generate protobuf files
 	buf generate
 
 clean-gen:
-	rm -rf $(shell find pkg/generated -iname "*.go") & rm -rf $(shell find pkg/generated -iname "*.swagger.json") & rm -rf pkg/generated/protodocs
+	rm -rf $(shell find pkg/api -iname "*.go") & rm -rf $(shell find pkg/api -iname "*.swagger.json") & rm -rf pkg/api/protodocs
 
 cli-docs:
 	@mkdir -p docs/docs/cli
@@ -58,6 +58,7 @@ build: ## build golang binary
 	# @go build -ldflags "-X main.version=$(shell git describe --abbrev=0 --tags)" -o bin/$(projectname)
 	CGO_ENABLED=0 go build -trimpath -o ./bin/medic ./cmd/cli
 	CGO_ENABLED=0 go build -trimpath -o ./bin/$(projectname)-server ./cmd/server
+	CGO_ENABLED=0 go build -trimpath -o ./bin/medev ./cmd/dev
 
 run-cli: ## run the CLI, needs additional arguments
 	@go run -ldflags "-X main.version=$(shell git describe --abbrev=0 --tags)"  ./cmd/cli
@@ -144,4 +145,4 @@ dbschema:	## generate database schema with schema spy, monitor file until doc is
 
 mock:
 	mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/internal/db Store
-	mockgen -package mockgh -destination internal/providers/github/mock/github.go -source internal/providers/github/github.go RestAPI
+	mockgen -package mockgh -destination internal/providers/github/mock/github.go -source pkg/providers/v1/providers.go GitHub 

README.md

@@ -114,7 +114,7 @@ API Doc [here](https://mediator-docs.stacklok.dev/api)
 
 The APIs are defined in protobuf [here](https://github.com/stacklok/mediator/blob/main/proto/mediator/v1/mediator.proto).
 
-An OpenAPI / swagger spec is generated to [JSON](https://github.com/stacklok/mediator/blob/main/pkg/generated/openapi/mediator/v1/mediator.swagger.json) 
+An OpenAPI / swagger spec is generated to [JSON](https://github.com/stacklok/mediator/blob/main/pkg/api/openapi/mediator/v1/mediator.swagger.json) 
 
 It can be accessed over gRPC or HTTP using [gprc-gateway](https://grpc-ecosystem.github.io/grpc-gateway/).
 

buf.gen.yaml

@@ -16,18 +16,18 @@
 version: v1
 plugins:
   - name: go
-    out: pkg/generated/protobuf/go
+    out: pkg/api/protobuf/go
     opt: paths=source_relative
   - name: go-grpc
-    out: pkg/generated/protobuf/go
+    out: pkg/api/protobuf/go
     opt:
       - paths=source_relative
   - name: grpc-gateway
-    out: pkg/generated/protobuf/go
+    out: pkg/api/protobuf/go
     opt:
       - paths=source_relative
   - name: openapiv2
-    out: pkg/generated/openapi
+    out: pkg/api/openapi
   - plugin: buf.build/community/pseudomuto-doc:v1.5.1
     out: docs/docs/protodocs
     opt: "markdown,proto.md"

cmd/cli/app/artifact/artifact_get.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // repo_listCmd represents the list command to list repos with the

cmd/cli/app/artifact/artifact_list.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/stacklok/mediator/internal/auth"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var artifact_listCmd = &cobra.Command{

cmd/cli/app/auth/auth_login.go

@@ -30,7 +30,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // auth_loginCmd represents the login command

cmd/cli/app/auth/auth_logout.go

@@ -30,7 +30,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // auth_logoutCmd represents the logout command

cmd/cli/app/auth/auth_refresh.go

@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Auth_refreshCmd represents the auth refresh command

cmd/cli/app/auth/auth_revoke.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Auth_revokeCmd represents the auth revoke command

cmd/cli/app/auth/auth_revoke_provider.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Auth_revokeproviderCmd represents the auth revoke command
@@ -61,7 +61,7 @@ var Auth_revokeproviderCmd = &cobra.Command{
 		defer cancel()
 		client := pb.NewOAuthServiceClient(conn)
 		if all {
-			result, err := client.RevokeOauthTokens(ctx, &pb.RevokeOauthTokensRequest{Provider: provider})
+			result, err := client.RevokeOauthTokens(ctx, &pb.RevokeOauthTokensRequest{})
 			util.ExitNicelyOnError(err, "Error revoking tokens")
 			cmd.Println("Revoked a total of ", result.RevokedTokens, " tokens")
 		} else {
@@ -79,5 +79,6 @@ var Auth_revokeproviderCmd = &cobra.Command{
 func init() {
 	AuthCmd.AddCommand(Auth_revokeproviderCmd)
 	Auth_revokeproviderCmd.Flags().StringP("provider", "n", "", "Name for the provider to revoke tokens for")
+	Auth_revokeproviderCmd.Flags().Int32P("group-id", "g", 0, "ID of the group for repo registration")
 	Auth_revokeproviderCmd.Flags().BoolP("all", "a", false, "Revoke all tokens")
 }

cmd/cli/app/group/group_create.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Group_createCmd is the command for creating a group

cmd/cli/app/group/group_delete.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var group_deleteCmd = &cobra.Command{

cmd/cli/app/group/group_get.go

@@ -31,7 +31,7 @@ import (
 
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 func printGroup(group protoreflect.ProtoMessage, format string) {

cmd/cli/app/group/group_list.go

@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var group_listCmd = &cobra.Command{

cmd/cli/app/keys/keys_generate.go

@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var genKeys_listCmd = &cobra.Command{

cmd/cli/app/org/org_create.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Org_createCmd is the command for creating an organization

cmd/cli/app/org/org_delete.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var org_deleteCmd = &cobra.Command{

cmd/cli/app/org/org_get.go

@@ -31,7 +31,7 @@ import (
 
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 func printOrganization(org protoreflect.ProtoMessage, format string) {

cmd/cli/app/org/org_list.go

@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var org_listCmd = &cobra.Command{

cmd/cli/app/policy/policy_create.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Policy_createCmd represents the policy create command

cmd/cli/app/policy/policy_delete.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var policy_deleteCmd = &cobra.Command{

cmd/cli/app/policy/policy_get.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var policy_getCmd = &cobra.Command{

cmd/cli/app/policy/policy_list.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var policy_listCmd = &cobra.Command{

cmd/cli/app/policy/table_render.go

@@ -24,7 +24,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/stacklok/mediator/internal/entities"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 func initializeTable(cmd *cobra.Command) *tablewriter.Table {

cmd/cli/app/policy_status/policy_status_get.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/entities"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var policystatus_getCmd = &cobra.Command{

cmd/cli/app/policy_status/policy_status_list.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/stacklok/mediator/cmd/cli/app"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var policystatus_listCmd = &cobra.Command{

cmd/cli/app/policy_status/table_render.go

@@ -20,11 +20,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/charmbracelet/glamour"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 const (
@@ -160,5 +161,12 @@ func guidanceOrEncouragement(status, guidance string) string {
 		return "No guidance available for this rule 😞"
 	}
 
-	return guidance
+	// TODO: use a color scheme for mediator instead of a pre-defined one.
+	// Related-to: https://github.com/stacklok/mediator/issues/1006
+	renderedGuidance, err := glamour.Render(guidance, "dark")
+	if err != nil {
+		return guidance
+	}
+
+	return renderedGuidance
 }

cmd/cli/app/provider/provider_enroll.go

@@ -36,7 +36,7 @@ import (
 
 	ghclient "github.com/stacklok/mediator/internal/providers/github"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Response is the response from the OAuth callback server.

cmd/cli/app/repo/repo_get.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stacklok/mediator/cmd/cli/app"
 	github "github.com/stacklok/mediator/internal/providers/github"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 const (

cmd/cli/app/repo/repo_list.go

@@ -25,7 +25,7 @@ import (
 
 	github "github.com/stacklok/mediator/internal/providers/github"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // repo_listCmd represents the list command to list repos with the

cmd/cli/app/repo/repo_register.go

@@ -33,7 +33,7 @@ import (
 
 	github "github.com/stacklok/mediator/internal/providers/github"
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // repo_registerCmd represents the register command to register a repo with the

cmd/cli/app/role/role_create.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 // Role_createCmd represents the role create command

cmd/cli/app/role/role_delete.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var role_deleteCmd = &cobra.Command{

cmd/cli/app/role/role_get.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 var role_getCmd = &cobra.Command{

cmd/cli/app/role/role_list.go

@@ -32,7 +32,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"github.com/stacklok/mediator/internal/util"
-	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
+	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 func printRoles(rolesById *pb.GetRolesByGroupResponse, rolesByGroup *pb.GetRolesResponse, format string) {