From 2480a97bb55648db997435c7e7e1edf0cc8801d7 Mon Sep 17 00:00:00 2001 From: Denis Vaumoron Date: Sat, 8 Jun 2024 01:33:05 +0200 Subject: [PATCH] Log searched assets #149 (#159) Signed-off-by: Denis Vaumoron --- pkg/apimsg/apimsg.go | 2 ++ versionmanager/retriever/atmos/atmosretriever.go | 5 +++++ versionmanager/retriever/terraform/terraformretriever.go | 9 +++++++++ .../retriever/terragrunt/terragruntretriever.go | 5 +++++ versionmanager/retriever/tofu/tofuretriever.go | 5 +++++ 5 files changed, 26 insertions(+) diff --git a/pkg/apimsg/apimsg.go b/pkg/apimsg/apimsg.go index 737f8210..179c5234 100644 --- a/pkg/apimsg/apimsg.go +++ b/pkg/apimsg/apimsg.go @@ -21,8 +21,10 @@ package apimsg import "errors" const ( + AssetsName = "assets" MsgFetchAllReleases = "Fetching all releases information from " MsgFetchRelease = "Fetching release information from " + MsgSearch = "Search" ) var ( diff --git a/versionmanager/retriever/atmos/atmosretriever.go b/versionmanager/retriever/atmos/atmosretriever.go index 0e5fecf1..76391af4 100644 --- a/versionmanager/retriever/atmos/atmosretriever.go +++ b/versionmanager/retriever/atmos/atmosretriever.go @@ -25,6 +25,7 @@ import ( "runtime" "strings" + "github.com/hashicorp/go-hclog" "github.com/tofuutils/tenv/config" "github.com/tofuutils/tenv/pkg/apimsg" sha256check "github.com/tofuutils/tenv/pkg/check/sha256" @@ -63,6 +64,10 @@ func (r AtmosRetriever) InstallRelease(versionStr string, targetPath string) err var assetURLs []string fileName, shaFileName := buildAssetNames(versionStr, r.conf.Arch) + if r.conf.Displayer.IsDebug() { + r.conf.Displayer.Log(hclog.Debug, apimsg.MsgSearch, apimsg.AssetsName, []string{fileName, shaFileName}) + } + switch r.conf.Atmos.GetInstallMode() { case config.InstallModeDirect: baseAssetURL, err2 := url.JoinPath(r.conf.Atmos.GetRemoteURL(), cloudposseName, config.AtmosName, github.Releases, github.Download, tag) //nolint diff --git a/versionmanager/retriever/terraform/terraformretriever.go b/versionmanager/retriever/terraform/terraformretriever.go index dd6635a0..d9a9c68c 100644 --- a/versionmanager/retriever/terraform/terraformretriever.go +++ b/versionmanager/retriever/terraform/terraformretriever.go @@ -27,6 +27,7 @@ import ( "runtime" "strings" + "github.com/hashicorp/go-hclog" "github.com/tofuutils/tenv/config" "github.com/tofuutils/tenv/pkg/apimsg" pgpcheck "github.com/tofuutils/tenv/pkg/check/pgp" @@ -71,6 +72,10 @@ func (r TerraformRetriever) InstallRelease(version string, targetPath string) er switch r.conf.Tf.GetInstallMode() { case config.InstallModeDirect: fileName, shaFileName, shaSigFileName = buildAssetNames(version, r.conf.Arch) + if r.conf.Displayer.IsDebug() { + r.conf.Displayer.Log(hclog.Debug, apimsg.MsgSearch, apimsg.AssetsName, []string{fileName, shaFileName, shaSigFileName}) + } + assetURLs, err := htmlretriever.BuildAssetURLs(baseVersionURL, fileName, shaFileName, shaSigFileName) if err != nil { return err @@ -95,6 +100,10 @@ func (r TerraformRetriever) InstallRelease(version string, targetPath string) er return err } + if r.conf.Displayer.IsDebug() { + r.conf.Displayer.Log(hclog.Debug, apimsg.MsgSearch, apimsg.AssetsName, []string{fileName, shaFileName, shaSigFileName}) + } + assetURLs, err := htmlretriever.BuildAssetURLs(baseVersionURL, shaFileName, shaSigFileName) if err != nil { return err diff --git a/versionmanager/retriever/terragrunt/terragruntretriever.go b/versionmanager/retriever/terragrunt/terragruntretriever.go index 6b67aa34..a7cde48a 100644 --- a/versionmanager/retriever/terragrunt/terragruntretriever.go +++ b/versionmanager/retriever/terragrunt/terragruntretriever.go @@ -25,6 +25,7 @@ import ( "runtime" "strings" + "github.com/hashicorp/go-hclog" "github.com/tofuutils/tenv/config" "github.com/tofuutils/tenv/pkg/apimsg" sha256check "github.com/tofuutils/tenv/pkg/check/sha256" @@ -60,6 +61,10 @@ func (r TerragruntRetriever) InstallRelease(versionStr string, targetPath string var assetURLs []string fileName, shaFileName := buildAssetNames(r.conf.Arch) + if r.conf.Displayer.IsDebug() { + r.conf.Displayer.Log(hclog.Debug, apimsg.MsgSearch, apimsg.AssetsName, []string{fileName, shaFileName}) + } + switch r.conf.Tg.GetInstallMode() { case config.InstallModeDirect: baseAssetURL, err2 := url.JoinPath(r.conf.Tg.GetRemoteURL(), gruntworkName, config.TerragruntName, github.Releases, github.Download, tag) //nolint diff --git a/versionmanager/retriever/tofu/tofuretriever.go b/versionmanager/retriever/tofu/tofuretriever.go index 1ec1c852..561ca4a5 100644 --- a/versionmanager/retriever/tofu/tofuretriever.go +++ b/versionmanager/retriever/tofu/tofuretriever.go @@ -24,6 +24,7 @@ import ( "runtime" "strings" + "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-version" "github.com/tofuutils/tenv/config" "github.com/tofuutils/tenv/pkg/apimsg" @@ -76,6 +77,10 @@ func (r TofuRetriever) InstallRelease(versionStr string, targetPath string) erro var assetURLs []string assetNames := buildAssetNames(versionStr, r.conf.Arch, stable) + if r.conf.Displayer.IsDebug() { + r.conf.Displayer.Log(hclog.Debug, apimsg.MsgSearch, apimsg.AssetsName, assetNames) + } + switch r.conf.Tofu.GetInstallMode() { case config.InstallModeDirect: baseAssetURL, err2 := url.JoinPath(r.conf.Tofu.GetRemoteURL(), opentofu, opentofu, github.Releases, github.Download, tag) //nolint