-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement ProviderFactory and ProviderClassFactory
Relates to #2845 Introduce two new constructs for creating providers. The top-level ProviderFactory takes the name/project or ID of a provider and instantiates it. In order to instantiate it, it checks the class of the provider, and delegates it to a ProviderClassFactory, which is responsible for creating it. This split exists so that we can register new types of provider while minimizing changes to existing code. This PR does not make use of the new interfaces. Instead, it just adds the implementations. This is to simplify review - the process of getting rid of the ProviderBuilder will involve a large number of small changes to many parts of code, and that will happen in another PR. Some points worth noting: 1) This does not provide a ProviderClassFactory for REST or Git since we do not use standalone instances of those providers at this point in time. It should be trivial to write factories for those at the point in time when we need them. 2) Based on discussion with Ozz and Jakub, I have decided to assume that the provider class column of the providers table will not be null for valid providers. This approach uses the class to figure out which concrete type is used to instantiate the provider, and is orthogonal to the traits, which describe the set of interfaces which that provider can support. In a future PR, I will make the class column non-nullable.
- Loading branch information
Showing
7 changed files
with
705 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
// Copyright 2024 Stacklok, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// Package factory contains logic for creating Provider instances | ||
package factory | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
"fmt" | ||
|
||
"github.com/google/uuid" | ||
|
||
"github.com/stacklok/minder/internal/db" | ||
"github.com/stacklok/minder/internal/providers" | ||
v1 "github.com/stacklok/minder/pkg/providers/v1" | ||
) | ||
|
||
// ProviderFactory describes an interface for creating instances of a Provider | ||
type ProviderFactory interface { | ||
// BuildFromID creates the provider from the Provider's UUID | ||
BuildFromID(ctx context.Context, providerID uuid.UUID) (v1.Provider, error) | ||
// BuildFromNameProject creates the provider using the provider's name and | ||
// project hierarchy. | ||
BuildFromNameProject(ctx context.Context, name string, projectID uuid.UUID) (v1.Provider, error) | ||
} | ||
|
||
// ProviderClassFactory describes an interface for creating instances of a | ||
// specific Provider class. The idea is that ProviderFactory determines the | ||
// class of the Provider, and delegates to the appropraite ProviderClassFactory | ||
type ProviderClassFactory interface { | ||
// Build creates an instance of Provider based on the config in the DB | ||
Build(ctx context.Context, config *db.Provider) (v1.Provider, error) | ||
// GetSupportedClasses lists the types of Provider class which this factory | ||
// can produce. | ||
GetSupportedClasses() []db.ProviderClass | ||
} | ||
|
||
type providerFactory struct { | ||
classFactories map[db.ProviderClass]ProviderClassFactory | ||
store providers.ProviderStore | ||
} | ||
|
||
// NewProviderFactory creates a new instance of ProviderFactory | ||
func NewProviderFactory( | ||
classFactories []ProviderClassFactory, | ||
store providers.ProviderStore, | ||
) (ProviderFactory, error) { | ||
classes := make(map[db.ProviderClass]ProviderClassFactory) | ||
for _, factory := range classFactories { | ||
supportedClasses := factory.GetSupportedClasses() | ||
// Sanity check: make sure we don't inadvertently register the same | ||
// class to two different factories, and that the factory has at least | ||
// one type registered | ||
if len(supportedClasses) == 0 { | ||
return nil, errors.New("provider class factory has no registered classes") | ||
} | ||
for _, class := range supportedClasses { | ||
_, ok := classes[class] | ||
if ok { | ||
return nil, fmt.Errorf("attempted to register class %s more than once", class) | ||
} | ||
classes[class] = factory | ||
} | ||
} | ||
return &providerFactory{ | ||
classFactories: classes, | ||
store: store, | ||
}, nil | ||
} | ||
|
||
func (p *providerFactory) BuildFromID(ctx context.Context, providerID uuid.UUID) (v1.Provider, error) { | ||
config, err := p.store.GetByID(ctx, providerID) | ||
if err != nil { | ||
return nil, fmt.Errorf("error retrieving db record: %w", err) | ||
} | ||
|
||
return p.buildFromDBRecord(ctx, config) | ||
} | ||
|
||
func (p *providerFactory) BuildFromNameProject(ctx context.Context, name string, projectID uuid.UUID) (v1.Provider, error) { | ||
config, err := p.store.GetByName(ctx, projectID, name) | ||
if err != nil { | ||
return nil, fmt.Errorf("error retrieving db record: %w", err) | ||
} | ||
|
||
return p.buildFromDBRecord(ctx, config) | ||
} | ||
|
||
func (p *providerFactory) buildFromDBRecord(ctx context.Context, config *db.Provider) (v1.Provider, error) { | ||
var class db.ProviderClass | ||
if config.Class.Valid { | ||
class = config.Class.ProviderClass | ||
} else { | ||
// per discussion with Ozz, it is safe to assume that this will not be | ||
// null for a valid Provider. | ||
// TODO: make this column non-null. | ||
return nil, fmt.Errorf("provider %s has null provider class", config.ID.String()) | ||
} | ||
factory, ok := p.classFactories[class] | ||
if !ok { | ||
return nil, fmt.Errorf("unexpected provider class: %s", class) | ||
} | ||
return factory.Build(ctx, config) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
// Copyright 2024 Stacklok, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package factory_test | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/google/uuid" | ||
"github.com/stretchr/testify/require" | ||
"go.uber.org/mock/gomock" | ||
|
||
"github.com/stacklok/minder/internal/db" | ||
"github.com/stacklok/minder/internal/providers/factory" | ||
"github.com/stacklok/minder/internal/providers/mock/fixtures" | ||
minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1" | ||
v1 "github.com/stacklok/minder/pkg/providers/v1" | ||
) | ||
|
||
// Test both create by name/project, and create by ID together. | ||
// This is because the test logic is basically identical. | ||
func TestProviderFactory(t *testing.T) { | ||
t.Parallel() | ||
|
||
scenarios := []struct { | ||
Name string | ||
Provider db.Provider | ||
LookupType lookupType | ||
RetrievalSucceeds bool | ||
ExpectedError string | ||
}{ | ||
{ | ||
Name: "BuildFromID returns error when DB lookup fails", | ||
LookupType: byID, | ||
RetrievalSucceeds: false, | ||
ExpectedError: "error retrieving db record", | ||
}, | ||
{ | ||
Name: "BuildFromNameProject returns error when DB lookup fails", | ||
LookupType: byName, | ||
RetrievalSucceeds: false, | ||
ExpectedError: "error retrieving db record", | ||
}, | ||
{ | ||
Name: "BuildFromID returns error when record in DB has no class", | ||
Provider: providerWithClass(noClass), | ||
LookupType: byID, | ||
RetrievalSucceeds: true, | ||
ExpectedError: "null provider class", | ||
}, | ||
{ | ||
Name: "BuildFromNameProject returns error when record in DB has no class", | ||
Provider: providerWithClass(noClass), | ||
LookupType: byName, | ||
RetrievalSucceeds: true, | ||
ExpectedError: "null provider class", | ||
}, | ||
{ | ||
Name: "BuildFromID returns error when provider class has no associated factory", | ||
Provider: providerWithClass(githubAppClass), | ||
LookupType: byID, | ||
RetrievalSucceeds: true, | ||
ExpectedError: "unexpected provider class", | ||
}, | ||
{ | ||
Name: "BuildFromNameProject returns error when provider class has no associated factory", | ||
Provider: providerWithClass(githubAppClass), | ||
LookupType: byName, | ||
RetrievalSucceeds: true, | ||
ExpectedError: "unexpected provider class", | ||
}, | ||
{ | ||
Name: "BuildFromID calls factory and returns provider", | ||
Provider: providerWithClass(githubClass), | ||
LookupType: byID, | ||
RetrievalSucceeds: true, | ||
}, | ||
{ | ||
Name: "BuildFromNameProject calls factory and returns provider", | ||
Provider: providerWithClass(githubClass), | ||
LookupType: byName, | ||
RetrievalSucceeds: true, | ||
}, | ||
} | ||
|
||
for _, scenario := range scenarios { | ||
t.Run(scenario.Name, func(t *testing.T) { | ||
t.Parallel() | ||
ctrl := gomock.NewController(t) | ||
defer ctrl.Finish() | ||
ctx := context.Background() | ||
|
||
var opt func(mock fixtures.ProviderStoreMock) | ||
if scenario.LookupType == byName && scenario.RetrievalSucceeds { | ||
opt = fixtures.WithSuccessfulGetByName(&scenario.Provider) | ||
} else if scenario.LookupType == byID && scenario.RetrievalSucceeds { | ||
opt = fixtures.WithSuccessfulGetByID(&scenario.Provider) | ||
} else if scenario.LookupType == byID && !scenario.RetrievalSucceeds { | ||
opt = fixtures.WithFailedGetByID | ||
} else { | ||
opt = fixtures.WithFailedGetByName | ||
} | ||
|
||
store := fixtures.NewProviderStoreMock(opt)(ctrl) | ||
provFactory, err := factory.NewProviderFactory( | ||
[]factory.ProviderClassFactory{&mockClassFactory{}}, | ||
store, | ||
) | ||
require.NoError(t, err) | ||
|
||
if scenario.LookupType == byName { | ||
_, err = provFactory.BuildFromNameProject(ctx, scenario.Provider.Name, scenario.Provider.ProjectID) | ||
} else { | ||
_, err = provFactory.BuildFromID(ctx, scenario.Provider.ID) | ||
} | ||
|
||
if scenario.ExpectedError != "" { | ||
require.ErrorContains(t, err, scenario.ExpectedError) | ||
} else { | ||
require.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} | ||
|
||
var ( | ||
githubAppClass = db.NullProviderClass{Valid: true, ProviderClass: db.ProviderClassGithubApp} | ||
githubClass = db.NullProviderClass{Valid: true, ProviderClass: db.ProviderClassGithub} | ||
noClass = db.NullProviderClass{} | ||
referenceProvider = db.Provider{ | ||
Name: "test-provider", | ||
ID: uuid.New(), | ||
ProjectID: uuid.New(), | ||
} | ||
) | ||
|
||
func providerWithClass(class db.NullProviderClass) db.Provider { | ||
newProvider := referenceProvider | ||
newProvider.Class = class | ||
return newProvider | ||
} | ||
|
||
type lookupType int | ||
|
||
const ( | ||
byID lookupType = iota | ||
byName | ||
) | ||
|
||
// Not using the mock generator because we probably won't need to stub this | ||
// elsewhere, and the implementation is trivial. | ||
type mockClassFactory struct{} | ||
|
||
func (_ *mockClassFactory) Build(_ context.Context, _ *db.Provider) (v1.Provider, error) { | ||
return &mockProvider{}, nil | ||
} | ||
|
||
func (_ *mockClassFactory) GetSupportedClasses() []db.ProviderClass { | ||
return []db.ProviderClass{db.ProviderClassGithub} | ||
} | ||
|
||
// TODO: we probably want to mock some of the provider traits in future using | ||
// the mock generator. | ||
type mockProvider struct{} | ||
|
||
func (_ *mockProvider) CanImplement(_ minderv1.ProviderType) bool { | ||
return false | ||
} |
Oops, something went wrong.