HMS-5947: fix delete-snapshots glitchtip errors

Author: xbhouse

pkg/clients/pulp_client/interfaces.go

@@ -66,6 +66,7 @@ type PulpClient interface {
 	// RpmPublication
 	CreateRpmPublication(ctx context.Context, versionHref string) (*string, error)
 	FindRpmPublicationByVersion(ctx context.Context, versionHref string) (*zest.RpmRpmPublicationResponse, error)
+	DeleteRpmPublication(ctx context.Context, publicationHref string) error
 
 	// Distribution
 	CreateRpmDistribution(ctx context.Context, publicationHref string, name string, basePath string, contentGuardHref *string) (*string, error)

pkg/clients/pulp_client/pulp_client_mock.go

@@ -40,3 +40,18 @@ func (r *pulpDaoImpl) FindRpmPublicationByVersion(ctx context.Context, versionHr
 		return nil, nil
 	}
 }
+
+func (r *pulpDaoImpl) DeleteRpmPublication(ctx context.Context, publicationHref string) error {
+	ctx, client := getZestClient(ctx)
+	httpResp, err := client.PublicationsRpmAPI.PublicationsRpmRpmDelete(ctx, publicationHref).Execute()
+	if httpResp != nil {
+		defer httpResp.Body.Close()
+	}
+	if err != nil {
+		if err.Error() == "404 Not Found" {
+			return nil
+		}
+		return errorWithResponseBody("error deleting rpm publication", httpResp, err)
+	}
+	return nil
+}

pkg/clients/pulp_client/rpm_publication.go

@@ -176,6 +176,11 @@ func (ds *DeleteSnapshots) deleteOrUpdatePulpContent(snap models.Snapshot, repo
 		}
 	}
 
+	err = ds.getPulpClient().DeleteRpmPublication(ds.ctx, snap.PublicationHref)
+	if err != nil {
+		return err
+	}
+
 	deleteVersionHref, err := ds.getPulpClient().DeleteRpmRepositoryVersion(ds.ctx, snap.VersionHref)
 	if err != nil {
 		return err

pkg/tasks/delete_snapshots.go

@@ -113,6 +113,7 @@ func (s *DeleteSnapshotsSuite) TestDeleteSnapshots() {
 	s.mockPulpClient.On("DeleteRpmDistribution", ctx, snap.DistributionHref).Return(&deleteDistributionHref, nil)
 	s.mockPulpClient.On("PollTask", ctx, mock.Anything).Return(nil, nil)
 	s.mockPulpClient.On("DeleteRpmRepositoryVersion", ctx, snap.VersionHref).Return(utils.Ptr("taskHref"), nil)
+	s.mockPulpClient.On("DeleteRpmPublication", ctx, snap.PublicationHref).Return(nil)
 
 	pulpClient := s.pulpClient()
 	task := DeleteSnapshots{