From 8ec9752656ea614e10249898d7ed3c814c8aafe4 Mon Sep 17 00:00:00 2001 From: yusing Date: Fri, 26 Sep 2025 21:41:57 +0800 Subject: [PATCH] refactor(env): move env parsing to separate repo (cont. f7149453d64e7e465d95b07d842f66680e4c3147) --- agent/go.mod | 2 +- agent/pkg/env/env.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/agent/go.mod b/agent/go.mod index 5b2e8776..f25b01fe 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -21,6 +21,7 @@ require ( github.com/yusing/godoxy v0.18.6 github.com/yusing/godoxy/internal/utils v0.0.0 github.com/yusing/godoxy/socketproxy v0.0.0-00010101000000-000000000000 + github.com/yusing/goutils v0.0.0-20250922091446-1c6a11717d72 ) require ( @@ -89,7 +90,6 @@ require ( github.com/ugorji/go/codec v1.3.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect github.com/yusing/ds v0.1.0 // indirect - github.com/yusing/goutils v0.0.0-20250922091446-1c6a11717d72 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect diff --git a/agent/pkg/env/env.go b/agent/pkg/env/env.go index 017b15df..7dae9c7b 100644 --- a/agent/pkg/env/env.go +++ b/agent/pkg/env/env.go @@ -4,7 +4,7 @@ import ( "os" "github.com/yusing/godoxy/agent/pkg/agent" - "github.com/yusing/godoxy/internal/common" + "github.com/yusing/goutils/env" "github.com/rs/zerolog/log" ) @@ -32,14 +32,14 @@ func init() { } func Load() { - DockerSocket = common.GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock") - AgentName = common.GetEnvString("AGENT_NAME", DefaultAgentName()) - AgentPort = common.GetEnvInt("AGENT_PORT", 8890) - AgentSkipClientCertCheck = common.GetEnvBool("AGENT_SKIP_CLIENT_CERT_CHECK", false) + DockerSocket = env.GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock") + AgentName = env.GetEnvString("AGENT_NAME", DefaultAgentName()) + AgentPort = env.GetEnvInt("AGENT_PORT", 8890) + AgentSkipClientCertCheck = env.GetEnvBool("AGENT_SKIP_CLIENT_CERT_CHECK", false) - AgentCACert = common.GetEnvString("AGENT_CA_CERT", "") - AgentSSLCert = common.GetEnvString("AGENT_SSL_CERT", "") - Runtime = agent.ContainerRuntime(common.GetEnvString("RUNTIME", "docker")) + AgentCACert = env.GetEnvString("AGENT_CA_CERT", "") + AgentSSLCert = env.GetEnvString("AGENT_SSL_CERT", "") + Runtime = agent.ContainerRuntime(env.GetEnvString("RUNTIME", "docker")) switch Runtime { case agent.ContainerRuntimeDocker, agent.ContainerRuntimePodman: //, agent.ContainerRuntimeNerdctl: