fix(checksum): remove unused fields and pass EnforceRequireChecksum p…

…roperly
aquaproj · Apr 5, 2024 · 7958c24 · 7958c24
1 parent 9ee1891
commit 7958c24
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/pkg/controller/cp/controller.go b/pkg/controller/cp/controller.go
@@ -25,7 +25,6 @@ type Controller struct {
 	which              WhichController
 	installer          Installer
 	policyConfigReader PolicyReader
-	requireChecksum    bool
 }
 
 type PackageInstaller interface {
@@ -49,7 +48,6 @@ func New(param *config.Param, pkgInstaller PackageInstaller, fs afero.Fs, rt *ru
 		which:              whichCtrl,
 		installer:          installer,
 		policyConfigReader: policyConfigReader,
-		requireChecksum:    param.RequireChecksum,
 	}
 }
 

diff --git a/pkg/controller/exec/controller.go b/pkg/controller/exec/controller.go
@@ -26,7 +26,6 @@ type Controller struct {
 	policyConfigReader PolicyReader
 	policyConfigFinder policy.ConfigFinder
 	enabledXSysExec    bool
-	requireChecksum    bool
 }
 
 type Installer interface {
@@ -45,7 +44,6 @@ func New(param *config.Param, pkgInstaller Installer, whichCtrl WhichController,
 		fs:                 fs,
 		policyConfigReader: policyConfigReader,
 		policyConfigFinder: policyConfigFinder,
-		requireChecksum:    param.RequireChecksum,
 	}
 }
 

diff --git a/pkg/controller/install/controller.go b/pkg/controller/install/controller.go
@@ -27,7 +27,6 @@ type Controller struct {
 	policyConfigFinder policy.ConfigFinder
 	policyConfigReader PolicyReader
 	skipLink           bool
-	requireChecksum    bool
 }
 
 func New(param *config.Param, configFinder ConfigFinder, configReader ConfigReader, registInstaller RegistryInstaller, pkgInstaller Installer, fs afero.Fs, rt *runtime.Runtime, policyConfigReader PolicyReader, policyConfigFinder policy.ConfigFinder) *Controller {
@@ -44,7 +43,6 @@ func New(param *config.Param, configFinder ConfigFinder, configReader ConfigRead
 		excludedTags:       param.ExcludedTags,
 		policyConfigReader: policyConfigReader,
 		policyConfigFinder: policyConfigFinder,
-		requireChecksum:    param.RequireChecksum,
 	}
 }
 

diff --git a/pkg/controller/install/install.go b/pkg/controller/install/install.go
@@ -117,15 +117,16 @@ func (c *Controller) install(ctx context.Context, logE *logrus.Entry, cfgFilePat
 	}
 
 	return c.packageInstaller.InstallPackages(ctx, logE, &installpackage.ParamInstallPackages{ //nolint:wrapcheck
-		Config:          cfg,
-		Registries:      registryContents,
-		ConfigFilePath:  cfgFilePath,
-		SkipLink:        c.skipLink,
-		Tags:            c.tags,
-		ExcludedTags:    c.excludedTags,
-		PolicyConfigs:   policyConfigs,
-		Checksums:       checksums,
-		RequireChecksum: c.requireChecksum,
-		DisablePolicy:   param.DisablePolicy,
+		Config:                 cfg,
+		Registries:             registryContents,
+		ConfigFilePath:         cfgFilePath,
+		SkipLink:               c.skipLink,
+		Tags:                   c.tags,
+		ExcludedTags:           c.excludedTags,
+		PolicyConfigs:          policyConfigs,
+		Checksums:              checksums,
+		RequireChecksum:        param.RequireChecksum,
+		EnforceRequireChecksum: param.EnforceRequireChecksum,
+		DisablePolicy:          param.DisablePolicy,
 	})
 }
diff --git a/pkg/controller/update/controller.go b/pkg/controller/update/controller.go
@@ -23,7 +23,6 @@ type Controller struct {
 	registryInstaller RegistryInstaller
 	fs                afero.Fs
 	runtime           *runtime.Runtime
-	requireChecksum   bool
 	fuzzyGetter       FuzzyGetter
 	fuzzyFinder       FuzzyFinder
 	which             WhichController
@@ -62,7 +61,6 @@ func New(param *config.Param, gh RepositoriesService, configFinder ConfigFinder,
 		registryInstaller: registInstaller,
 		fs:                fs,
 		runtime:           rt,
-		requireChecksum:   param.RequireChecksum,
 		fuzzyGetter:       fuzzyGetter,
 		fuzzyFinder:       fuzzyFinder,
 		which:             whichController,