JGC-429 - Bump go 1.25.4 (#1483)

Author: ehl-jf

artifactory/commands/transferfiles/state/runstatus_test.go

@@ -17,6 +17,6 @@ func TestSaveAndLoadRunStatus(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, exists)
 	assert.Equal(t, transferRunStatusVersion, actualStatus.Version)
-	actualStatus.TimeEstimationManager.stateManager = stateManager
+	actualStatus.stateManager = stateManager
 	assert.Equal(t, stateManager.TransferRunStatus, actualStatus)
 }

artifactory/commands/transferfiles/state/state_test.go

@@ -126,7 +126,7 @@ func TestGetTransferStateAndSnapshotLoading(t *testing.T) {
 	assert.NoError(t, stateManager.SaveStateAndSnapshots())
 	// Modify state again, and assert that the loaded state from snapshot was not modified and remained as saved.
 	assert.NoError(t, stateManager.IncTransferredSizeAndFilesPhase1(2, 3))
-	assert.NotEqual(t, stateManager.TransferState.CurrentRepo, originalState.CurrentRepo)
+	assert.NotEqual(t, stateManager.CurrentRepo, originalState.CurrentRepo)
 	assertGetTransferStateAndSnapshot(t, false, originalState, stateManager.repoTransferSnapshot, true)
 
 	// After repo fully transferred, expected to load state without snapshots.

artifactory/commands/transferfiles/state/statemanager.go

@@ -2,10 +2,11 @@ package state
 
 import (
 	"fmt"
-	"github.com/jfrog/gofrog/safeconvert"
 	"path/filepath"
 	"time"
 
+	"github.com/jfrog/gofrog/safeconvert"
+
 	"github.com/jfrog/gofrog/datastructures"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferfiles/api"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
@@ -49,7 +50,7 @@ func NewTransferStateManager(loadRunStatus bool) (*TransferStateManager, error)
 		}
 		stateManager.TransferRunStatus = transferRunStatus
 	}
-	stateManager.TimeEstimationManager.stateManager = &stateManager
+	stateManager.stateManager = &stateManager
 	return &stateManager, nil
 }
 
@@ -128,7 +129,7 @@ func (ts *TransferStateManager) SetRepoState(repoKey string, totalSizeBytes, tot
 func (ts *TransferStateManager) SetRepoFullTransferStarted(startTime time.Time) error {
 	// We do not want to change the start time if it already exists, because it means we continue transferring from a snapshot.
 	// Some dirs may not be searched again (if done exploring or completed), so handling their diffs from the original time is required.
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		if state.CurrentRepo.FullTransfer.Started == "" {
 			state.CurrentRepo.FullTransfer.Started = ConvertTimeToRFC3339(startTime)
 		}
@@ -137,23 +138,23 @@ func (ts *TransferStateManager) SetRepoFullTransferStarted(startTime time.Time)
 }
 
 func (ts *TransferStateManager) SetRepoFullTransferCompleted() error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		state.CurrentRepo.FullTransfer.Ended = ConvertTimeToRFC3339(time.Now())
 		return nil
 	})
 }
 
 // Increasing Transferred Diff files (modified files) and SizeByBytes value in suitable repository progress state
 func (ts *TransferStateManager) IncTransferredSizeAndFilesPhase1(chunkTotalFiles, chunkTotalSizeInBytes int64) error {
-	err := ts.TransferState.Action(func(state *TransferState) error {
+	err := ts.Action(func(state *TransferState) error {
 		atomicallyAddInt64(&state.CurrentRepo.Phase1Info.TransferredSizeBytes, chunkTotalSizeInBytes)
 		atomicallyAddInt64(&state.CurrentRepo.Phase1Info.TransferredUnits, chunkTotalFiles)
 		return nil
 	})
 	if err != nil {
 		return err
 	}
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		atomicallyAddInt64(&transferRunStatus.OverallTransfer.TransferredSizeBytes, chunkTotalSizeInBytes)
 		atomicallyAddInt64(&transferRunStatus.OverallTransfer.TransferredUnits, chunkTotalFiles)
 
@@ -165,15 +166,15 @@ func (ts *TransferStateManager) IncTransferredSizeAndFilesPhase1(chunkTotalFiles
 }
 
 func (ts *TransferStateManager) IncTransferredSizeAndFilesPhase2(chunkTotalFiles, chunkTotalSizeInBytes int64) error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		atomicallyAddInt64(&state.CurrentRepo.Phase2Info.TransferredSizeBytes, chunkTotalSizeInBytes)
 		atomicallyAddInt64(&state.CurrentRepo.Phase2Info.TransferredUnits, chunkTotalFiles)
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) IncTotalSizeAndFilesPhase2(filesNumber, totalSize int64) error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		atomicallyAddInt64(&state.CurrentRepo.Phase2Info.TotalSizeBytes, totalSize)
 		atomicallyAddInt64(&state.CurrentRepo.Phase2Info.TotalUnits, filesNumber)
 		return nil
@@ -182,7 +183,7 @@ func (ts *TransferStateManager) IncTotalSizeAndFilesPhase2(filesNumber, totalSiz
 
 // Set relevant information of files and storage we need to transfer in phase3
 func (ts *TransferStateManager) SetTotalSizeAndFilesPhase3(filesNumber, totalSize int64) error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		state.CurrentRepo.Phase3Info.TransferredUnits = 0
 		state.CurrentRepo.Phase3Info.TransferredSizeBytes = 0
 		atomicallyAddInt64(&state.CurrentRepo.Phase3Info.TotalSizeBytes, totalSize)
@@ -193,7 +194,7 @@ func (ts *TransferStateManager) SetTotalSizeAndFilesPhase3(filesNumber, totalSiz
 
 // Increase transferred storage and files in phase 3
 func (ts *TransferStateManager) IncTransferredSizeAndFilesPhase3(chunkTotalFiles, chunkTotalSizeInBytes int64) error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		atomicallyAddInt64(&state.CurrentRepo.Phase3Info.TransferredSizeBytes, chunkTotalSizeInBytes)
 		atomicallyAddInt64(&state.CurrentRepo.Phase3Info.TransferredUnits, chunkTotalFiles)
 		return nil
@@ -202,7 +203,7 @@ func (ts *TransferStateManager) IncTransferredSizeAndFilesPhase3(chunkTotalFiles
 
 // Returns pointers to TotalStorage, TotalFiles, TransferredFiles and TransferredStorage from progressState of a specific Repository.
 func (ts *TransferStateManager) GetStorageAndFilesRepoPointers(phase int) (totalFailedStorage, totalUploadedFailedStorage, totalFailedFiles, totalUploadedFailedFiles *int64, err error) {
-	err = ts.TransferState.Action(func(state *TransferState) error {
+	err = ts.Action(func(state *TransferState) error {
 		switch phase {
 		case api.Phase1:
 			totalFailedStorage = &ts.CurrentRepo.Phase1Info.TotalSizeBytes
@@ -228,7 +229,7 @@ func (ts *TransferStateManager) GetStorageAndFilesRepoPointers(phase int) (total
 // Adds new diff details to the repo's diff array in state.
 // Marks files handling as started, and sets the handling range.
 func (ts *TransferStateManager) AddNewDiffToState(startTime time.Time) error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 
 		newDiff := DiffDetails{}
 
@@ -254,7 +255,7 @@ func (ts *TransferStateManager) AddNewDiffToState(startTime time.Time) error {
 }
 
 func (ts *TransferStateManager) SetFilesDiffHandlingCompleted() error {
-	return ts.TransferState.Action(func(state *TransferState) error {
+	return ts.Action(func(state *TransferState) error {
 		state.CurrentRepo.Diffs[len(state.CurrentRepo.Diffs)-1].FilesDiffRunTime.Ended = ConvertTimeToRFC3339(time.Now())
 		state.CurrentRepo.Diffs[len(state.CurrentRepo.Diffs)-1].Completed = true
 		return nil
@@ -281,14 +282,14 @@ func (ts *TransferStateManager) GetReposTransferredSizeBytes(repoKeys ...string)
 }
 
 func (ts *TransferStateManager) GetTransferredSizeBytes() (transferredSizeBytes int64, err error) {
-	return transferredSizeBytes, ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return transferredSizeBytes, ts.action(func(transferRunStatus *TransferRunStatus) error {
 		transferredSizeBytes = transferRunStatus.OverallTransfer.TransferredSizeBytes
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) GetDiffHandlingRange() (start, end time.Time, err error) {
-	return start, end, ts.TransferState.Action(func(state *TransferState) error {
+	return start, end, ts.Action(func(state *TransferState) error {
 		var inErr error
 		start, inErr = ConvertRFC3339ToTime(state.CurrentRepo.Diffs[len(state.CurrentRepo.Diffs)-1].HandledRange.Started)
 		if inErr != nil {
@@ -307,42 +308,42 @@ func (ts *TransferStateManager) IncVisitedFolders() error {
 }
 
 func (ts *TransferStateManager) ChangeDelayedFilesCountBy(count uint64, increase bool) error {
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		atomicallyAddUint64(&transferRunStatus.DelayedFiles, count, increase)
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) ChangeTransferFailureCountBy(count uint64, increase bool) error {
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		atomicallyAddUint64(&transferRunStatus.TransferFailures, count, increase)
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) IncRepositoriesTransferred() error {
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		transferRunStatus.TotalRepositories.TransferredUnits++
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) SetRepoPhase(phaseId int) error {
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		transferRunStatus.CurrentRepoPhase = phaseId
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) SetWorkingThreads(workingThreads int) error {
-	return ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return ts.action(func(transferRunStatus *TransferRunStatus) error {
 		transferRunStatus.WorkingThreads = workingThreads
 		return nil
 	})
 }
 
 func (ts *TransferStateManager) GetWorkingThreads() (workingThreads int, err error) {
-	return workingThreads, ts.TransferRunStatus.action(func(transferRunStatus *TransferRunStatus) error {
+	return workingThreads, ts.action(func(transferRunStatus *TransferRunStatus) error {
 		workingThreads = transferRunStatus.WorkingThreads
 		return nil
 	})

artifactory/commands/transferfiles/transfer.go

@@ -237,7 +237,7 @@ func (tdc *TransferFilesCommand) initStateManager(allSourceLocalRepos, sourceBui
 	tdc.stateManager.OverallTransfer.TotalUnits = totalFiles
 	tdc.stateManager.TotalRepositories.TotalUnits = int64(len(allSourceLocalRepos))
 	tdc.stateManager.OverallBiFiles.TotalUnits = totalBiFiles
-	tdc.stateManager.TimeEstimationManager.CurrentTotalTransferredBytes = 0
+	tdc.stateManager.CurrentTotalTransferredBytes = 0
 	if !tdc.ignoreState {
 		numberInitialErrors, e := getRetryErrorCount(allSourceLocalRepos)
 		if e != nil {

artifactory/commands/transferfiles/transfer_test.go

@@ -298,10 +298,11 @@ func writeMockResponse(t *testing.T, w http.ResponseWriter, resp interface{}) {
 
 func initPollUploadsTestMockServer(t *testing.T, totalChunkStatusVisits *int, totalUploadChunkVisits *int, file api.FileRepresentation) (*httptest.Server, *coreConfig.ServerDetails, artifactory.ArtifactoryServicesManager) {
 	return commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.RequestURI == "/"+utils.PluginsExecuteRestApi+"uploadChunk" {
+		switch r.RequestURI {
+		case "/" + utils.PluginsExecuteRestApi + "uploadChunk":
 			*totalUploadChunkVisits++
 			getUploadChunkMockResponse(t, w, totalUploadChunkVisits)
-		} else if r.RequestURI == "/"+utils.PluginsExecuteRestApi+syncChunks {
+		case "/" + utils.PluginsExecuteRestApi + syncChunks:
 			*totalChunkStatusVisits++
 			validateChunkStatusBody(t, r)
 			// If already visited chunk status, return status done this time.

artifactory/commands/transferfiles/utils_test.go

@@ -101,7 +101,7 @@ func TestStopTransferOnArtifactoryNodes(t *testing.T) {
 			nodeId = "node-2"
 			stoppedNodeTwo = true
 		}
-		_, err := w.Write([]byte(fmt.Sprintf(`{"node_id": "%s"}`, nodeId)))
+		_, err := fmt.Fprintf(w, `{"node_id": "%s"}`, nodeId)
 		assert.NoError(t, err)
 		requestNumber++
 	})
@@ -231,7 +231,7 @@ func TestUpdateMaxUniqueSnapshots(t *testing.T) {
 		default:
 			assert.Fail(t, "tried to update the Max Unique Snapshots setting of a repository of an unsupported package type")
 		}
-		_, err = w.Write([]byte(fmt.Sprintf("Repository %s-local update successfully.", packageType)))
+		_, err = fmt.Fprintf(w, "Repository %s-local update successfully.", packageType)
 		assert.NoError(t, err)
 	})
 	defer testServer.Close()

artifactory/commands/transferinstall/datatransferinstall.go

@@ -2,6 +2,13 @@ package transferinstall
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
 	biutils "github.com/jfrog/build-info-go/utils"
 	"github.com/jfrog/gofrog/version"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
@@ -10,12 +17,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
 )
 
 const (
@@ -36,9 +37,9 @@ var (
 	originalDirPath = FileItem{"etc", "plugins"}
 	v7DirPath       = FileItem{"var", "etc", "artifactory", "plugins"}
 	// Error types
-	notValidDestinationErr = fmt.Errorf("can't find the directory in which to install the data-transfer plugin. Please ensure you're running this command on the machine on which Artifactory is installed. You can also use the --home-dir option to specify the directory.")
+	errNotValidDestination = fmt.Errorf("can't find the directory in which to install the data-transfer plugin. Please ensure you're running this command on the machine on which Artifactory is installed. You can also use the --home-dir option to specify the directory")
 	downloadConnectionErr  = func(baseUrl, fileName, err string) error {
-		return fmt.Errorf("Could not download the plugin file - '%s' from '%s' due to the following error: '%s'. If this machine has no network access to the download URL, you can download these files from another machine and place them in a directory on this machine. You can then run this command again with the --dir command option, with the directory containing the files as the value.", fileName, baseUrl, err)
+		return fmt.Errorf("could not download the plugin file - '%s' from '%s' due to the following error: '%s'. If this machine has no network access to the download URL, you can download these files from another machine and place them in a directory on this machine. You can then run this command again with the --dir command option, with the directory containing the files as the value", fileName, baseUrl, err)
 	}
 	// Plugin files
 	transferPluginFiles = PluginFiles{
@@ -222,7 +223,7 @@ func (idtp *InstallDataTransferPluginCommand) getPluginDirDestination() (target
 			return
 		}
 		if !exists {
-			err = notValidDestinationErr
+			err = errNotValidDestination
 			return
 		}
 	}
@@ -242,7 +243,7 @@ func (idtp *InstallDataTransferPluginCommand) getPluginDirDestination() (target
 		}
 	}
 
-	err = notValidDestinationErr
+	err = errNotValidDestination
 	return
 }
 

artifactory/commands/transferinstall/datatransferinstall_test.go

@@ -2,12 +2,6 @@ package transferinstall
 
 import (
 	"fmt"
-	"github.com/jfrog/gofrog/version"
-	commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
-	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
-	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
-	testsutils "github.com/jfrog/jfrog-client-go/utils/tests"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/url"
 	"os"
@@ -17,6 +11,13 @@ import (
 	"runtime"
 	"strings"
 	"testing"
+
+	"github.com/jfrog/gofrog/version"
+	commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
+	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
+	testsutils "github.com/jfrog/jfrog-client-go/utils/tests"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPluginFileItemNameAndDirs(t *testing.T) {
@@ -148,7 +149,7 @@ func TestGetPluginDirDestination(t *testing.T) {
 		assert.NoError(t, err)
 		assert.True(t, dst.toPath() == originalDirPath.toPath(defaultSearchPath) || (dst.toPath() == v7DirPath.toPath(defaultSearchPath)))
 	} else {
-		assert.Errorf(t, err, notValidDestinationErr.Error())
+		assert.Errorf(t, err, errNotValidDestination.Error())
 	}
 
 	// Env var override
@@ -164,7 +165,7 @@ func TestGetPluginDirDestination(t *testing.T) {
 	assert.Equal(t, filepath.Join(testHomePath, testCustomDir, "confuse-"+artifactory, targetDir), dst.toPath())
 	cmd.SetJFrogHomePath("not_existing_dir")
 	_, err = cmd.getPluginDirDestination()
-	assert.Errorf(t, err, notValidDestinationErr.Error())
+	assert.Errorf(t, err, errNotValidDestination.Error())
 }
 
 func TestGetTransferSourceAndAction(t *testing.T) {

artifactory/commands/utils/transferconfigbase_test.go

@@ -255,14 +255,15 @@ func testDeactivateKeyEncryption(t *testing.T, wasEncrypted bool) {
 	decrypted := false
 	reactivated := false
 	testServer, serverDetails, _ := commonTests.CreateRtRestsMockServer(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.RequestURI == "/api/system/decrypt" {
+		switch r.RequestURI {
+		case "/api/system/decrypt":
 			if wasEncrypted {
 				w.WriteHeader(http.StatusOK)
 			} else {
 				w.WriteHeader(http.StatusConflict)
 			}
 			decrypted = true
-		} else if r.RequestURI == "/api/system/encrypt" {
+		case "/api/system/encrypt":
 			reactivated = true
 			w.WriteHeader(http.StatusOK)
 		}

artifactory/utils/commandsummary/buildinfosummary.go

@@ -335,11 +335,11 @@ func appendBuildInfoRow(tableBuilder *strings.Builder, build *buildInfo.BuildInf
 		if err != nil {
 			return err
 		}
-		tableBuilder.WriteString(fmt.Sprintf("| [%s](%s) %s | %s | %s | \n", buildName, buildInfoUrl, appendSpacesToTableColumn(""), appendSpacesToTableColumn(buildScanResult.GetViolations()), appendSpacesToTableColumn(buildScanResult.GetVulnerabilities())))
+		fmt.Fprintf(tableBuilder, "| [%s](%s) %s | %s | %s | \n", buildName, buildInfoUrl, appendSpacesToTableColumn(""), appendSpacesToTableColumn(buildScanResult.GetViolations()), appendSpacesToTableColumn(buildScanResult.GetVulnerabilities()))
 	} else {
 		upgradeMessage := fmt.Sprintf(basicSummaryUpgradeNotice, StaticMarkdownConfig.GetExtendedSummaryLangPage())
 		buildName = fmt.Sprintf(" %s %s", upgradeMessage, buildName)
-		tableBuilder.WriteString(fmt.Sprintf("| %s %s | %s | %s |\n", fitInsideMarkdownTable(buildName), appendSpacesToTableColumn(""), appendSpacesToTableColumn(buildScanResult.GetViolations()), appendSpacesToTableColumn(buildScanResult.GetVulnerabilities())))
+		fmt.Fprintf(tableBuilder, "| %s %s | %s | %s |\n", fitInsideMarkdownTable(buildName), appendSpacesToTableColumn(""), appendSpacesToTableColumn(buildScanResult.GetViolations()), appendSpacesToTableColumn(buildScanResult.GetVulnerabilities()))
 	}
 	return nil
 }