From 31ae0c4ad6abdda34dbe87d350f1bc4a4814822b Mon Sep 17 00:00:00 2001 From: Dave Walter Date: Fri, 10 Jan 2025 12:04:31 -0800 Subject: [PATCH 1/2] Add the remote version to the download log message --- internal/component/artifactory_release_source.go | 4 +++- internal/component/bosh_io_release_source.go | 2 +- internal/component/github_release_source.go | 2 +- internal/component/release_source.go | 2 +- internal/component/s3_release_source.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/component/artifactory_release_source.go b/internal/component/artifactory_release_source.go index 67c5e11d..111897a6 100644 --- a/internal/component/artifactory_release_source.go +++ b/internal/component/artifactory_release_source.go @@ -84,7 +84,7 @@ func (ars *ArtifactoryReleaseSource) DownloadRelease(releaseDir string, remoteRe } downloadURL += "/" + ars.Repo + "/" + remoteRelease.RemotePath - ars.logger.Printf(logLineDownload, remoteRelease.Name, ReleaseSourceTypeArtifactory, ars.ID) + ars.logger.Printf(logLineDownload, remoteRelease.Name, remoteRelease.Version, ReleaseSourceTypeArtifactory, ars.ID) resp, err := ars.getWithAuth(downloadURL) if err != nil { return Local{}, err @@ -282,10 +282,12 @@ func (ars *ArtifactoryReleaseSource) FindReleaseVersion(spec cargo.BOSHReleaseTa if (foundRelease == cargo.BOSHReleaseTarballLock{}) { return cargo.BOSHReleaseTarballLock{}, ErrNotFound } + foundRelease.SHA1, err = ars.getFileSHA1(foundRelease) if err != nil { return cargo.BOSHReleaseTarballLock{}, err } + return foundRelease, nil } diff --git a/internal/component/bosh_io_release_source.go b/internal/component/bosh_io_release_source.go index 492a21f8..c5094e9c 100644 --- a/internal/component/bosh_io_release_source.go +++ b/internal/component/bosh_io_release_source.go @@ -143,7 +143,7 @@ func (src BOSHIOReleaseSource) FindReleaseVersion(spec cargo.BOSHReleaseTarballS } func (src BOSHIOReleaseSource) DownloadRelease(releaseDir string, remoteRelease cargo.BOSHReleaseTarballLock) (Local, error) { - src.logger.Printf(logLineDownload, remoteRelease.Name, ReleaseSourceTypeBOSHIO, src.ID()) + src.logger.Printf(logLineDownload, remoteRelease.Name, remoteRelease.Version, ReleaseSourceTypeBOSHIO, src.ID()) downloadURL := remoteRelease.RemotePath diff --git a/internal/component/github_release_source.go b/internal/component/github_release_source.go index e95ec1bb..bd2943c9 100644 --- a/internal/component/github_release_source.go +++ b/internal/component/github_release_source.go @@ -262,7 +262,7 @@ type ReleasesLister interface { // It should also calculate and set the SHA1 field on the Local result; it does not need // to ensure the sums match, the caller must verify this. func (grs *GithubReleaseSource) DownloadRelease(releaseDir string, remoteRelease cargo.BOSHReleaseTarballLock) (Local, error) { - grs.Logger.Printf(logLineDownload, remoteRelease.Name, ReleaseSourceTypeGithub, grs.ID) + grs.Logger.Printf(logLineDownload, remoteRelease.Name, remoteRelease.Version, ReleaseSourceTypeGithub, grs.ID) return downloadRelease(context.TODO(), releaseDir, remoteRelease, grs, grs.Logger) } diff --git a/internal/component/release_source.go b/internal/component/release_source.go index 087536db..29b24f9c 100644 --- a/internal/component/release_source.go +++ b/internal/component/release_source.go @@ -67,7 +67,7 @@ type ReleaseSource interface { const ( panicMessageWrongReleaseSourceType = "wrong constructor for release source configuration" - logLineDownload = "downloading %s from %s release source %s" + logLineDownload = "downloading %s %s from %s release source %s" ) // TODO: use the constants from "cargo" everywhere diff --git a/internal/component/s3_release_source.go b/internal/component/s3_release_source.go index 861c75ce..62073615 100644 --- a/internal/component/s3_release_source.go +++ b/internal/component/s3_release_source.go @@ -245,7 +245,7 @@ func (src S3ReleaseSource) DownloadRelease(releaseDir string, lock cargo.BOSHRel } } - src.logger.Printf(logLineDownload, lock.Name, ReleaseSourceTypeS3, src.ID()) + src.logger.Printf(logLineDownload, lock.Name, lock.Version, ReleaseSourceTypeS3, src.ID()) outputFile := filepath.Join(releaseDir, filepath.Base(lock.RemotePath)) From 1f032b5721031c8bcec171fd61edbba5cd9ec4cc Mon Sep 17 00:00:00 2001 From: Dave Walter Date: Fri, 10 Jan 2025 12:04:54 -0800 Subject: [PATCH 2/2] Remove the file info log line from the Artifactory release source --- internal/component/artifactory_release_source.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/component/artifactory_release_source.go b/internal/component/artifactory_release_source.go index 111897a6..4f192c4e 100644 --- a/internal/component/artifactory_release_source.go +++ b/internal/component/artifactory_release_source.go @@ -126,7 +126,6 @@ func (ars *ArtifactoryReleaseSource) DownloadRelease(releaseDir string, remoteRe func (ars *ArtifactoryReleaseSource) getFileSHA1(release cargo.BOSHReleaseTarballLock) (string, error) { fullURL := ars.ArtifactoryHost + "/api/storage/" + ars.Repo + "/" + release.RemotePath - ars.logger.Printf("Getting %s file info from artifactory", release.Name) resp, err := ars.getWithAuth(fullURL) if err != nil {