actually test something useful

On-behalf-of: @SAP christoph.mewes@sap.com

Author: xrstf

test/crds/crontab.yaml

@@ -0,0 +1,31 @@
+# sourced from https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: crontabs.example.com
+spec:
+  group: example.com
+  scope: Namespaced
+  names:
+    plural: crontabs
+    singular: crontab
+    kind: CronTab
+    shortNames:
+      - ct
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                cronSpec:
+                  type: string
+                image:
+                  type: string
+                replicas:
+                  type: integer

test/e2e/apiresourceschema/apiresourceschema_test.go

@@ -25,32 +25,84 @@ import (
 
 	"github.com/go-logr/logr"
 
+	syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
 	"github.com/kcp-dev/api-syncagent/test/utils"
 
+	kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/wait"
 	ctrlruntime "sigs.k8s.io/controller-runtime"
 )
 
 func TestARSAreCreated(t *testing.T) {
+	const (
+		apiExportName = "example.com"
+	)
+
 	ctx := context.Background()
 	ctrlruntime.SetLogger(logr.Discard())
 
 	// setup a test environment in kcp
-	fooKubconfig := utils.CreateHomeWorkspace(t, ctx, "foo", "my-api")
+	orgKubconfig := utils.CreateOrganization(t, ctx, "ars-are-created", apiExportName)
 
 	// start a service cluster
-	envtestKubeconfig, _, _ := utils.RunEnvtest(t)
-
-	t.Run("my subtest", func(t *testing.T) {
-		utils.RunAgent(
-			ctx,
-			t,
-			"bob",
-			fooKubconfig,
-			envtestKubeconfig,
-			"my-api",
-		)
-
-		time.Sleep(5 * time.Second)
+	envtestKubeconfig, envtestClient, _ := utils.RunEnvtest(t, []string{
+		"test/crds/crontab.yaml",
+	})
+
+	// publish Crontabs
+	t.Logf("Publishing CronTabs…")
+	pr := &syncagentv1alpha1.PublishedResource{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "publish-crontabs",
+		},
+		Spec: syncagentv1alpha1.PublishedResourceSpec{
+			Resource: syncagentv1alpha1.SourceResourceDescriptor{
+				APIGroup: "example.com",
+				Version:  "v1",
+				Kind:     "CronTab",
+			},
+		},
+	}
+
+	if err := envtestClient.Create(ctx, pr); err != nil {
+		t.Fatalf("Failed to create PublishedResource: %v", err)
+	}
+
+	// let the agent do its thing
+	utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
+
+	// wait for the APIExport to be updated
+	t.Logf("Waiting for APIExport to be updated…")
+	orgClient := utils.GetClient(t, orgKubconfig)
+	apiExportKey := types.NamespacedName{Name: apiExportName}
+
+	var arsName string
+	err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 1*time.Minute, false, func(ctx context.Context) (done bool, err error) {
+		apiExport := &kcpapisv1alpha1.APIExport{}
+		err = orgClient.Get(ctx, apiExportKey, apiExport)
+		if err != nil {
+			return false, err
+		}
+
+		if len(apiExport.Spec.LatestResourceSchemas) == 0 {
+			return false, nil
+		}
+
+		arsName = apiExport.Spec.LatestResourceSchemas[0]
+
+		return true, nil
 	})
+	if err != nil {
+		t.Fatalf("Failed to wait for APIExport to be updated: %v", err)
+	}
 
+	// check the APIResourceSchema
+	ars := &kcpapisv1alpha1.APIResourceSchema{}
+	err = orgClient.Get(ctx, types.NamespacedName{Name: arsName}, ars)
+	if err != nil {
+		t.Fatalf("APIResourceSchema does not exist: %v", err)
+	}
 }

test/utils/fixtures.go

@@ -38,7 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/kontext"
 )
 
-func CreateHomeWorkspace(
+func CreateOrganization(
 	t *testing.T,
 	ctx context.Context,
 	workspaceName logicalcluster.Name,
@@ -53,10 +53,10 @@ func CreateHomeWorkspace(
 	}
 
 	// setup workspaces
-	homeClusterName := CreateWorkspace(t, ctx, kcpClient, "root", workspaceName)
+	orgClusterName := CreateWorkspace(t, ctx, kcpClient, "root", workspaceName)
 
 	// grant access and allow the agent to resolve its own workspace path
-	homeCtx := kontext.WithCluster(ctx, homeClusterName)
+	homeCtx := kontext.WithCluster(ctx, orgClusterName)
 	GrantWorkspaceAccess(t, homeCtx, kcpClient, string(workspaceName), agent, rbacv1.PolicyRule{
 		APIGroups:     []string{"core.kcp.io"},
 		Resources:     []string{"logicalclusters"},
@@ -66,8 +66,8 @@ func CreateHomeWorkspace(
 
 	// add some consumer workspaces
 	teamClusters := []logicalcluster.Name{
-		CreateWorkspace(t, ctx, kcpClient, homeClusterName, "team-1"),
-		CreateWorkspace(t, ctx, kcpClient, homeClusterName, "team-2"),
+		CreateWorkspace(t, ctx, kcpClient, orgClusterName, "team-1"),
+		CreateWorkspace(t, ctx, kcpClient, orgClusterName, "team-2"),
 	}
 
 	// setup the APIExport and wait for it to be ready
@@ -79,7 +79,7 @@ func CreateHomeWorkspace(
 		BindToAPIExport(t, teamCtx, kcpClient, apiExport)
 	}
 
-	return CreateKcpAgentKubeconfig(t, fmt.Sprintf("/clusters/%s", homeClusterName))
+	return CreateKcpAgentKubeconfig(t, fmt.Sprintf("/clusters/%s", orgClusterName))
 }
 
 func CreateWorkspace(t *testing.T, ctx context.Context, client ctrlruntimeclient.Client, parent logicalcluster.Name, workspaceName logicalcluster.Name) logicalcluster.Name {

test/utils/process.go

@@ -26,10 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/scale/scheme"
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
@@ -121,16 +118,20 @@ func RunAgent(
 	return cancelAndWait
 }
 
-func RunEnvtest(t *testing.T) (string, ctrlruntimeclient.Client, context.CancelFunc) {
+func RunEnvtest(t *testing.T, extraCRDs []string) (string, ctrlruntimeclient.Client, context.CancelFunc) {
 	t.Helper()
 
-	rootDirectory := requiredEnv(t, "ROOT_DIRECTORY")
-
 	testEnv := &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join(rootDirectory, "deploy/crd/kcp.io")},
 		ErrorIfCRDPathMissing: true,
 	}
 
+	rootDirectory := requiredEnv(t, "ROOT_DIRECTORY")
+	extraCRDs = append(extraCRDs, "deploy/crd/kcp.io")
+
+	for _, extra := range extraCRDs {
+		testEnv.CRDDirectoryPaths = append(testEnv.CRDDirectoryPaths, filepath.Join(rootDirectory, extra))
+	}
+
 	_, err := testEnv.Start()
 	if err != nil {
 		t.Fatalf("Failed to start envtest: %v", err)
@@ -141,16 +142,8 @@ func RunEnvtest(t *testing.T) (string, ctrlruntimeclient.Client, context.CancelF
 		t.Fatal(err)
 	}
 
-	sc := runtime.NewScheme()
-	if err := scheme.AddToScheme(sc); err != nil {
-		t.Fatal(err)
-	}
-	if err := corev1.AddToScheme(sc); err != nil {
-		t.Fatal(err)
-	}
-
 	client, err := ctrlruntimeclient.New(adminRestConfig, ctrlruntimeclient.Options{
-		Scheme: sc,
+		Scheme: newScheme(t),
 	})
 	if err != nil {
 		t.Fatalf("Failed to create client: %v", err)