Wait for transferred fields as well.

Author: ericpromislow

pkg/sqlcache/integration_test.go

@@ -577,6 +577,34 @@ func waitForProjectsDisplayName(ctx context.Context, proxyStore *sqlproxy.Store,
 	})
 }
 
+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 {
@@ -1346,10 +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}