fixup! Add a linter to forbid env var usage

Author: m1kola

.golangci.yml

@@ -16,7 +16,10 @@ issues:
       - goconst
       - golint
       text: "underscore"
-    - path: pkg/util/envvar/
+    - path: ^pkg\/util\/envvar
+      linters:
+        - forbidigo
+    - path: ^cmd\/(readiness|versionhook|manager)\/main\.go$
       linters:
         - forbidigo
 linters:

cmd/manager/main.go

@@ -44,7 +44,7 @@ func configureLogger() (*zap.Logger, error) {
 func hasRequiredVariables(logger *zap.Logger, envVariables ...string) bool {
 	allPresent := true
 	for _, envVariable := range envVariables {
-		if _, envSpecified := os.LookupEnv(envVariable); !envSpecified { // nolint:forbidigo
+		if _, envSpecified := os.LookupEnv(envVariable); !envSpecified {
 			logger.Error(fmt.Sprintf("required environment variable %s not found", envVariable))
 			allPresent = false
 		}
@@ -70,7 +70,7 @@ func main() {
 	}
 
 	// Get watch namespace from environment variable.
-	namespace, nsSpecified := os.LookupEnv(WatchNamespaceEnv) // nolint:forbidigo
+	namespace, nsSpecified := os.LookupEnv(WatchNamespaceEnv)
 	if !nsSpecified {
 		log.Sugar().Fatal("No namespace specified to watch")
 	}
@@ -110,12 +110,12 @@ func main() {
 	// Setup Controller.
 	if err = controllers.NewReconciler(
 		mgr,
-		os.Getenv(construct.MongodbRepoUrlEnv), // nolint:forbidigo
-		os.Getenv(construct.MongodbImageEnv),   // nolint:forbidigo
-		envvar.GetEnvOrDefault(construct.MongoDBImageTypeEnv, construct.DefaultImageType), // nolint:forbidigo
-		os.Getenv(construct.AgentImageEnv),                                                // nolint:forbidigo
-		os.Getenv(construct.VersionUpgradeHookImageEnv),                                   // nolint:forbidigo
-		os.Getenv(construct.ReadinessProbeImageEnv),                                       // nolint:forbidigo
+		os.Getenv(construct.MongodbRepoUrlEnv),
+		os.Getenv(construct.MongodbImageEnv),
+		envvar.GetEnvOrDefault(construct.MongoDBImageTypeEnv, construct.DefaultImageType),
+		os.Getenv(construct.AgentImageEnv),
+		os.Getenv(construct.VersionUpgradeHookImageEnv),
+		os.Getenv(construct.ReadinessProbeImageEnv),
 	).SetupWithManager(mgr); err != nil {
 		log.Sugar().Fatalf("Unable to create controller: %v", err)
 	}

cmd/readiness/main.go

@@ -180,7 +180,7 @@ func performCheckOMMode(health health.Status) bool {
 }
 
 func isHeadlessMode() bool {
-	return os.Getenv(headlessAgent) == "true" // nolint:forbidigo
+	return os.Getenv(headlessAgent) == "true"
 }
 
 func kubernetesClientset() (kubernetes.Interface, error) {

cmd/versionhook/main.go

@@ -32,7 +32,7 @@ func main() {
 
 	logger.Info("Running version change post-start hook")
 
-	if statusPath := os.Getenv(agentStatusFilePathEnv); statusPath == "" { // nolint:forbidigo
+	if statusPath := os.Getenv(agentStatusFilePathEnv); statusPath == "" {
 		logger.Fatalf(`Required environment variable "%s" not set`, agentStatusFilePathEnv)
 		return
 	}
@@ -124,7 +124,7 @@ func waitForAgentHealthStatus() (agent.Health, error) {
 // getAgentHealthStatus returns an instance of agent.Health read
 // from the health file on disk
 func getAgentHealthStatus() (agent.Health, error) {
-	f, err := os.Open(os.Getenv(agentStatusFilePathEnv)) // nolint:forbidigo
+	f, err := os.Open(os.Getenv(agentStatusFilePathEnv))
 	if err != nil {
 		return agent.Health{}, err
 	}
@@ -150,7 +150,7 @@ func readAgentHealthStatus(reader io.Reader) (agent.Health, error) {
 }
 
 func getHostname() string {
-	return os.Getenv("HOSTNAME") // nolint:forbidigo
+	return os.Getenv("HOSTNAME")
 }
 
 // shouldDeletePod returns a boolean value indicating if this pod should be deleted