Move to released uploadcare-go v2

Author: alxgsv

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/spf13/viper v1.21.0
-	github.com/uploadcare/uploadcare-go/v2 v2.0.0-20260409071548-d58ba67da138
+	github.com/uploadcare/uploadcare-go/v2 v2.0.0
 	go.yaml.in/yaml/v3 v3.0.4
 )
 
@@ -29,5 +29,3 @@ require (
 	golang.org/x/sys v0.42.0 // indirect
 	golang.org/x/text v0.28.0 // indirect
 )
-
-replace github.com/uploadcare/uploadcare-go/v2 => github.com/uploadcare/uploadcare-go/v2 v2.0.0-20260409071548-d58ba67da138

go.sum

@@ -53,8 +53,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/uploadcare/uploadcare-go/v2 v2.0.0-20260409071548-d58ba67da138 h1:Aoe226G5RvIEdIZkk1LbdIPZ09X62gDTq6bh4/zlSog=
-github.com/uploadcare/uploadcare-go/v2 v2.0.0-20260409071548-d58ba67da138/go.mod h1:nVtcYFEeUnxMjXbEsXzDefko4MdJpXjzBGRJtxwoCjU=
+github.com/uploadcare/uploadcare-go/v2 v2.0.0 h1:tZc3OjMcZyhuKEWnb2OV4IaZaWTnu96JJqo32n9on88=
+github.com/uploadcare/uploadcare-go/v2 v2.0.0/go.mod h1:nVtcYFEeUnxMjXbEsXzDefko4MdJpXjzBGRJtxwoCjU=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

internal/client/addon.go

@@ -22,11 +22,13 @@ func NewAddonService(publicKey, secretKey string, httpClient *http.Client, verbo
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {
@@ -51,7 +53,7 @@ func (s *addonService) Execute(ctx context.Context, addonName, fileUUID string,
 	}
 
 	s.verbose.Infof("executing addon %s on file %s", addonName, fileUUID)
-	result, err := s.sdk.Execute(ctx, addonName, execParams)
+	result, err := s.sdk.Execute(ctx, addon.Name(addonName), execParams)
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +64,7 @@ func (s *addonService) Execute(ctx context.Context, addonName, fileUUID string,
 }
 
 func (s *addonService) Status(ctx context.Context, addonName, requestID string) (*service.AddonStatus, error) {
-	result, err := s.sdk.Status(ctx, addonName, requestID)
+	result, err := s.sdk.Status(ctx, addon.Name(addonName), requestID)
 	if err != nil {
 		return nil, err
 	}

internal/client/convert.go

@@ -23,11 +23,13 @@ func NewConvertService(publicKey, secretKey string, httpClient *http.Client, ver
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {
@@ -50,7 +52,7 @@ func (s *convertService) Document(ctx context.Context, params service.DocConvert
 		sdkParams.ToStore = ucare.String(conversion.ToStoreTrue)
 	}
 	if params.SaveInGroup {
-		sdkParams.SaveInGroup = ucare.String("true")
+		sdkParams.SaveInGroup = "1"
 	}
 
 	result, err := s.sdk.Document(ctx, sdkParams)

internal/client/file.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/uploadcare/uploadcare-cli/internal/output"
@@ -18,7 +17,6 @@ import (
 type fileService struct {
 	sdkFileSvc   file.Service
 	sdkUploadSvc upload.Service
-	cdnBase      string
 	verbose      *output.VerboseLogger
 }
 
@@ -30,12 +28,14 @@ func NewFileService(publicKey, secretKey, cdnBase string, httpClient *http.Clien
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		CDNBase:                cdnBase,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithCDNBase(cdnBase),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {
@@ -44,21 +44,10 @@ func NewFileService(publicKey, secretKey, cdnBase string, httpClient *http.Clien
 	return &fileService{
 		sdkFileSvc:   file.NewService(client),
 		sdkUploadSvc: upload.NewService(client),
-		cdnBase:      cdnBase,
 		verbose:      verbose,
 	}, nil
 }
 
-// setCDNURL overwrites OriginalFileURL with a URL built from the configured
-// CDN base and the file's UUID. This makes --cdn-base and per-project CDN
-// domains actually take effect, since the API always returns the legacy
-// ucarecdn.com URL regardless of project settings.
-func (s *fileService) setCDNURL(f *service.File) {
-	if s.cdnBase != "" && f.OriginalFileURL != "" {
-		f.OriginalFileURL = strings.TrimRight(s.cdnBase, "/") + "/" + f.UUID + "/"
-	}
-}
-
 func (s *fileService) Info(ctx context.Context, uuid string, includeAppData bool) (*service.File, error) {
 	var params *file.InfoParams
 	if includeAppData {
@@ -69,9 +58,7 @@ func (s *fileService) Info(ctx context.Context, uuid string, includeAppData bool
 	if err != nil {
 		return nil, err
 	}
-	f := mapFileInfo(info)
-	s.setCDNURL(f)
-	return f, nil
+	return mapFileInfo(info), nil
 }
 
 func mapFileInfo(info file.Info) *service.File {
@@ -145,9 +132,7 @@ func (s *fileService) List(ctx context.Context, opts service.FileListOptions) (*
 		if err != nil {
 			return nil, err
 		}
-		f := mapFileInfo(*info)
-		s.setCDNURL(f)
-		files = append(files, *f)
+		files = append(files, *mapFileInfo(*info))
 	}
 
 	return &service.FileListResult{
@@ -171,9 +156,7 @@ func (s *fileService) Iterate(ctx context.Context, opts service.FileListOptions,
 		if err != nil {
 			return err
 		}
-		f := mapFileInfo(*info)
-		s.setCDNURL(f)
-		if err := fn(*f); err != nil {
+		if err := fn(*mapFileInfo(*info)); err != nil {
 			return err
 		}
 	}
@@ -304,36 +287,25 @@ func (s *fileService) enrichUploadInfo(ctx context.Context, id string, fallback
 	fileInfo, err := s.sdkFileSvc.Info(ctx, id, nil)
 	if err != nil {
 		s.verbose.Infof("file info fetch failed, using upload response: %v", err)
-		s.setCDNURL(fallback)
 		return fallback
 	}
-	f := mapFileInfo(fileInfo)
-	s.setCDNURL(f)
-	return f
+	return mapFileInfo(fileInfo)
 }
 
 func (s *fileService) Store(ctx context.Context, uuids []string) (*service.BatchResult, error) {
 	batch, err := s.sdkFileSvc.BatchStore(ctx, uuids)
 	if err != nil {
 		return nil, err
 	}
-	result := mapBatchInfo(batch)
-	for i := range result.Files {
-		s.setCDNURL(&result.Files[i])
-	}
-	return result, nil
+	return mapBatchInfo(batch), nil
 }
 
 func (s *fileService) Delete(ctx context.Context, uuids []string) (*service.BatchResult, error) {
 	batch, err := s.sdkFileSvc.BatchDelete(ctx, uuids)
 	if err != nil {
 		return nil, err
 	}
-	result := mapBatchInfo(batch)
-	for i := range result.Files {
-		s.setCDNURL(&result.Files[i])
-	}
-	return result, nil
+	return mapBatchInfo(batch), nil
 }
 
 func mapBatchInfo(batch file.BatchInfo) *service.BatchResult {
@@ -361,9 +333,7 @@ func (s *fileService) LocalCopy(ctx context.Context, params service.LocalCopyPar
 	if err != nil {
 		return nil, err
 	}
-	f := mapFileInfo(copyInfo.Result)
-	s.setCDNURL(f)
-	return f, nil
+	return mapFileInfo(copyInfo.Result), nil
 }
 
 func (s *fileService) RemoteCopy(ctx context.Context, params service.RemoteCopyParams) (*service.RemoteCopyResult, error) {

internal/client/file_test.go

@@ -25,52 +25,6 @@ func TestNewFileService_WithCDNBase(t *testing.T) {
 	}
 }
 
-func TestSetCDNURL_RewritesOriginalFileURL(t *testing.T) {
-	s := &fileService{cdnBase: "https://abc1234567.ucarecd.net"}
-	f := &service.File{
-		UUID:            "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
-		OriginalFileURL: "https://ucarecdn.com/a1b2c3d4-e5f6-7890-abcd-ef1234567890/",
-	}
-	s.setCDNURL(f)
-	want := "https://abc1234567.ucarecd.net/a1b2c3d4-e5f6-7890-abcd-ef1234567890/"
-	if f.OriginalFileURL != want {
-		t.Errorf("OriginalFileURL = %q, want %q", f.OriginalFileURL, want)
-	}
-}
-
-func TestSetCDNURL_NoOpWhenCDNBaseEmpty(t *testing.T) {
-	s := &fileService{cdnBase: ""}
-	f := &service.File{
-		UUID:            "a1b2c3d4",
-		OriginalFileURL: "https://ucarecdn.com/a1b2c3d4/",
-	}
-	s.setCDNURL(f)
-	if f.OriginalFileURL != "https://ucarecdn.com/a1b2c3d4/" {
-		t.Errorf("OriginalFileURL should be unchanged, got %q", f.OriginalFileURL)
-	}
-}
-
-func TestSetCDNURL_NoOpWhenDeletedFile(t *testing.T) {
-	s := &fileService{cdnBase: "https://abc1234567.ucarecd.net"}
-	f := &service.File{
-		UUID:            "a1b2c3d4",
-		OriginalFileURL: "", // API returns null for deleted files
-	}
-	s.setCDNURL(f)
-	if f.OriginalFileURL != "" {
-		t.Errorf("OriginalFileURL should remain empty for deleted file, got %q", f.OriginalFileURL)
-	}
-}
-
-func TestSetCDNURL_TrailingSlashNormalized(t *testing.T) {
-	s := &fileService{cdnBase: "https://custom.example.com/"}
-	f := &service.File{UUID: "abc123", OriginalFileURL: "https://ucarecdn.com/abc123/"}
-	s.setCDNURL(f)
-	if f.OriginalFileURL != "https://custom.example.com/abc123/" {
-		t.Errorf("OriginalFileURL = %q, want no double slash", f.OriginalFileURL)
-	}
-}
-
 func TestNewFileService_EmptyKeys(t *testing.T) {
 	// SDK validates credentials at client creation time.
 	_, err := NewFileService("", "", "", nil, nil)

internal/client/group.go

@@ -19,16 +19,19 @@ type groupService struct {
 }
 
 // NewGroupService creates a service.GroupService backed by the Uploadcare SDK.
-func NewGroupService(publicKey, secretKey string, httpClient *http.Client, verbose *output.VerboseLogger) (service.GroupService, error) {
+func NewGroupService(publicKey, secretKey, cdnBase string, httpClient *http.Client, verbose *output.VerboseLogger) (service.GroupService, error) {
 	creds := ucare.APICreds{
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithCDNBase(cdnBase),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {

internal/client/metadata.go

@@ -21,11 +21,13 @@ func NewMetadataService(publicKey, secretKey string, httpClient *http.Client, ve
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {

internal/client/project.go

@@ -21,11 +21,13 @@ func NewProjectService(publicKey, secretKey string, httpClient *http.Client, ver
 		PublicKey: publicKey,
 		SecretKey: secretKey,
 	}
-	conf := &ucare.Config{
-		APIVersion:             ucare.APIv07,
-		SignBasedAuthentication: true,
-		HTTPClient:             httpClient,
-		UserAgent:              UserAgent,
+	conf, err := ucare.NewConfig(creds,
+		ucare.WithSignBasedAuthentication(),
+		ucare.WithHTTPClient(httpClient),
+		ucare.WithUserAgent(UserAgent),
+	)
+	if err != nil {
+		return nil, err
 	}
 	client, err := ucare.NewClient(creds, conf)
 	if err != nil {

internal/client/usage.go

@@ -58,7 +58,7 @@ func (s *usageService) Combined(ctx context.Context, pubKey string, from, to str
 }
 
 func (s *usageService) Metric(ctx context.Context, pubKey, metric string, from, to string) (*service.MetricResult, error) {
-	m, err := s.sdk.GetUsageMetric(ctx, pubKey, metric, projectapi.UsageDateRange{
+	m, err := s.sdk.GetUsageMetric(ctx, pubKey, projectapi.UsageMetricName(metric), projectapi.UsageDateRange{
 		From: from,
 		To:   to,
 	})
@@ -67,7 +67,7 @@ func (s *usageService) Metric(ctx context.Context, pubKey, metric string, from,
 	}
 
 	result := &service.MetricResult{
-		Metric: m.Metric,
+		Metric: string(m.Metric),
 		Unit:   m.Unit,
 		Data:   make([]service.MetricDayData, len(m.Data)),
 	}