Refactor the resources model of FlyteAdmin (flyteorg#54)

* Refactor the resources model of FlyteAdmin
* Doing integration test and pushing fixes

Gopkg.toml

@@ -60,7 +60,7 @@
 [[override]]
   name = "github.com/lyft/flyteidl"
   source = "https://github.com/lyft/flyteidl"
-  version = "=0.16.5"
+  version = "^0.16.6"
 
 [[constraint]]
   name = "github.com/lyft/flytepropeller"
@@ -92,11 +92,6 @@
   name = "gopkg.in/gormigrate.v1"
   version = "1.2.1"
 
-[[override]]
-  name = "k8s.io/apimachinery"
-  source = "https://github.com/lyft/apimachinery"
-  revision = "047e3ea32d7fb5984f444d7dd9510cfd362d7d7c"
-
 [[override]]
   name = "k8s.io/api"
   revision = "b49a72c274e072a6e385d55c671acb3717186ce5"
@@ -122,6 +117,11 @@
   go-tests = true
   unused-packages = true
 
+[[override]]
+  name = "k8s.io/apimachinery"
+  source = "https://github.com/lyft/apimachinery"
+  revision = "047e3ea32d7fb5984f444d7dd9510cfd362d7d7c"
+
 [[constraint]]
   name = "github.com/graymeta/stow"
   revision = "903027f87de7054953efcdb8ba70d5dc02df38c7"

pkg/clusterresource/controller.go

@@ -11,7 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lyft/flyteadmin/pkg/resourcematching"
+	"github.com/lyft/flyteadmin/pkg/manager/impl/resources"
+	managerinterfaces "github.com/lyft/flyteadmin/pkg/manager/interfaces"
 
 	"github.com/lyft/flyteadmin/pkg/executioncluster/interfaces"
 
@@ -70,6 +71,7 @@ type controller struct {
 	db                     repositories.RepositoryInterface
 	config                 runtimeInterfaces.Configuration
 	executionCluster       interfaces.ClusterInterface
+	resourceManager        managerinterfaces.ResourceInterface
 	poller                 chan struct{}
 	metrics                controllerMetrics
 	lastAppliedTemplateDir string
@@ -175,17 +177,16 @@ func (c *controller) getCustomTemplateValues(
 	}
 	collectedErrs := make([]error, 0)
 	// All override values saved in the database take precedence over the domain-specific defaults.
-	attributes, err := resourcematching.GetOverrideValuesToApply(ctx, resourcematching.GetOverrideValuesInput{
-		Db:       c.db,
-		Project:  project,
-		Domain:   domain,
-		Resource: admin.MatchableResource_CLUSTER_RESOURCE,
+	resource, err := c.resourceManager.GetResource(ctx, managerinterfaces.ResourceRequest{
+		Project:      project,
+		Domain:       domain,
+		ResourceType: admin.MatchableResource_CLUSTER_RESOURCE,
 	})
 	if err != nil {
 		collectedErrs = append(collectedErrs, err)
 	}
-	if attributes != nil && attributes.GetClusterResourceAttributes() != nil {
-		for templateKey, templateValue := range attributes.GetClusterResourceAttributes().Attributes {
+	if resource != nil && resource.Attributes != nil && resource.Attributes.GetClusterResourceAttributes() != nil {
+		for templateKey, templateValue := range resource.Attributes.GetClusterResourceAttributes().Attributes {
 			customTemplateValues[fmt.Sprintf(templateVariableFormat, templateKey)] = templateValue
 		}
 	}
@@ -285,7 +286,7 @@ func (c *controller) syncNamespace(ctx context.Context, namespace NamespaceName,
 			err = target.Client.Create(ctx, k8sObjCopy)
 			if err != nil {
 				if k8serrors.IsAlreadyExists(err) {
-					logger.Debugf(ctx, "Resource [%+v] in namespace [%s] already exists - attempting update instead",
+					logger.Debugf(ctx, "Type [%+v] in namespace [%s] already exists - attempting update instead",
 						k8sObj.GetObjectKind().GroupVersionKind().Kind, namespace)
 					c.metrics.AppliedTemplateExists.Inc()
 					// Use a strategic-merge-patch to mimic `kubectl apply` behavior.
@@ -423,6 +424,7 @@ func NewClusterResourceController(db repositories.RepositoryInterface, execution
 		db:               db,
 		config:           config,
 		executionCluster: executionCluster,
+		resourceManager:  resources.NewResourceManager(db),
 		poller:           make(chan struct{}),
 		metrics:          newMetrics(scope),
 		appliedTemplates: make(map[string]map[string]time.Time),

pkg/clusterresource/controller_test.go

@@ -7,6 +7,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/lyft/flyteadmin/pkg/manager/impl/resources"
+	"github.com/lyft/flyteadmin/pkg/repositories/interfaces"
+
 	"github.com/lyft/flyteadmin/pkg/repositories/transformers"
 	"github.com/lyft/flyteidl/gen/pb-go/flyteidl/admin"
 
@@ -161,16 +164,16 @@ func TestGetCustomTemplateValues(t *testing.T) {
 			},
 		},
 	}
-	projectDomainModel, err := transformers.ToProjectDomainAttributesModel(projectDomainAttributes, admin.MatchableResource_CLUSTER_RESOURCE)
+	resourceModel, err := transformers.ProjectDomainAttributesToResourceModel(projectDomainAttributes, admin.MatchableResource_CLUSTER_RESOURCE)
 	assert.Nil(t, err)
-	mockRepository.ProjectDomainAttributesRepo().(*repositoryMocks.MockProjectDomainAttributesRepo).GetFunction = func(
-		ctx context.Context, project, domain, resource string) (models.ProjectDomainAttributes, error) {
-		assert.Equal(t, "project-foo", project)
-		assert.Equal(t, "domain-bar", domain)
-		return projectDomainModel, nil
+	mockRepository.ResourceRepo().(*repositoryMocks.MockResourceRepo).GetFunction = func(ctx context.Context, ID interfaces.ResourceID) (resource models.Resource, e error) {
+		assert.Equal(t, "project-foo", ID.Project)
+		assert.Equal(t, "domain-bar", ID.Domain)
+		return resourceModel, nil
 	}
 	testController := controller{
-		db: mockRepository,
+		db:              mockRepository,
+		resourceManager: resources.NewResourceManager(mockRepository),
 	}
 	domainTemplateValues := templateValuesType{
 		"{{ var1 }}": "i'm getting overwritten",
@@ -191,7 +194,8 @@ func TestGetCustomTemplateValues(t *testing.T) {
 func TestGetCustomTemplateValues_NothingToOverride(t *testing.T) {
 	mockRepository := repositoryMocks.NewMockRepository()
 	testController := controller{
-		db: mockRepository,
+		db:              mockRepository,
+		resourceManager: resources.NewResourceManager(mockRepository),
 	}
 	customTemplateValues, err := testController.getCustomTemplateValues(context.Background(), "project-foo", "domain-bar", templateValuesType{
 		"{{ var1 }}": "val1",
@@ -207,14 +211,14 @@ func TestGetCustomTemplateValues_NothingToOverride(t *testing.T) {
 
 func TestGetCustomTemplateValues_InvalidDBModel(t *testing.T) {
 	mockRepository := repositoryMocks.NewMockRepository()
-	mockRepository.ProjectDomainAttributesRepo().(*repositoryMocks.MockProjectDomainAttributesRepo).GetFunction = func(
-		ctx context.Context, project, domain, resource string) (models.ProjectDomainAttributes, error) {
-		return models.ProjectDomainAttributes{
+	mockRepository.ResourceRepo().(*repositoryMocks.MockResourceRepo).GetFunction = func(ctx context.Context, ID interfaces.ResourceID) (resource models.Resource, e error) {
+		return models.Resource{
 			Attributes: []byte("i'm invalid"),
 		}, nil
 	}
 	testController := controller{
-		db: mockRepository,
+		db:              mockRepository,
+		resourceManager: resources.NewResourceManager(mockRepository),
 	}
 	_, err := testController.getCustomTemplateValues(context.Background(), "project-foo", "domain-bar", templateValuesType{
 		"{{ var1 }}": "val1",