diff --git a/pkg/installpackage/checksum.go b/pkg/installpackage/checksum.go index 6371042f6..c02f07439 100644 --- a/pkg/installpackage/checksum.go +++ b/pkg/installpackage/checksum.go @@ -39,13 +39,13 @@ func (is *Installer) dlAndExtractChecksum(ctx context.Context, logE *logrus.Entr ghVerifier: is.ghVerifier, }, &cosignVerifier{ - cosignDisabled: is.cosignDisabled, - cosign: pkgInfo.Checksum.GetCosign(), - pkg: pkg, - installer: is.cosignInstaller, - verifier: is.cosign, - runtime: is.runtime, - asset: assetName, + disabled: is.cosignDisabled, + cosign: pkgInfo.Checksum.GetCosign(), + pkg: pkg, + installer: is.cosignInstaller, + verifier: is.cosign, + runtime: is.runtime, + asset: assetName, }, &minisignVerifier{ pkg: pkg, diff --git a/pkg/installpackage/download.go b/pkg/installpackage/download.go index bcf93904b..148cb7cb8 100644 --- a/pkg/installpackage/download.go +++ b/pkg/installpackage/download.go @@ -101,22 +101,22 @@ func (is *Installer) download(ctx context.Context, logE *logrus.Entry, param *Do ghVerifier: is.ghVerifier, }, &cosignVerifier{ - cosignDisabled: is.cosignDisabled, - pkg: ppkg, - cosign: pkgInfo.Cosign, - installer: is.cosignInstaller, - verifier: is.cosign, - runtime: is.runtime, - asset: param.Asset, + disabled: is.cosignDisabled, + pkg: ppkg, + cosign: pkgInfo.Cosign, + installer: is.cosignInstaller, + verifier: is.cosign, + runtime: is.runtime, + asset: param.Asset, }, &slsaVerifier{ - slsaDisabled: is.slsaDisabled, - pkg: ppkg, - provenance: pkgInfo.SLSAProvenance, - installer: is.slsaVerifierInstaller, - verifier: is.slsaVerifier, - runtime: is.runtime, - asset: param.Asset, + disabled: is.slsaDisabled, + pkg: ppkg, + provenance: pkgInfo.SLSAProvenance, + installer: is.slsaVerifierInstaller, + verifier: is.slsaVerifier, + runtime: is.runtime, + asset: param.Asset, }, &minisignVerifier{ pkg: ppkg, diff --git a/pkg/installpackage/verify_cosign.go b/pkg/installpackage/verify_cosign.go index ffd77b0e9..3ef634f32 100644 --- a/pkg/installpackage/verify_cosign.go +++ b/pkg/installpackage/verify_cosign.go @@ -12,17 +12,17 @@ import ( ) type cosignVerifier struct { - cosignDisabled bool - pkg *config.Package - cosign *registry.Cosign - installer *DedicatedInstaller - verifier CosignVerifier - runtime *runtime.Runtime - asset string + disabled bool + pkg *config.Package + cosign *registry.Cosign + installer *DedicatedInstaller + verifier CosignVerifier + runtime *runtime.Runtime + asset string } func (c *cosignVerifier) Enabled(logE *logrus.Entry) (bool, error) { - if c.cosignDisabled { + if c.disabled { logE.Debug("cosign is disabled") return false, nil } diff --git a/pkg/installpackage/verify_slsa.go b/pkg/installpackage/verify_slsa.go index 3359cb2ea..2f26d00a1 100644 --- a/pkg/installpackage/verify_slsa.go +++ b/pkg/installpackage/verify_slsa.go @@ -13,17 +13,17 @@ import ( ) type slsaVerifier struct { - slsaDisabled bool - pkg *config.Package - provenance *registry.SLSAProvenance - installer *DedicatedInstaller - verifier SLSAVerifier - runtime *runtime.Runtime - asset string + disabled bool + pkg *config.Package + provenance *registry.SLSAProvenance + installer *DedicatedInstaller + verifier SLSAVerifier + runtime *runtime.Runtime + asset string } func (s *slsaVerifier) Enabled(logE *logrus.Entry) (bool, error) { - if s.slsaDisabled { + if s.disabled { logE.Debug("slsa verification is disabled") return false, nil }