Fix waitForSchema for group-less resources

Author: tomleb

tests/integration/column_test.go

@@ -74,7 +74,7 @@ func (i *IntegrationSuite) testColumnsScenario(ctx context.Context, scenario str
 	defer i.doManifestReversed(ctx, scenarioTests, i.doDelete)
 
 	for gvr := range gvrs {
-		i.waitForSchema(baseURL, fmt.Sprintf("%s.%s", gvr.Group, gvr.Resource))
+		i.waitForSchema(baseURL, gvr)
 	}
 
 	defer i.maybeStopAndDebug(baseURL)

tests/integration/filtering_test.go

@@ -62,7 +62,7 @@ func (i *IntegrationSuite) testFilterScenario(ctx context.Context, scenario stri
 	defer i.doManifestReversed(ctx, scenarioManifests, i.doDelete)
 
 	for gvr := range gvrs {
-		i.waitForSchema(baseURL, fmt.Sprintf("%s.%s", gvr.Group, gvr.Resource))
+		i.waitForSchema(baseURL, gvr)
 	}
 
 	defer i.maybeStopAndDebug(baseURL)

tests/integration/integration_test.go

@@ -231,9 +231,13 @@ func (i *IntegrationSuite) doManifestWithHeader(ctx context.Context, manifestFil
 	}
 }
 
-func (i *IntegrationSuite) waitForSchema(baseURL string, schema string) {
+func (i *IntegrationSuite) waitForSchema(baseURL string, gvr schema.GroupVersionResource) {
+	schemaID := fmt.Sprintf("%s.%s", gvr.Group, gvr.Resource)
+	if gvr.Group == "" {
+		schemaID = gvr.Resource
+	}
 	i.Require().EventuallyWithT(func(c *assert.CollectT) {
-		url := baseURL + "/v1/schemaDefinitions/" + schema
+		url := baseURL + "/v1/schemaDefinitions/" + schemaID
 		resp, err := http.Get(url)
 		require.NoError(c, err)
 		defer resp.Body.Close()

tests/integration/sorting_test.go

@@ -62,7 +62,7 @@ func (i *IntegrationSuite) testSortScenario(ctx context.Context, scenario string
 	defer i.doManifestReversed(ctx, scenarioManifests, i.doDelete)
 
 	for gvr := range gvrs {
-		i.waitForSchema(baseURL, fmt.Sprintf("%s.%s", gvr.Group, gvr.Resource))
+		i.waitForSchema(baseURL, gvr)
 	}
 
 	defer i.maybeStopAndDebug(baseURL)