feat: Persist provider configuration in protobuf

internal/controlplane/handlers_repositories.go

@@ -32,7 +32,6 @@ import (
 	github "github.com/stacklok/mediator/internal/providers/github"
 	"github.com/stacklok/mediator/internal/reconcilers"
 	pb "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
-	provifv1 "github.com/stacklok/mediator/pkg/providers/v1"
 )
 
 // RegisterRepository adds repositories to the database and registers a webhook
@@ -406,7 +405,7 @@ func (s *Server) SyncRepositories(ctx context.Context, in *pb.SyncRepositoriesRe
 	}
 
 	// Populate the database with the repositories using the GraphQL API
-	client, err := github.NewRestClient(ctx, &provifv1.GitHubConfig{}, token.AccessToken, owner_filter)
+	client, err := github.NewRestClient(ctx, &pb.GitHubProviderConfig{}, token.AccessToken, owner_filter)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "cannot create github client: %v", err)
 	}

internal/providers/github/github.go

@@ -18,13 +18,15 @@ package github
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net/url"
 	"time"
 
 	"github.com/google/go-github/v53/github"
 	"golang.org/x/oauth2"
 
 	"github.com/stacklok/mediator/internal/db"
+	mediatorv1 "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 	provifv1 "github.com/stacklok/mediator/pkg/providers/v1"
 )
 
@@ -57,7 +59,12 @@ var _ provifv1.GitHub = (*RestClient)(nil)
 // BaseURL defaults to the public GitHub API, if needing to use a customer domain
 // endpoint (as is the case with GitHub Enterprise), set the Endpoint field in
 // the GitHubConfig struct
-func NewRestClient(ctx context.Context, config *provifv1.GitHubConfig, token string, owner string) (*RestClient, error) {
+func NewRestClient(
+	ctx context.Context,
+	config *mediatorv1.GitHubProviderConfig,
+	token string,
+	owner string,
+) (*RestClient, error) {
 	ts := oauth2.StaticTokenSource(
 		&oauth2.Token{AccessToken: token},
 	)
@@ -81,15 +88,20 @@ func NewRestClient(ctx context.Context, config *provifv1.GitHubConfig, token str
 }
 
 // ParseV1Config parses the raw config into a GitHubConfig struct
-func ParseV1Config(rawCfg json.RawMessage) (*provifv1.GitHubConfig, error) {
+func ParseV1Config(rawCfg json.RawMessage) (*mediatorv1.GitHubProviderConfig, error) {
 	type wrapper struct {
-		GitHub *provifv1.GitHubConfig `json:"github" yaml:"github" mapstructure:"github" validate:"required"`
+		GitHub *mediatorv1.GitHubProviderConfig `json:"github" yaml:"github" mapstructure:"github" validate:"required"`
 	}
 
 	var w wrapper
 	if err := provifv1.ParseAndValidate(rawCfg, &w); err != nil {
 		return nil, err
 	}
 
+	// Validate the config according to the protobuf validation rules.
+	if err := w.GitHub.Validate(); err != nil {
+		return nil, fmt.Errorf("error validating GitHub v1 provider config: %w", err)
+	}
+
 	return w.GitHub, nil
 }

internal/providers/github/github_test.go

@@ -20,13 +20,13 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	provifv1 "github.com/stacklok/mediator/pkg/providers/v1"
+	mediatorv1 "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 )
 
 func TestNewRestClient(t *testing.T) {
 	t.Parallel()
 
-	client, err := NewRestClient(context.Background(), &provifv1.GitHubConfig{
+	client, err := NewRestClient(context.Background(), &mediatorv1.GitHubProviderConfig{
 		Endpoint: "https://api.github.com",
 	}, "token", "")
 	assert.NoError(t, err)

internal/providers/http/http.go

@@ -18,12 +18,14 @@ package http
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 
 	"golang.org/x/oauth2"
 
+	mediatorv1 "github.com/stacklok/mediator/pkg/api/protobuf/go/mediator/v1"
 	provifv1 "github.com/stacklok/mediator/pkg/providers/v1"
 )
 
@@ -38,7 +40,7 @@ type REST struct {
 var _ provifv1.REST = (*REST)(nil)
 
 // NewREST creates a new RESTful client.
-func NewREST(config *provifv1.RESTConfig, tok string) (*REST, error) {
+func NewREST(config *mediatorv1.RESTProviderConfig, tok string) (*REST, error) {
 	var cli *http.Client
 
 	if tok != "" {
@@ -51,7 +53,7 @@ func NewREST(config *provifv1.RESTConfig, tok string) (*REST, error) {
 	}
 
 	var baseURL *url.URL
-	baseURL, err := baseURL.Parse(config.BaseURL)
+	baseURL, err := baseURL.Parse(config.GetBaseUrl())
 	if err != nil {
 		return nil, err
 	}
@@ -87,15 +89,20 @@ func (h *REST) Do(ctx context.Context, req *http.Request) (*http.Response, error
 }
 
 // ParseV1Config parses the raw config into a HTTPConfig struct
-func ParseV1Config(rawCfg json.RawMessage) (*provifv1.RESTConfig, error) {
+func ParseV1Config(rawCfg json.RawMessage) (*mediatorv1.RESTProviderConfig, error) {
 	type wrapper struct {
-		REST *provifv1.RESTConfig `json:"rest" validate:"required"`
+		REST *mediatorv1.RESTProviderConfig `json:"rest" validate:"required"`
 	}
 
 	var w wrapper
 	if err := provifv1.ParseAndValidate(rawCfg, &w); err != nil {
 		return nil, err
 	}
 
+	// Validate the config according to the protobuf validation rules.
+	if err := w.REST.Validate(); err != nil {
+		return nil, fmt.Errorf("error validating REST v1 provider config: %w", err)
+	}
+
 	return w.REST, nil
 }