Skip to content

Commit 537a04c

Browse files
feiyu11859661feiyu11859661
committed
Renaming the local variable 'logger' to 'log'
This is to avoid shadowing the imported package name, improve the code clarity. Signed-off-by: Yu, Fei <fei.yu@intel.com>
1 parent 3671257 commit 537a04c

13 files changed

Lines changed: 133 additions & 133 deletions

File tree

‎cmd/image-composer/build.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func executeBuild(cmd *cobra.Command, args []string) error {
6363
globalConfig.WorkDir = workDir
6464
}
6565

66-
logger := logger.Logger()
66+
log := logger.Logger()
6767

6868
// Check if template file is provided as first positional argument
6969
if len(args) < 1 {
@@ -104,10 +104,10 @@ func executeBuild(cmd *cobra.Command, args []string) error {
104104
if err != nil {
105105
return fmt.Errorf("matching packages: %v", err)
106106
}
107-
logger.Infof("matched a total of %d packages", len(req))
107+
log.Infof("matched a total of %d packages", len(req))
108108
if verbose {
109109
for _, pkg := range req {
110-
logger.Infof("-> %s", pkg.Name)
110+
log.Infof("-> %s", pkg.Name)
111111
}
112112
}
113113

@@ -116,12 +116,12 @@ func executeBuild(cmd *cobra.Command, args []string) error {
116116
if err != nil {
117117
return fmt.Errorf("resolving packages: %v", err)
118118
}
119-
logger.Infof("resolved %d packages", len(needed))
119+
log.Infof("resolved %d packages", len(needed))
120120

121121
// If a dot file is specified, generate the dependency graph
122122
if dotFile != "" {
123123
if err := rpmutils.GenerateDot(needed, dotFile); err != nil {
124-
logger.Errorf("generating dot file: %v", err)
124+
log.Errorf("generating dot file: %v", err)
125125
}
126126
}
127127

@@ -150,18 +150,18 @@ func executeBuild(cmd *cobra.Command, args []string) error {
150150
}
151151

152152
// Download packages using configured workers and cache directory
153-
logger.Infof("downloading %d packages to %s using %d workers", len(urls), absCacheDir, globalConfig.Workers)
153+
log.Infof("downloading %d packages to %s using %d workers", len(urls), absCacheDir, globalConfig.Workers)
154154
if err := pkgfetcher.FetchPackages(urls, absCacheDir, globalConfig.Workers); err != nil {
155155
return fmt.Errorf("fetch failed: %v", err)
156156
}
157-
logger.Info("all downloads complete")
157+
log.Info("all downloads complete")
158158

159159
// Verify downloaded packages
160160
if err := p.Validate(globalConfig.CacheDir); err != nil {
161161
return fmt.Errorf("verification failed: %v", err)
162162
}
163163

164-
logger.Info("build completed successfully")
164+
log.Info("build completed successfully")
165165
return nil
166166
}
167167

‎cmd/image-composer/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ func main() {
4949
defer cleanup()
5050

5151
// Log configuration info
52-
logger := logger.Logger()
52+
log := logger.Logger()
5353
if configFilePath != "" {
54-
logger.Infof("Using configuration from: %s", configFilePath)
54+
log.Infof("Using configuration from: %s", configFilePath)
5555
}
5656
if globalConfig.Logging.Level == "debug" {
57-
logger.Debugf("Config: workers=%d, cache_dir=%s, work_dir=%s, temp_dir=%s",
57+
log.Debugf("Config: workers=%d, cache_dir=%s, work_dir=%s, temp_dir=%s",
5858
globalConfig.Workers, globalConfig.CacheDir, globalConfig.WorkDir, globalConfig.TempDir)
5959
}
6060

‎cmd/image-composer/validate.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ This allows checking for errors in your template before committing to a full bui
2626

2727
// executeValidate handles the validate command logic
2828
func executeValidate(cmd *cobra.Command, args []string) error {
29-
logger := logger.Logger()
29+
log := logger.Logger()
3030

3131
// Check if template file is provided as first positional argument
3232
if len(args) < 1 {
3333
return fmt.Errorf("no template file provided, usage: image-composer validate TEMPLATE_FILE")
3434
}
3535
templateFile := args[0]
3636

37-
logger.Infof("validating template file: %s", templateFile)
37+
log.Infof("validating template file: %s", templateFile)
3838

3939
// Load and validate the image template
4040
template, err := config.LoadTemplate(templateFile)
4141
if err != nil {
4242
return fmt.Errorf("template validation failed: %v", err)
4343
}
4444

45-
logger.Infof("✓ Template validation successful")
46-
logger.Infof(" Image: %s v%s", template.Image.Name, template.Image.Version)
47-
logger.Infof(" Target: %s %s (%s)", template.Target.OS, template.Target.Dist, template.Target.Arch)
48-
logger.Infof(" Output: %s", template.Target.ImageType)
49-
logger.Infof(" Provider: %s", template.GetProviderName())
50-
logger.Infof(" System Configs: %d", len(template.SystemConfigs))
45+
log.Infof("✓ Template validation successful")
46+
log.Infof(" Image: %s v%s", template.Image.Name, template.Image.Version)
47+
log.Infof(" Target: %s %s (%s)", template.Target.OS, template.Target.Dist, template.Target.Arch)
48+
log.Infof(" Output: %s", template.Target.ImageType)
49+
log.Infof(" Provider: %s", template.GetProviderName())
50+
log.Infof(" System Configs: %d", len(template.SystemConfigs))
5151

5252
if len(template.SystemConfigs) > 0 {
5353
config := template.SystemConfigs[0]
54-
logger.Infof(" Config: %s (%s)", config.Name, config.Description)
55-
logger.Infof(" Packages: %d", len(config.Packages))
56-
logger.Infof(" Kernel: %s (%s)", config.Kernel.Version, config.Kernel.Cmdline)
54+
log.Infof(" Config: %s (%s)", config.Name, config.Description)
55+
log.Infof(" Packages: %d", len(config.Packages))
56+
log.Infof(" Kernel: %s (%s)", config.Kernel.Version, config.Kernel.Cmdline)
5757

5858
if verbose && len(config.Packages) > 0 {
59-
logger.Infof(" Package list:")
59+
log.Infof(" Package list:")
6060
for _, pkg := range config.Packages {
61-
logger.Infof(" - %s", pkg)
61+
log.Infof(" - %s", pkg)
6262
}
6363
}
6464
}

‎internal/provider/azurelinux3/azurelinux3.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,51 +52,51 @@ func (p *AzureLinux3) Name() string { return "AzureLinux3" }
5252

5353
// Init will initialize the provider, fetching repo configuration
5454
func (p *AzureLinux3) Init(template *config.ImageTemplate) error {
55-
logger := logger.Logger()
55+
log := logger.Logger()
5656
p.repoURL = baseURL + template.Target.Arch + "/" + configName
5757

5858
resp, err := http.Get(p.repoURL)
5959
if err != nil {
60-
logger.Errorf("downloading repo config %s failed: %v", p.repoURL, err)
60+
log.Errorf("downloading repo config %s failed: %v", p.repoURL, err)
6161
return err
6262
}
6363
defer resp.Body.Close()
6464

6565
cfg, err := loadRepoConfig(resp.Body)
6666
if err != nil {
67-
logger.Errorf("parsing repo config failed: %v", err)
67+
log.Errorf("parsing repo config failed: %v", err)
6868
return err
6969
}
7070

7171
repoDataURL := baseURL + template.Target.Arch + "/" + repodata
7272
href, err := fetchPrimaryURL(repoDataURL)
7373
if err != nil {
74-
logger.Errorf("fetch primary.xml.gz failed: %v", err)
74+
log.Errorf("fetch primary.xml.gz failed: %v", err)
7575
return err
7676
}
7777

7878
p.repoCfg = cfg
7979
p.template = template
8080
p.gzHref = href
8181

82-
logger.Infof("initialized AzureLinux3 provider repo section=%s", cfg.Section)
83-
logger.Infof("name=%s", cfg.Name)
84-
logger.Infof("url=%s", cfg.URL)
85-
logger.Infof("primary.xml.gz=%s", p.gzHref)
82+
log.Infof("initialized AzureLinux3 provider repo section=%s", cfg.Section)
83+
log.Infof("name=%s", cfg.Name)
84+
log.Infof("url=%s", cfg.URL)
85+
log.Infof("primary.xml.gz=%s", p.gzHref)
8686
return nil
8787
}
8888

8989
func (p *AzureLinux3) Packages() ([]provider.PackageInfo, error) {
90-
logger := logger.Logger()
91-
logger.Infof("fetching packages from %s", p.repoCfg.URL)
90+
log := logger.Logger()
91+
log.Infof("fetching packages from %s", p.repoCfg.URL)
9292

9393
packages, err := rpmutils.ParsePrimary(p.repoCfg.URL, p.gzHref)
9494
if err != nil {
95-
logger.Errorf("parsing primary.xml.gz failed: %v", err)
95+
log.Errorf("parsing primary.xml.gz failed: %v", err)
9696
return nil, err
9797
}
9898

99-
logger.Infof("found %d packages in AzureLinux3 repo", len(packages))
99+
log.Infof("found %d packages in AzureLinux3 repo", len(packages))
100100
return packages, nil
101101
}
102102

@@ -140,7 +140,7 @@ func (p *AzureLinux3) MatchRequested(requests []string, all []provider.PackageIn
140140
}
141141

142142
func (p *AzureLinux3) Validate(destDir string) error {
143-
logger := logger.Logger()
143+
log := logger.Logger()
144144

145145
// read the GPG key from the repo config
146146
resp, err := http.Get(p.repoCfg.GPGKey)
@@ -153,8 +153,8 @@ func (p *AzureLinux3) Validate(destDir string) error {
153153
if err != nil {
154154
return fmt.Errorf("read GPG key body: %w", err)
155155
}
156-
logger.Infof("fetched GPG key (%d bytes)", len(keyBytes))
157-
logger.Debugf("GPG key: %s\n", keyBytes)
156+
log.Infof("fetched GPG key (%d bytes)", len(keyBytes))
157+
log.Debugf("GPG key: %s\n", keyBytes)
158158

159159
// store in a temp file
160160
tmp, err := os.CreateTemp("", "azurelinux-gpg-*.asc")
@@ -177,40 +177,40 @@ func (p *AzureLinux3) Validate(destDir string) error {
177177
return fmt.Errorf("glob %q: %w", rpmPattern, err)
178178
}
179179
if len(rpmPaths) == 0 {
180-
logger.Warn("no RPMs found to verify")
180+
log.Warn("no RPMs found to verify")
181181
return nil
182182
}
183183

184184
start := time.Now()
185185
results := rpmutils.VerifyAll(rpmPaths, tmp.Name(), 4)
186-
logger.Infof("RPM verification took %s", time.Since(start))
186+
log.Infof("RPM verification took %s", time.Since(start))
187187

188188
// Check results
189189
for _, r := range results {
190190
if !r.OK {
191191
return fmt.Errorf("RPM %s failed verification: %v", r.Path, r.Error)
192192
}
193193
}
194-
logger.Info("all RPMs verified successfully")
194+
log.Info("all RPMs verified successfully")
195195

196196
return nil
197197
}
198198

199199
func (p *AzureLinux3) Resolve(req []provider.PackageInfo, all []provider.PackageInfo) ([]provider.PackageInfo, error) {
200-
logger := logger.Logger()
200+
log := logger.Logger()
201201

202-
logger.Infof("resolving dependencies for %d RPMs", len(req))
202+
log.Infof("resolving dependencies for %d RPMs", len(req))
203203

204204
// Resolve all the required dependencies for the initial seed of RPMs
205205
needed, err := rpmutils.ResolvePackageInfos(req, all)
206206
if err != nil {
207-
logger.Errorf("resolving dependencies failed: %v", err)
207+
log.Errorf("resolving dependencies failed: %v", err)
208208
return nil, err
209209
}
210-
logger.Infof("need a total of %d RPMs (including dependencies)", len(needed))
210+
log.Infof("need a total of %d RPMs (including dependencies)", len(needed))
211211

212212
for _, pkg := range needed {
213-
logger.Debugf("-> %s", pkg.Name)
213+
log.Debugf("-> %s", pkg.Name)
214214
}
215215

216216
return needed, nil

0 commit comments

Comments
 (0)