Polishing

pkg/connector/connector.go

@@ -38,18 +38,15 @@ func (dh *DockerHub) Asset(ctx context.Context, asset *v2.AssetRef) (string, io.
 func (dh *DockerHub) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error) {
 	return &v2.ConnectorMetadata{
 		DisplayName: "DockerHub",
-		Description: "Connector syncing DockerHub organization members their teams, and their roles to Baton",
+		Description: "Connector syncing DockerHub organizations, their members, teams, and repositories to Baton",
 	}, nil
 }
 
 // Validate is called to ensure that the connector is properly configured. It should exercise any API credentials
 // to be sure that they are valid.
 func (dh *DockerHub) Validate(ctx context.Context) (annotations.Annotations, error) {
 	// get the scope of used credentials
-	_, _, err := dh.client.ListOrganizations(ctx, &dockerhub.PaginationVars{
-		Size: 1,
-		Page: "1",
-	})
+	_, _, err := dh.client.ListOrganizations(ctx, nil)
 	if err != nil {
 		return nil, fmt.Errorf("dockerhub-connector: failed to list organizations: %w", err)
 	}

pkg/connector/repositories.go

@@ -145,9 +145,7 @@ func (r *repositoryResourceType) Grants(ctx context.Context, resource *v2.Resour
 			},
 			grant.WithAnnotation(
 				&v2.GrantExpandable{
-					EntitlementIds:  []string{fmt.Sprintf("team:%d:%s", team.Id, teamMembership)},
-					Shallow:         true,
-					ResourceTypeIds: []string{resourceTypeUser.Id},
+					EntitlementIds: []string{fmt.Sprintf("team:%d:%s", team.Id, teamMembership)},
 				},
 			),
 		)

pkg/dockerhub/client.go

@@ -262,9 +262,9 @@ func (c *Client) doRequest(
 	paginationVars *PaginationVars,
 ) error {
 	var body []byte
+	var err error
 
 	if data != nil {
-		var err error
 		body, err = json.Marshal(data)
 		if err != nil {
 			return err