fix flaky integration test

pkg/sqlcache/integration_test.go

@@ -540,6 +540,71 @@ func waitForObjectsBySchema(ctx context.Context, proxyStore *sqlproxy.Store, sch
 	})
 }
 
+// Do not call this if there are no projects -- the function will run until it times out.
+func waitForProjectsDisplayName(ctx context.Context, proxyStore *sqlproxy.Store, schema *types.APISchema) error {
+	return wait.PollUntilContextCancel(ctx, time.Second*10, true, func(ctx context.Context) (done bool, err error) {
+		req, err := http.NewRequest("GET", "http://localhost:8080", nil)
+		if err != nil {
+			return false, err
+		}
+		apiOp := &types.APIRequest{
+			Request: req,
+		}
+		partitions := []partition.Partition{defaultPartition}
+		list, total, _, err := proxyStore.ListByPartitions(apiOp, schema, partitions)
+		if err != nil || total == 0 {
+			// note that we don't return the error since that would stop the polling
+			return false, nil
+		}
+		// Moving on, if there are errors return them
+		for _, item := range list.Items {
+			displayName, ok, err := unstructured.NestedFieldNoCopy(item.Object, "spec", "displayName")
+			if !ok || displayName == "" || err != nil {
+				if err == nil && ok {
+					fmt.Printf("No displayName yet for mcio.project %q\n", item.GetName())
+				}
+				return false, err
+			}
+			clusterName, ok, err := unstructured.NestedFieldNoCopy(item.Object, "spec", "clusterName")
+			if !ok || clusterName == "" || err != nil {
+				if err == nil {
+					fmt.Printf("No clusterName yet for mcio.project %q\n", item.GetName())
+				}
+				return false, err
+			}
+		}
+		return true, nil
+	})
+}
+
+func waitForTransferredFields(ctx context.Context, proxyStore *sqlproxy.Store, schema *types.APISchema, labelTest string, expectedNum int, transferredFields ...string) error {
+	if expectedNum == 0 {
+		return nil
+	}
+	return wait.PollUntilContextCancel(ctx, time.Second*10, true, func(ctx context.Context) (done bool, err error) {
+		q := "?filter="
+		nextFilter := ""
+		if labelTest != "" {
+			q = fmt.Sprintf("?%s=%s", testFilter, labelTest)
+			nextFilter = "&"
+		}
+		for _, s := range transferredFields {
+			q += fmt.Sprintf(`%s%s!=""`, nextFilter, s)
+			nextFilter = "&"
+		}
+		req, err := http.NewRequest("GET", "http://localhost:8080"+q, nil)
+		if err != nil {
+			return false, err
+		}
+		apiOp := &types.APIRequest{
+			Request: req,
+		}
+		partitions := []partition.Partition{defaultPartition}
+		_, total, _, err := proxyStore.ListByPartitions(apiOp, schema, partitions)
+		return err == nil && total == expectedNum, err
+	})
+}
+
 type ResetFunc func(k8sschema.GroupVersionKind) error
 
 func (f ResetFunc) Reset(gvk k8sschema.GroupVersionKind) error {
@@ -1131,6 +1196,8 @@ func (i *IntegrationSuite) TestNamespaceProjectDependencies() {
 	requireT.NoError(err)
 	err = waitForObjectsBySchema(ctx, proxyStore, nsSchema, labelTest, len(namespaceInfo))
 	requireT.NoError(err)
+	err = waitForProjectsDisplayName(ctx, proxyStore, mcioSchema)
+	requireT.NoError(err)
 
 	partitions := []partition.Partition{defaultPartition}
 	for _, test := range tests {
@@ -1211,12 +1278,14 @@ func (i *IntegrationSuite) TestSecretProjectDependencies() {
 	err = ctrl.Start(ctx)
 	requireT.NoError(err)
 	secretInfo := [][2]string{
+		// metadata.name, metadata.projects[management.cattle.io/project-scoped-secret]
 		{"morocco", "rabat"},
 		{"eritrea", "asmara"},
 		{"kenya", "nairobi"},
 		{"benin", "portonovo"},
 	}
 	projectInfo := [][3]string{
+		// metadata.name, spec.clusterName, spec.displayName
 		{"rabat", "arabic", "casablanca"},
 		{"asmara", "tigrinya", "keren"},
 		{"nairobi", "english", "mombasa"},
@@ -1305,8 +1374,24 @@ func (i *IntegrationSuite) TestSecretProjectDependencies() {
 	}
 
 	err = waitForObjectsBySchema(ctx, proxyStore, mcioSchema, labelTest, len(projectInfo))
+	if err != nil {
+		fmt.Printf("Error in secret/project tests: waitFor mico projects failed: %s\n", err)
+	}
 	requireT.NoError(err)
 	err = waitForObjectsBySchema(ctx, proxyStore, secretSchema, labelTest, len(secretInfo))
+	if err != nil {
+		fmt.Printf("Error in secret/project tests: waitFor secrets failed: %s\n", err)
+	}
+	requireT.NoError(err)
+	err = waitForProjectsDisplayName(ctx, proxyStore, mcioSchema)
+	if err != nil {
+		fmt.Printf("Error in secret/project tests: waitFor ProjectsDisplayName failed: %s\n", err)
+	}
+	requireT.NoError(err)
+	err = waitForTransferredFields(ctx, proxyStore, secretSchema, labelTest, len(secretInfo), "spec.clusterName", "spec.displayName")
+	if err != nil {
+		fmt.Printf("Error in secret/project tests: waitFor secrets transferred-fields failed: %s\n", err)
+	}
 	requireT.NoError(err)
 
 	partitions := []partition.Partition{defaultPartition}
@@ -1319,17 +1404,20 @@ func (i *IntegrationSuite) TestSecretProjectDependencies() {
 			apiOp := &types.APIRequest{
 				Request: req,
 			}
+			requireT.EventuallyWithT(func(c *assert.CollectT) {
+
+				got, total, continueToken, err := proxyStore.ListByPartitions(apiOp, secretSchema, partitions)
+				if err != nil {
+					require.NoError(c, err)
+					return
+				}
+				require.Equal(c, len(test.wantNames), total)
+				require.Equal(c, "", continueToken)
+				require.Equal(c, len(got.Items), len(test.wantNames))
+				gotNames := stringsFromULIst(got)
+				require.Equal(c, test.wantNames, gotNames)
+			}, 15*time.Second, 500*time.Millisecond)
 
-			got, total, continueToken, err := proxyStore.ListByPartitions(apiOp, secretSchema, partitions)
-			if err != nil {
-				i.Assert().NoError(err)
-				return
-			}
-			i.Assert().Equal(len(test.wantNames), total)
-			i.Assert().Equal("", continueToken)
-			i.Assert().Len(got.Items, len(test.wantNames))
-			gotNames := stringsFromULIst(got)
-			i.Assert().Equal(test.wantNames, gotNames)
 		})
 	}
 }