Remove obsolote revive comments

bootstrapper/cmd/bootstrapper/run.go

@@ -24,9 +24,6 @@ import (
 	"go.uber.org/zap"
 )
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func run(issuerWrapper initserver.IssuerWrapper, tpm vtpm.TPMOpenFunc, fileHandler file.Handler,
 	kube clusterInitJoiner, metadata metadataAPI,
 	bindIP, bindPort string, log *logger.Logger,

bootstrapper/internal/helm/client.go

@@ -146,9 +146,6 @@ func (h *Client) installCiliumGeneric(ctx context.Context, release helm.Release,
 	return nil
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (h *Client) installCiliumGCP(ctx context.Context, kubectl k8sapi.Client, release helm.Release, nodeName, nodePodCIDR, subnetworkPodCIDR, kubeAPIEndpoint string) error {
 	out, err := exec.CommandContext(ctx, constants.KubectlPath, "--kubeconfig", constants.ControlPlaneAdminConfFilename, "patch", "node", nodeName, "-p", "{\"spec\":{\"podCIDR\": \""+nodePodCIDR+"\"}}").CombinedOutput()
 	if err != nil {

bootstrapper/internal/kubernetes/k8sapi/k8sutil.go

@@ -109,9 +109,6 @@ func (k *KubernetesUtil) InstallComponents(ctx context.Context, version versions
 }
 
 // InitCluster instruments kubeadm to initialize the K8s cluster.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (k *KubernetesUtil) InitCluster(
 	ctx context.Context, initConfig []byte, nodeName string, ips []net.IP, controlPlaneEndpoint string, conformanceMode bool, log *logger.Logger,
 ) error {

bootstrapper/internal/kubernetes/kubernetes.go

@@ -66,9 +66,6 @@ type KubeWrapper struct {
 }
 
 // New creates a new KubeWrapper with real values.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func New(cloudProvider string, clusterUtil clusterUtil, configProvider configurationProvider, client k8sapi.Client,
 	providerMetadata ProviderMetadata, initialMeasurementsJSON []byte, helmClient helmClient, kubeAPIWaiter kubeAPIWaiter,
 ) *KubeWrapper {
@@ -87,9 +84,6 @@ func New(cloudProvider string, clusterUtil clusterUtil, configProvider configura
 }
 
 // InitCluster initializes a new Kubernetes cluster and applies pod network provider.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (k *KubeWrapper) InitCluster(
 	ctx context.Context, cloudServiceAccountURI, versionString string, measurementSalt []byte, enforcedPCRs []uint32,
 	enforceIDKeyDigest bool, idKeyDigest []byte, azureCVM bool,

cli/internal/cloudcmd/create.go

@@ -45,9 +45,6 @@ func NewCreator(out io.Writer) *Creator {
 }
 
 // Create creates the handed amount of instances and all the needed resources.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *Creator) Create(ctx context.Context, provider cloudprovider.Provider, config *config.Config, name, insType string, controlPlaneCount, workerCount int,
 ) (clusterid.File, error) {
 	switch provider {
@@ -88,9 +85,6 @@ func (c *Creator) Create(ctx context.Context, provider cloudprovider.Provider, c
 	}
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *Creator) createAWS(ctx context.Context, cl terraformClient, config *config.Config,
 	name, insType string, controlPlaneCount, workerCount int,
 ) (idFile clusterid.File, retErr error) {
@@ -127,9 +121,6 @@ func (c *Creator) createAWS(ctx context.Context, cl terraformClient, config *con
 	}, nil
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *Creator) createGCP(ctx context.Context, cl terraformClient, config *config.Config,
 	name, insType string, controlPlaneCount, workerCount int,
 ) (idFile clusterid.File, retErr error) {
@@ -166,9 +157,6 @@ func (c *Creator) createGCP(ctx context.Context, cl terraformClient, config *con
 	}, nil
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *Creator) createAzure(ctx context.Context, cl terraformClient, config *config.Config,
 	name, insType string, controlPlaneCount, workerCount int,
 ) (idFile clusterid.File, retErr error) {
@@ -234,9 +222,6 @@ func normalizeAzureURIs(vars terraform.AzureVariables) terraform.AzureVariables
 	return vars
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *Creator) createQEMU(ctx context.Context, cl terraformClient, lv libvirtRunner, name string, config *config.Config,
 	controlPlaneCount, workerCount int,
 ) (idFile clusterid.File, retErr error) {

cli/internal/cmd/cloud_test.go

@@ -29,9 +29,6 @@ type stubCloudCreator struct {
 	createErr    error
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func (c *stubCloudCreator) Create(
 	ctx context.Context,
 	provider cloudprovider.Provider,

cli/internal/cmd/spinner.go

@@ -77,9 +77,6 @@ func (s *spinner) Write(p []byte) (n int, err error) {
 	return s.out.Write(p)
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func spinTTY(out io.Writer, wg *sync.WaitGroup, stop *atomic.Bool, delay time.Duration, text string, showDots bool) {
 	defer wg.Done()
 
@@ -106,9 +103,6 @@ func spinTTY(out io.Writer, wg *sync.WaitGroup, stop *atomic.Bool, delay time.Du
 	fmt.Fprint(out, showCursor)
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func spinNoTTY(out io.Writer, wg *sync.WaitGroup, _ *atomic.Bool, _ time.Duration, text string, _ bool) {
 	defer wg.Done()
 	fmt.Fprintln(out, text+"...")

cli/internal/cmd/upgradeplan.go

@@ -70,9 +70,6 @@ func runUpgradePlan(cmd *cobra.Command, args []string) error {
 }
 
 // upgradePlan plans an upgrade of a Constellation cluster.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func upgradePlan(cmd *cobra.Command, planner upgradePlanner,
 	fileHandler file.Handler, client *http.Client, rekor rekorVerifier, flags upgradePlanFlags,
 ) error {
@@ -182,9 +179,6 @@ func getCompatibleImages(csp cloudprovider.Provider, currentVersion string, imag
 }
 
 // getCompatibleImageMeasurements retrieves the expected measurements for each image.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func getCompatibleImageMeasurements(ctx context.Context, cmd *cobra.Command, client *http.Client, rekor rekorVerifier, pubK []byte, images map[string]config.UpgradeConfig) error {
 	for idx, img := range images {
 		measurementsURL, err := url.Parse(constants.S3PublicBucket + strings.ToLower(img.Image) + "/measurements.yaml")
@@ -262,9 +256,6 @@ func parseUpgradePlanFlags(cmd *cobra.Command) (upgradePlanFlags, error) {
 	}, nil
 }
 
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func upgradePlanInteractive(out io.WriteCloser, in io.ReadCloser,
 	configPath string, config *config.Config, fileHandler file.Handler,
 	compatibleImages map[string]config.UpgradeConfig,

csi/cryptmapper/cryptmapper.go

@@ -217,9 +217,6 @@ func closeCryptDevice(device DeviceMapper, source, volumeID, deviceType string)
 }
 
 // openCryptDevice maps the volume at source to the crypt device identified by volumeID.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func openCryptDevice(ctx context.Context, device DeviceMapper, source, volumeID string, integrity bool,
 	getKey func(ctx context.Context, keyID string, keySize int) ([]byte, error), diskInfo func(disk string) (string, error),
 ) (string, error) {

disk-mapper/internal/setup/setup.go

@@ -51,9 +51,6 @@ type Manager struct {
 }
 
 // New initializes a SetupManager with the given parameters.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func New(log *logger.Logger, csp string, diskPath string, fs afero.Afero,
 	mapper DeviceMapper, mounter Mounter, openTPM vtpm.TPMOpenFunc,
 ) *Manager {

internal/attestation/vtpm/attestation.go

@@ -154,9 +154,6 @@ type Validator struct {
 }
 
 // NewValidator returns a new Validator.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func NewValidator(expectedPCRs map[uint32][]byte, enforcedPCRs []uint32, getTrustedKey GetTPMTrustedAttestationPublicKey,
 	validateCVM ValidateCVM, verifyUserData VerifyUserData, log AttestationLogger,
 ) *Validator {

joinservice/internal/server/server.go

@@ -42,9 +42,6 @@ type Server struct {
 }
 
 // New initializes a new Server.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func New(
 	measurementSalt []byte, fileHandler file.Handler, ca certificateAuthority,
 	joinTokenGetter joinTokenGetter, dataKeyGetter dataKeyGetter, log *logger.Logger,

kms/kms/gcp/gcp.go

@@ -54,9 +54,6 @@ type KMSClient struct {
 }
 
 // New initializes a KMS client for Google Cloud Platform.
-// TODO: Upon changing this function, please refactor it to reduce the number of arguments to <= 5.
-//
-//revive:disable-next-line
 func New(ctx context.Context, projectID, locationID, keyRingID string, store kmsInterface.Storage, protectionLvl kmspb.ProtectionLevel, opts ...gax.CallOption) (*KMSClient, error) {
 	if store == nil {
 		store = storage.NewMemMapStorage()