PR comments

Author: dobrac

packages/orchestrator/cmd/build-template/main.go

@@ -137,6 +137,17 @@ func buildTemplate(
 		return fmt.Errorf("error getting artifacts registry provider: %w", err)
 	}
 
+	dockerhubRepository, err := dockerhub.GetRemoteRepository(ctx)
+	if err != nil {
+		return fmt.Errorf("error getting dockerhub repository: %w", err)
+	}
+	defer func() {
+		err := dockerhubRepository.Close()
+		if err != nil {
+			logger.Error("error closing dockerhub repository", zap.Error(err))
+		}
+	}()
+
 	blockMetrics, err := blockmetrics.NewMetrics(noop.NewMeterProvider())
 	if err != nil {
 		return fmt.Errorf("error creating metrics: %w", err)
@@ -161,7 +172,7 @@ func buildTemplate(
 		persistenceTemplate,
 		persistenceBuild,
 		artifactRegistry,
-		dockerhub.NewNoopRemoteRepository(),
+		dockerhubRepository,
 		devicePool,
 		networkPool,
 		sandboxProxy,

packages/orchestrator/internal/template/build/core/oci/oci_test.go

@@ -147,6 +147,12 @@ func TestGetPublicImageWithGeneralAuth(t *testing.T) {
 	testImageRef := testRepository + ":latest"
 
 	dockerhubRepository := dockerhub.NewNoopRemoteRepository()
+	t.Cleanup(func() {
+		err := dockerhubRepository.Close()
+		if err != nil {
+			t.Errorf("error closing dockerhub repository: %v", err)
+		}
+	})
 
 	t.Run("successful auth and pull", func(t *testing.T) {
 		reg := registry.New()

packages/orchestrator/internal/template/server/main.go

@@ -42,6 +42,8 @@ type ServerStore struct {
 
 	wg   *sync.WaitGroup // wait group for running builds
 	info *service.ServiceInfo
+
+	_close func() error
 }
 
 func New(
@@ -105,6 +107,13 @@ func New(
 		buildStorage:      buildPersistance,
 		info:              info,
 		wg:                &sync.WaitGroup{},
+		_close: func() error {
+			err := dockerhubRepository.Close()
+			if err != nil {
+				return fmt.Errorf("failed to close dockerhub repository: %w", err)
+			}
+			return nil
+		},
 	}
 
 	templatemanager.RegisterTemplateServiceServer(grpc.GRPCServer(), store)
@@ -131,6 +140,11 @@ func (s *ServerStore) Close(ctx context.Context) error {
 		}
 
 		s.logger.Info("Template build queue cleaned")
+
+		err := s._close()
+		if err != nil {
+			return fmt.Errorf("failed to close services: %w", err)
+		}
 		return nil
 	}
 }

packages/shared/pkg/dockerhub/repository.go

@@ -22,10 +22,13 @@ const (
 
 	storageProviderEnv         = "DOCKERHUB_REMOTE_REPOSITORY_PROVIDER"
 	storageRemoteRepositoryURL = "DOCKERHUB_REMOTE_REPOSITORY_URL"
+
+	setupTimeout = 10 * time.Second
 )
 
 type RemoteRepository interface {
 	GetImage(ctx context.Context, tag string, platform containerregistry.Platform) (containerregistry.Image, error)
+	Close() error
 }
 
 func GetRemoteRepository(ctx context.Context) (RemoteRepository, error) {
@@ -36,7 +39,7 @@ func GetRemoteRepository(ctx context.Context) (RemoteRepository, error) {
 		return NewNoopRemoteRepository(), nil
 	}
 
-	setupCtx, setupCtxCancel := context.WithTimeout(ctx, 10*time.Second)
+	setupCtx, setupCtxCancel := context.WithTimeout(ctx, setupTimeout)
 	defer setupCtxCancel()
 
 	switch provider {

packages/shared/pkg/dockerhub/repository_aws.go

@@ -87,3 +87,7 @@ func (g *AWSRemoteRepository) getAuthToken(ctx context.Context) (authn.Authentic
 		Password: password,
 	}, nil
 }
+
+func (g *AWSRemoteRepository) Close() error {
+	return nil
+}

packages/shared/pkg/dockerhub/repository_gcp.go

@@ -18,6 +18,7 @@ import (
 type GCPRemoteRepository struct {
 	repositoryURL string
 	registry      *artifactregistry.Client
+	authToken     authn.Authenticator
 }
 
 var gcpAuthConfig = authn.Basic{
@@ -31,7 +32,12 @@ func NewGCPRemoteRepository(ctx context.Context, repositoryURL string) (*GCPRemo
 		return nil, fmt.Errorf("error creating artifact registry client: %w", err)
 	}
 
-	return &GCPRemoteRepository{repositoryURL: repositoryURL, registry: registry}, nil
+	authToken, err := getAuthToken(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error getting auth token: %w", err)
+	}
+
+	return &GCPRemoteRepository{repositoryURL: repositoryURL, registry: registry, authToken: authToken}, nil
 }
 
 func (g *GCPRemoteRepository) GetImage(ctx context.Context, tag string, platform containerregistry.Platform) (containerregistry.Image, error) {
@@ -45,20 +51,15 @@ func (g *GCPRemoteRepository) GetImage(ctx context.Context, tag string, platform
 		return nil, fmt.Errorf("invalid image reference: %w", err)
 	}
 
-	authToken, err := g.getAuthToken(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("error getting auth token: %w", err)
-	}
-
-	img, err := remote.Image(ref, remote.WithAuth(authToken), remote.WithPlatform(platform))
+	img, err := remote.Image(ref, remote.WithAuth(g.authToken), remote.WithPlatform(platform))
 	if err != nil {
 		return nil, fmt.Errorf("error pulling image: %w", err)
 	}
 
 	return img, nil
 }
 
-func (g *GCPRemoteRepository) getAuthToken(_ context.Context) (authn.Authenticator, error) {
+func getAuthToken(_ context.Context) (authn.Authenticator, error) {
 	authCfg := consts.DockerAuthConfig
 	if authCfg == "" {
 		return &gcpAuthConfig, nil
@@ -83,3 +84,7 @@ func (g *GCPRemoteRepository) getAuthToken(_ context.Context) (authn.Authenticat
 		Password: cfg.Password,
 	}, nil
 }
+
+func (g *GCPRemoteRepository) Close() error {
+	return g.registry.Close()
+}

packages/shared/pkg/dockerhub/repository_noop.go

@@ -28,3 +28,7 @@ func (n *NoopRemoteRepository) GetImage(ctx context.Context, tag string, platfor
 
 	return img, nil
 }
+
+func (n *NoopRemoteRepository) Close() error {
+	return nil
+}