Fixup: make golint happy

Author: praveenkumar

cmd/crc/cmd/start.go

@@ -16,12 +16,10 @@ import (
 	"github.com/crc-org/crc/v2/pkg/crc/cluster"
 	crcConfig "github.com/crc-org/crc/v2/pkg/crc/config"
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
-	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
 	crcErrors "github.com/crc-org/crc/v2/pkg/crc/errors"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
 	"github.com/crc-org/crc/v2/pkg/crc/machine/bundle"
 	"github.com/crc-org/crc/v2/pkg/crc/machine/types"
-	"github.com/crc-org/crc/v2/pkg/crc/network"
 	"github.com/crc-org/crc/v2/pkg/crc/preflight"
 	"github.com/crc-org/crc/v2/pkg/crc/preset"
 	"github.com/crc-org/crc/v2/pkg/crc/validation"
@@ -340,17 +338,6 @@ func commandLinePrefix(shell string) string {
 	return "$"
 }
 
-func checkDaemonStarted() error {
-	if crcConfig.GetNetworkMode(config) == network.SystemNetworkingMode {
-		return nil
-	}
-	v, err := daemonclient.GetVersionFromDaemonAPI()
-	if err != nil {
-		return err
-	}
-	return daemonclient.CheckVersionMismatch(v)
-}
-
 func portFallbackWarning() string {
 	var fallbackPortWarning string
 	httpScheme := "http"

pkg/crc/machine/driver.go

@@ -2,8 +2,6 @@ package machine
 
 import (
 	"context"
-	"crypto/rsa"
-	"crypto/x509"
 	"fmt"
 	"math/rand"
 	"os"
@@ -24,15 +22,13 @@ import (
 	"github.com/crc-org/crc/v2/pkg/crc/machine/state"
 	"github.com/crc-org/crc/v2/pkg/crc/machine/types"
 	"github.com/crc-org/crc/v2/pkg/crc/network"
-	"github.com/crc-org/crc/v2/pkg/crc/network/httpproxy"
 	"github.com/crc-org/crc/v2/pkg/crc/oc"
 	crcPreset "github.com/crc-org/crc/v2/pkg/crc/preset"
 	"github.com/crc-org/crc/v2/pkg/crc/services"
 	"github.com/crc-org/crc/v2/pkg/crc/services/dns"
 	crcssh "github.com/crc-org/crc/v2/pkg/crc/ssh"
 	"github.com/crc-org/crc/v2/pkg/crc/systemd"
 	"github.com/crc-org/crc/v2/pkg/crc/telemetry"
-	crctls "github.com/crc-org/crc/v2/pkg/crc/tls"
 	"github.com/crc-org/crc/v2/pkg/crc/validation"
 	crcos "github.com/crc-org/crc/v2/pkg/os"
 	"github.com/docker/go-units"
@@ -623,12 +619,12 @@ func createHost(machineConfig config.MachineConfig, preset crcPreset.Preset, pul
 	// Prepare VM options for macadam
 	vmOpts := macadam.VMOptions{
 		DiskImagePath:   machineConfig.ImageSourcePath,
-		DiskSize:        int(machineConfig.DiskSize),
-		Memory:          int(machineConfig.Memory),
+		DiskSize:        int(machineConfig.DiskSize), // #nosec G115 - disk size is bounded by reasonable values
+		Memory:          int(machineConfig.Memory),   // #nosec G115 - memory is bounded by reasonable values
 		Name:            machineConfig.Name,
 		Username:        "core",
 		SSHIdentityPath: constants.GetPrivateKeyPath(),
-		CPUs:            int(machineConfig.CPUs),
+		CPUs:            int(machineConfig.CPUs), // #nosec G115 - CPU count is bounded by reasonable values
 		CloudInitPath:   userDataPath,
 	}
 
@@ -739,48 +735,6 @@ func updateSSHKeyPair(sshRunner *crcssh.Runner) error {
 	return nil
 }
 
-func copyKubeconfigFileWithUpdatedUserClientCertAndKey(selfSignedCAKey *rsa.PrivateKey, selfSignedCACert *x509.Certificate, srcKubeConfigPath, dstKubeConfigPath string) error {
-	if _, err := os.Stat(constants.KubeconfigFilePath); err == nil {
-		return nil
-	}
-	clientKey, clientCert, err := crctls.GenerateClientCertificate(selfSignedCAKey, selfSignedCACert)
-	if err != nil {
-		return err
-	}
-	return updateClientCrtAndKeyToKubeconfig(clientKey, clientCert, srcKubeConfigPath, dstKubeConfigPath)
-}
-
-func ensureProxyIsConfiguredInOpenShift(ctx context.Context, ocConfig oc.Config, sshRunner *crcssh.Runner, proxy *httpproxy.ProxyConfig) (err error) {
-	if !proxy.IsEnabled() {
-		return nil
-	}
-	logging.Info("Adding proxy configuration to the cluster...")
-	return cluster.AddProxyConfigToCluster(ctx, sshRunner, ocConfig, proxy)
-}
-
-func waitForProxyPropagation(ctx context.Context, ocConfig oc.Config, proxyConfig *httpproxy.ProxyConfig) {
-	if !proxyConfig.IsEnabled() {
-		return
-	}
-	logging.Info("Waiting for the proxy configuration to be applied...")
-	checkProxySettingsForOperator := func() error {
-		proxySet, err := cluster.CheckProxySettingsForOperator(ocConfig, proxyConfig, "marketplace-operator", "openshift-marketplace")
-		if err != nil {
-			logging.Debugf("Error getting proxy setting for openshift-marketplace operator %v", err)
-			return &crcerrors.RetriableError{Err: err}
-		}
-		if !proxySet {
-			logging.Debug("Proxy changes for cluster in progress")
-			return &crcerrors.RetriableError{Err: fmt.Errorf("")}
-		}
-		return nil
-	}
-
-	if err := crcerrors.Retry(ctx, 300*time.Second, checkProxySettingsForOperator, 2*time.Second); err != nil {
-		logging.Debug("Failed to propagate proxy settings to cluster")
-	}
-}
-
 func logBundleDate(crcBundleMetadata *bundle.CrcBundleInfo) {
 	if buildTime, err := crcBundleMetadata.GetBundleBuildTime(); err == nil {
 		bundleAgeDays := time.Since(buildTime).Hours() / 24

pkg/crc/machine/driver_linux.go

@@ -108,7 +108,7 @@ func saveBundleMetadataToConfig(vmName, bundleName string) error {
 	}
 
 	configPath := filepath.Join(configDir, "config.json")
-	if err := os.WriteFile(configPath, data, 0644); err != nil {
+	if err := os.WriteFile(configPath, data, 0600); err != nil {
 		return fmt.Errorf("failed to write config file: %v", err)
 	}
 

pkg/crc/machine/start.go

@@ -101,15 +101,6 @@ func enableInternalDNS(gvClient *gvproxyclient.Client) error {
 	return nil
 }
 
-func isOpened(exposed []types.ExposeRequest, port types.ExposeRequest) bool {
-	for _, alreadyOpenedPort := range exposed {
-		if port == alreadyOpenedPort {
-			return true
-		}
-	}
-	return false
-}
-
 const (
 	virtualMachineIP = "192.168.127.2"
 	hostVirtualIP    = "192.168.127.254"