diff --git a/cache-config/t3c-apply/config/config.go b/cache-config/t3c-apply/config/config.go index f30cbb9b9a..2b054c9ef3 100644 --- a/cache-config/t3c-apply/config/config.go +++ b/cache-config/t3c-apply/config/config.go @@ -190,13 +190,13 @@ func directoryExists(dir string) (bool, os.FileInfo) { return info.IsDir(), info } -const RpmDir = "/var/lib/rpm" +const rpmDir = "/var/lib/rpm" // verifies the rpm database files. if there is any database corruption // it will return false -func VerifyRpmDB() bool { +func verifyRpmDB() bool { exclude := regexp.MustCompile(`(^\.|^__)`) - dbFiles, err := os.ReadDir(RpmDir) + dbFiles, err := os.ReadDir(rpmDir) if err != nil { return false } @@ -204,7 +204,7 @@ func VerifyRpmDB() bool { if exclude.Match([]byte(file.Name())) { continue } - cmd := exec.Command("/usr/lib/rpm/rpmdb_verify", RpmDir+"/"+file.Name()) + cmd := exec.Command("/usr/lib/rpm/rpmdb_verify", rpmDir+"/"+file.Name()) err := cmd.Run() if err != nil || cmd.ProcessState.ExitCode() > 0 { return false @@ -497,7 +497,7 @@ If any of the related flags are also set, they override the mode's default behav os.Setenv("TO_PASS", toPass) } - rpmDBisOk := VerifyRpmDB() + rpmDBisOk := verifyRpmDB() if *installPackagesPtr && !rpmDBisOk { if t3cutil.StrToMode(*runModePtr) == t3cutil.ModeBadAss { @@ -507,7 +507,7 @@ If any of the related flags are also set, they override the mode's default behav } } - toInfoLog = append(toInfoLog, fmt.Sprintf("rpm database is ok: %v", rpmDBisOk)) + toInfoLog = append(toInfoLog, fmt.Sprintf("rpm database is ok: %t", rpmDBisOk)) // set TSHome var tsHome = "" if *tsHomePtr != "" { @@ -621,7 +621,7 @@ If any of the related flags are also set, they override the mode's default behav if len(fatalLogStrs) > 0 { for _, str := range fatalLogStrs { str = strings.TrimSpace(str) - log.Warnln(str) + log.Errorln(str) } return Cfg{}, errors.New("fatal error has occurerd") } diff --git a/cache-config/t3c-apply/t3c-apply.go b/cache-config/t3c-apply/t3c-apply.go index a184d81191..24e1e8e91a 100644 --- a/cache-config/t3c-apply/t3c-apply.go +++ b/cache-config/t3c-apply/t3c-apply.go @@ -276,7 +276,7 @@ func Main() int { return GitCommitAndExit(ExitCodeServicesError, FailureExitMsg, cfg, metaData, oldMetaData) } } else { - log.Infoln("======== RPM DB checks failed, package processing not possible, using installed packages from metadata if available========") + log.Warnln("======== RPM DB checks failed, package processing not possible, using installed packages from metadata if available========") trops.ProcessPackagesWithMetaData(oldMetaData.InstalledPackages) } diff --git a/cache-config/t3c-apply/torequest/torequest.go b/cache-config/t3c-apply/torequest/torequest.go index e863017fda..cb83c72725 100644 --- a/cache-config/t3c-apply/torequest/torequest.go +++ b/cache-config/t3c-apply/torequest/torequest.go @@ -587,12 +587,12 @@ func (r *TrafficOpsReq) CheckSystemServices() error { func (r *TrafficOpsReq) IsPackageInstalled(name string) bool { for k, v := range r.Pkgs { if strings.HasPrefix(k, name) { - log.Infof("Found in cache for '%v'", k) + log.Infof("Found in cache for '%s'", k) return v } } if !r.Cfg.RpmDBOk { - log.Warnf("RPM DB is corrupted cannot run IsPackageInstalled for '%v' and package metadata is unavailable", name) + log.Warnf("RPM DB is corrupted cannot run IsPackageInstalled for '%s' and package metadata is unavailable", name) return false } log.Infof("IsPackageInstalled '%v' not found in cache, querying rpm", name) @@ -1044,7 +1044,7 @@ func pkgMetaDataToMap(pmd []string) map[string]bool { func pkgMatch(pkgMetaData []string, pk string) bool { for _, pkg := range pkgMetaData { - if ok := strings.Contains(pk, pkg); ok { + if strings.Contains(pk, pkg) { return true } } @@ -1056,18 +1056,18 @@ func (r *TrafficOpsReq) ProcessPackagesWithMetaData(packageMetaData []string) er pkgs, err := getPackages(r.Cfg) pkgMdataMap := pkgMetaDataToMap(packageMetaData) if err != nil { - return errors.New("getting packages: " + err.Error()) + return fmt.Errorf("getting packages: %w", err) } for _, pkg := range pkgs { fullPackage := pkg.Name + "-" + pkg.Version if pkgMdataMap[fullPackage] { - log.Infof("package %v is assumed to be installed according to metadata file", fullPackage) + log.Infof("package %s is assumed to be installed according to metadata file", fullPackage) r.Pkgs[fullPackage] = true } else if pkgMatch(packageMetaData, pkg.Name) { - log.Infof("package %v is assumed to be installed according to metadata, but doesn't match traffic ops pkg", fullPackage) + log.Infof("package %s is assumed to be installed according to metadata, but doesn't match traffic ops pkg", fullPackage) r.Pkgs[fullPackage] = true } else { - log.Infof("package %v does not appear to be installed.", pkg.Name+"-"+pkg.Version) + log.Infof("package %s does not appear to be installed.", pkg.Name+"-"+pkg.Version) } } return nil