[Misc] remove the duplicated env functions (vllm-project#953)

Signed-off-by: Iceber Gu <[email protected]>

Author: Iceber

pkg/controller/modeladapter/utils.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"os"
 	"strings"
 
 	"github.com/vllm-project/aibrix/pkg/config"
@@ -46,14 +45,6 @@ func equalStringSlices(a, b []string) bool {
 	return true
 }
 
-// getEnvKey retrieves the value of the environment variable named by the key.
-// If the variable is present, the function returns the value and a boolean true.
-// If the variable is not present, the function returns an empty string and a boolean false.
-func getEnvKey(key string) (string, bool) {
-	value, exists := os.LookupEnv(key)
-	return value, exists
-}
-
 func extractHuggingFacePath(artifactURL string) (string, error) {
 	parsedURL, err := url.Parse(artifactURL)
 	if err != nil {

pkg/controller/modeladapter/utils_test.go

@@ -18,7 +18,6 @@ package modeladapter
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -50,27 +49,6 @@ func TestEqualStringSlices(t *testing.T) {
 	})
 }
 
-// Test for getEnvKey function
-func TestGetEnvKey(t *testing.T) {
-	// Case 1: Environment variable exists
-	t.Run("environment variable exists", func(t *testing.T) {
-		err := os.Setenv("TEST_ENV", "test_value")
-		assert.NoError(t, err)
-		value, exists := getEnvKey("TEST_ENV")
-		assert.True(t, exists)
-		assert.Equal(t, "test_value", value)
-		err = os.Unsetenv("TEST_ENV")
-		assert.NoError(t, err)
-	})
-
-	// Case 2: Environment variable does not exist
-	t.Run("environment variable does not exist", func(t *testing.T) {
-		value, exists := getEnvKey("NON_EXISTENT_ENV")
-		assert.False(t, exists)
-		assert.Equal(t, "", value)
-	})
-}
-
 func TestExtractHuggingFacePath(t *testing.T) {
 	tests := []struct {
 		name        string

pkg/controller/podautoscaler/metrics/utils.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"net/url"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -134,11 +133,3 @@ func GetMetricFromSource(ctx context.Context, fetcher MetricFetcher, source auto
 	}
 	return fetcher.FetchMetric(ctx, source.ProtocolType, endpoint, source.Path, source.TargetMetric)
 }
-
-// getEnvKey retrieves the value of the environment variable named by the key.
-// If the variable is present, the function returns the value and a boolean true.
-// If the variable is not present, the function returns an empty string and a boolean false.
-func getEnvKey(key string) (string, bool) {
-	value, exists := os.LookupEnv(key)
-	return value, exists
-}

pkg/utils/redis.go

@@ -19,32 +19,16 @@ package utils
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"github.com/redis/go-redis/v9"
 	"k8s.io/klog/v2"
 )
 
 var (
-	redis_host = GetEnv("REDIS_HOST", "localhost")
-	redis_port = GetEnv("REDIS_PORT", "6379")
+	redis_host = LoadEnv("REDIS_HOST", "localhost")
+	redis_port = LoadEnv("REDIS_PORT", "6379")
 )
 
-// CheckEnvExists checks if an environment variable exists.
-// It returns the value and a boolean indicating its existence.
-func CheckEnvExists(envVar string) (string, bool) {
-	value, exists := os.LookupEnv(envVar)
-	return value, exists
-}
-
-func GetEnv(key, defaultValue string) string {
-	value := os.Getenv(key)
-	if value == "" {
-		return defaultValue
-	}
-	return value
-}
-
 func GetRedisClient() *redis.Client {
 	// Connect to Redis
 	client := redis.NewClient(&redis.Options{

pkg/utils/util.go

@@ -74,6 +74,13 @@ func TrimMessage(message string) string {
 	return message
 }
 
+// CheckEnvExists checks if an environment variable exists.
+// It returns the value and a boolean indicating its existence.
+func CheckEnvExists(envVar string) (string, bool) {
+	value, exists := os.LookupEnv(envVar)
+	return value, exists
+}
+
 // LoadEnv loads an environment variable or returns a default value if not set.
 func LoadEnv(key, defaultValue string) string {
 	value := os.Getenv(key)