Merge pull request aws-controllers-k8s#305 from A-Hilaly/cleanup

Remove petstore and bookstore services

pkg/runtime/service_controller_test.go

@@ -21,30 +21,42 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	ctrlmanager "sigs.k8s.io/controller-runtime/pkg/manager"
+	k8sscheme "sigs.k8s.io/controller-runtime/pkg/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	ackrt "github.com/aws/aws-controllers-k8s/pkg/runtime"
 
 	mocks "github.com/aws/aws-controllers-k8s/mocks/pkg/types"
-	bookstoretypes "github.com/aws/aws-controllers-k8s/services/bookstore/apis/v1alpha1"
 )
 
 var (
 	scheme = runtime.NewScheme()
 )
 
 func init() {
+	groupVersion := schema.GroupVersion{Group: "bookstore.services.k8s.aws", Version: "v1alpha1"}
+	schemeBuilder := &k8sscheme.Builder{GroupVersion: groupVersion}
+	schemeBuilder.Register(&fakeBook{})
+
+	_ = schemeBuilder.AddToScheme(scheme)
 	_ = clientgoscheme.AddToScheme(scheme)
-	_ = bookstoretypes.AddToScheme(scheme)
 }
 
+type fakeBook struct{}
+
+func (b *fakeBook) GetObjectKind() schema.ObjectKind { return nil }
+func (b *fakeBook) DeepCopy() *fakeBook              { return nil }
+func (b *fakeBook) DeepCopyInto(*fakeBook)           {}
+func (b *fakeBook) DeepCopyObject() runtime.Object   { return nil }
+
 type fakeManager struct{}
 
 func (m *fakeManager) Add(ctrlmanager.Runnable) error                                 { return nil }
@@ -71,11 +83,11 @@ func TestServiceController(t *testing.T) {
 	rd.On("GroupKind").Return(
 		&metav1.GroupKind{
 			Group: "bookstore.services.k8s.aws",
-			Kind:  "Book",
+			Kind:  "fakeBook",
 		},
 	)
 	rd.On("EmptyRuntimeObject").Return(
-		&bookstoretypes.Book{},
+		&fakeBook{},
 	)
 
 	rmf := &mocks.AWSResourceManagerFactory{}
@@ -103,12 +115,12 @@ func TestServiceController(t *testing.T) {
 	recons = sc.GetReconcilers()
 	require.NotEmpty(recons)
 
-	foundBookRecon := false
+	foundfakeBookRecon := false
 	for _, recon := range recons {
-		if recon.GroupKind().String() == "Book.bookstore.services.k8s.aws" {
-			foundBookRecon = true
+		if recon.GroupKind().String() == "fakeBook.bookstore.services.k8s.aws" {
+			foundfakeBookRecon = true
 		}
 	}
-	require.True(foundBookRecon)
+	require.True(foundfakeBookRecon)
 	rd.AssertCalled(t, "EmptyRuntimeObject")
 }

pkg/runtime/util_test.go

@@ -17,38 +17,53 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	ackv1alpha1 "github.com/aws/aws-controllers-k8s/apis/core/v1alpha1"
 	ackrt "github.com/aws/aws-controllers-k8s/pkg/runtime"
-	acktypes "github.com/aws/aws-controllers-k8s/pkg/types"
 
-	"github.com/aws/aws-controllers-k8s/services/bookstore/pkg/resource"
-	_ "github.com/aws/aws-controllers-k8s/services/bookstore/pkg/resource/book"
+	mocks "github.com/aws/aws-controllers-k8s/mocks/pkg/types"
 )
 
-func newBookResource() acktypes.AWSResource {
-	rmfs := resource.GetManagerFactories()
-	var rd acktypes.AWSResourceDescriptor
-	for _, rmf := range rmfs {
-		if rmf.ResourceDescriptor().GroupKind().String() == "Book.bookstore.services.k8s.aws" {
-			rd = rmf.ResourceDescriptor()
-		}
-	}
-	if rd == nil {
-		panic("expected to find Book resource manager")
-	}
-	return rd.ResourceFromRuntimeObject(rd.EmptyRuntimeObject())
-}
-
 func TestIsAdopted(t *testing.T) {
 	require := require.New(t)
 
-	res := newBookResource()
+	res := &mocks.AWSResource{}
+	res.On("MetaObject").Return(&metav1.ObjectMeta{
+		Annotations: map[string]string{
+			ackv1alpha1.AnnotationARN: "arn:aws:lambda:eu-west-1:0123456789010:function:mylambdafunction-7UXYMW16MLXP",
+		},
+	})
+	require.True(ackrt.IsAdopted(res))
+
+	res = &mocks.AWSResource{}
+	res.On("MetaObject").Return(&metav1.ObjectMeta{})
 	require.False(ackrt.IsAdopted(res))
 }
 
 func TestIsSynced(t *testing.T) {
 	require := require.New(t)
 
-	res := newBookResource()
+	res := &mocks.AWSResource{}
+	res.On("Conditions").Return([]*ackv1alpha1.Condition{
+		&ackv1alpha1.Condition{
+			Type:   ackv1alpha1.ConditionTypeResourceSynced,
+			Status: corev1.ConditionTrue,
+		},
+	})
+	require.True(ackrt.IsSynced(res))
+
+	res = &mocks.AWSResource{}
+	res.On("Conditions").Return([]*ackv1alpha1.Condition{
+		&ackv1alpha1.Condition{
+			Type:   ackv1alpha1.ConditionTypeResourceSynced,
+			Status: corev1.ConditionUnknown,
+		},
+		&ackv1alpha1.Condition{
+			Type:   ackv1alpha1.ConditionTypeResourceSynced,
+			Status: corev1.ConditionFalse,
+		},
+	})
 	require.False(ackrt.IsSynced(res))
 }