Address comments

Signed-off-by: Juan Antonio Osorio <ozz@stacklok.com>
mindersec · May 8, 2024 · cca5ef1 · cca5ef1
1 parent bd8213d
commit cca5ef1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/database/migrations/000054_oci_prov.up.sql b/database/migrations/000054_oci_prov.up.sql
@@ -13,8 +13,6 @@
 -- limitations under the License.
 
 ALTER TYPE provider_type ADD VALUE 'image-lister';
-ALTER TYPE provider_type ADD VALUE 'ghcr';
-ALTER TYPE provider_type ADD VALUE 'dockerhub';
 
 -- Add `ghcr` and `dockerhub` provider classes
 ALTER TYPE provider_class ADD VALUE 'ghcr';

diff --git a/internal/db/models.go b/internal/db/models.go
diff --git a/internal/providers/dockerhub/dockerhub.go b/internal/providers/dockerhub/dockerhub.go
@@ -35,7 +35,6 @@ const DockerHub = "dockerhub"
 
 // Implements is the list of provider types that the DockerHub provider implements
 var Implements = []db.ProviderType{
-	db.ProviderTypeDockerhub,
 	db.ProviderTypeImageLister,
 	db.ProviderTypeOci,
 }
@@ -118,6 +117,8 @@ func (d *dockerHubImageLister) ListImages(ctx context.Context) ([]string, error)
 		return nil, fmt.Errorf("error making request: %w", err)
 	}
 
+	defer resp.Body.Close()
+
 	if resp.StatusCode != http.StatusOK {
 		if resp.StatusCode == http.StatusUnauthorized {
 			return nil, fmt.Errorf("unauthorized: %s", resp.Status)
@@ -128,9 +129,6 @@ func (d *dockerHubImageLister) ListImages(ctx context.Context) ([]string, error)
 		return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
 	}
 
-	// read body
-	defer resp.Body.Close()
-
 	// parse body
 	toParse := struct {
 		Results []struct {

diff --git a/internal/providers/providers.go b/internal/providers/providers.go
@@ -247,7 +247,7 @@ func (pb *ProviderBuilder) GetGitHub() (provinfv1.GitHub, error) {
 // GetGHCR returns a GHCR client for the provider.
 func (pb *ProviderBuilder) GetGHCR() (provinfv1.ImageLister, error) {
 	if !pb.Implements(db.ProviderTypeImageLister) {
-		return nil, fmt.Errorf("provider does not implement ghcr")
+		return nil, fmt.Errorf("provider does not implement image-lister")
 	}
 
 	if pb.p.Version != provinfv1.V1 {
@@ -266,7 +266,7 @@ func (pb *ProviderBuilder) GetGHCR() (provinfv1.ImageLister, error) {
 // GetDockerHub returns a DockerHub client for the provider.
 func (pb *ProviderBuilder) GetDockerHub() (provinfv1.ImageLister, error) {
 	if !pb.Implements(db.ProviderTypeImageLister) {
-		return nil, fmt.Errorf("provider does not implement dockerhub")
+		return nil, fmt.Errorf("provider does not implement image-lister")
 	}
 
 	if pb.p.Version != provinfv1.V1 {
@@ -334,10 +334,6 @@ func DBToPBType(t db.ProviderType) (minderv1.ProviderType, bool) {
 		return minderv1.ProviderType_PROVIDER_TYPE_OCI, true
 	case db.ProviderTypeImageLister:
 		return minderv1.ProviderType_PROVIDER_TYPE_IMAGE_LISTER, true
-	case db.ProviderTypeGhcr:
-		return minderv1.ProviderType_PROVIDER_TYPE_GHCR, true
-	case db.ProviderTypeDockerhub:
-		return minderv1.ProviderType_PROVIDER_TYPE_DOCKERHUB, true
 	default:
 		return minderv1.ProviderType_PROVIDER_TYPE_UNSPECIFIED, false
 	}