refactor(minio): address PR review comments

Author: pinglin

cmd/main/main.go

@@ -167,7 +167,6 @@ func main() {
 		compStore,
 		ms,
 		service.NewRetentionHandler(),
-		compStore.GetBinaryFetcher(),
 		artifactPublicServiceClient,
 		artifactPrivateServiceClient,
 	)

cmd/worker/main.go

@@ -121,7 +121,6 @@ func main() {
 			MemoryStore:                  ms,
 			ArtifactPublicServiceClient:  artifactPublicServiceClient,
 			ArtifactPrivateServiceClient: artifactPrivateServiceClient,
-			BinaryFetcher:                compStore.GetBinaryFetcher(),
 			PipelinePublicServiceClient:  pipelinePublicServiceClient,
 		},
 	)

pkg/component/store/store.go

@@ -249,11 +249,6 @@ func Init(param InitParams) *Store {
 	return compStore
 }
 
-// GetBinaryFetcher returns the binary fetcher instance used by the store
-func (s *Store) GetBinaryFetcher() binary.Fetcher {
-	return s.binaryFetcher
-}
-
 // Import loads the component definitions into memory.
 func (s *Store) Import(comp base.IComponent) {
 	c := &component{comp: comp}

pkg/data/binary/fetcher.go

@@ -10,24 +10,20 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-// Fetcher is an interface that fetches binary data from a URL.
-type Fetcher interface {
-	FetchFromURL(ctx context.Context, url string) (body []byte, contentType string, filename string, err error)
-}
-
-type fetcher struct {
+// Fetcher is a struct that fetches binary data from a URL.
+type Fetcher struct {
 	httpClient *resty.Client
 }
 
-// NewFetcher creates a new BinaryFetcher instance.
+// NewFetcher creates a new Fetcher instance.
 func NewFetcher() Fetcher {
-	return &fetcher{
+	return Fetcher{
 		httpClient: resty.New().SetRetryCount(3),
 	}
 }
 
 // FetchFromURL fetches binary data from a URL.
-func (f *fetcher) FetchFromURL(ctx context.Context, url string) (body []byte, contentType string, filename string, err error) {
+func (f *Fetcher) FetchFromURL(ctx context.Context, url string) (body []byte, contentType string, filename string, err error) {
 	if strings.HasPrefix(url, "data:") {
 		return f.convertDataURIToBytes(url)
 	}
@@ -52,7 +48,7 @@ func (f *fetcher) FetchFromURL(ctx context.Context, url string) (body []byte, co
 	return
 }
 
-func (f *fetcher) convertDataURIToBytes(url string) (b []byte, contentType string, filename string, err error) {
+func (f *Fetcher) convertDataURIToBytes(url string) (b []byte, contentType string, filename string, err error) {
 	slices := strings.Split(url, ",")
 	if len(slices) == 1 {
 		b, err = base64.StdEncoding.DecodeString(url)

pkg/service/main.go

@@ -129,7 +129,6 @@ func NewService(
 	componentStore *componentstore.Store,
 	memory *memory.Store,
 	retentionHandler MetadataRetentionHandler,
-	binaryFetcher binary.Fetcher,
 	artifactPublicServiceClient artifactpb.ArtifactPublicServiceClient,
 	artifactPrivateServiceClient artifactpb.ArtifactPrivateServiceClient,
 ) Service {
@@ -148,7 +147,6 @@ func NewService(
 		memory:                       memory,
 		log:                          zapLogger,
 		retentionHandler:             retentionHandler,
-		binaryFetcher:                binaryFetcher,
 		artifactPublicServiceClient:  artifactPublicServiceClient,
 		artifactPrivateServiceClient: artifactPrivateServiceClient,
 	}

pkg/service/pipeline_test.go

@@ -12,7 +12,6 @@ import (
 	"go.temporal.io/sdk/client"
 
 	"github.com/instill-ai/pipeline-backend/pkg/acl"
-	"github.com/instill-ai/pipeline-backend/pkg/data/binary"
 	"github.com/instill-ai/pipeline-backend/pkg/datamodel"
 	"github.com/instill-ai/pipeline-backend/pkg/memory"
 	"github.com/instill-ai/pipeline-backend/pkg/mock"
@@ -69,9 +68,6 @@ func TestService_UpdateNamespacePipelineByID(t *testing.T) {
 	converter := mock.NewConverterMock(mc)
 	mgmtPrivateClient := mock.NewMgmtPrivateServiceClientMock(mc)
 
-	// Create a simple binary fetcher for testing
-	binaryFetcher := binary.NewFetcher()
-
 	service := newService(
 		serviceConfig{
 			repository:               repo,
@@ -82,7 +78,6 @@ func TestService_UpdateNamespacePipelineByID(t *testing.T) {
 			mgmtPrivateServiceClient: mgmtPrivateClient,
 			componentStore:           nil,
 			memory:                   memory.NewStore(nil, nil),
-			binaryFetcher:            binaryFetcher,
 		},
 	)
 
@@ -131,7 +126,6 @@ type serviceConfig struct {
 	componentStore               *componentstore.Store
 	memory                       *memory.Store
 	retentionHandler             MetadataRetentionHandler
-	binaryFetcher                binary.Fetcher
 	artifactPublicServiceClient  artifactpb.ArtifactPublicServiceClient
 	artifactPrivateServiceClient artifactpb.ArtifactPrivateServiceClient
 }
@@ -154,7 +148,6 @@ func newService(cfg serviceConfig) Service {
 		cfg.componentStore,
 		cfg.memory,
 		cfg.retentionHandler,
-		cfg.binaryFetcher,
 		cfg.artifactPublicServiceClient,
 		cfg.artifactPrivateServiceClient,
 	)

pkg/worker/main.go

@@ -66,7 +66,6 @@ type WorkerConfig struct {
 	MemoryStore                  *memory.Store
 	ArtifactPublicServiceClient  artifactpb.ArtifactPublicServiceClient
 	ArtifactPrivateServiceClient artifactpb.ArtifactPrivateServiceClient
-	BinaryFetcher                binary.Fetcher
 	PipelinePublicServiceClient  pipelinepb.PipelinePublicServiceClient
 }
 
@@ -100,7 +99,6 @@ func NewWorker(
 		log:                          logger,
 		artifactPublicServiceClient:  workerConfig.ArtifactPublicServiceClient,
 		artifactPrivateServiceClient: workerConfig.ArtifactPrivateServiceClient,
-		binaryFetcher:                workerConfig.BinaryFetcher,
 		pipelinePublicServiceClient:  workerConfig.PipelinePublicServiceClient,
 	}
 }