Skip to content

refactor: unify SecretVar secret source into typed ref,SecretType fields, replacing FromEnv, EnvVar, FromVault, VaultRef #4595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akshaydeo merged 5 commits into from
Jun 22, 2026
Merged

refactor: unify SecretVar secret source into typed ref,SecretType fields, replacing FromEnv, EnvVar, FromVault, VaultRef #4595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6669909
fix: add missing check for vault
BearTS Jun 21, 2026
20d1a11
refactor: SecretVar
BearTS Jun 22, 2026
d73c6d7
feat: make secretRef and fromSecret non global fields
BearTS Jun 22, 2026
8867722
refactor: change ref -> secretRef
BearTS Jun 22, 2026
69092c2
feat: add secret type instead of from secret
BearTS Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions core/providers/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ func ConfigureProxy(client *fasthttp.Client, proxyConfig *schemas.ProxyConfig, l
case schemas.NoProxy:
return client
case schemas.HTTPProxy:
if proxyConfig.URL != nil && proxyConfig.URL.IsFromEnv() && proxyConfig.URL.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.url", proxyConfig.URL.EnvVar)
if proxyConfig.URL != nil && proxyConfig.URL.IsFromSecret() && proxyConfig.URL.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.url", proxyConfig.URL.GetRawRef())
getLogger().Error(errMsg)
client.Dial = dialErrorFunc(errMsg)
return client
Expand All @@ -369,8 +369,8 @@ func ConfigureProxy(client *fasthttp.Client, proxyConfig *schemas.ProxyConfig, l
}
dialFunc = fasthttpproxy.FasthttpHTTPDialer(proxyURL)
case schemas.Socks5Proxy:
if proxyConfig.URL != nil && proxyConfig.URL.IsFromEnv() && proxyConfig.URL.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.url", proxyConfig.URL.EnvVar)
if proxyConfig.URL != nil && proxyConfig.URL.IsFromSecret() && proxyConfig.URL.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.url", proxyConfig.URL.GetRawRef())
getLogger().Error(errMsg)
client.Dial = dialErrorFunc(errMsg)
return client
Expand Down Expand Up @@ -408,8 +408,8 @@ func ConfigureProxy(client *fasthttp.Client, proxyConfig *schemas.ProxyConfig, l
}

// Configure custom CA certificate if provided
if proxyConfig.CACertPEM != nil && proxyConfig.CACertPEM.IsFromEnv() && proxyConfig.CACertPEM.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.ca_cert_pem", proxyConfig.CACertPEM.EnvVar)
if proxyConfig.CACertPEM != nil && proxyConfig.CACertPEM.IsFromSecret() && proxyConfig.CACertPEM.GetValue() == "" {
errMsg := fmt.Sprintf("invalid proxy configuration: %s references %q but it resolved to an empty value", "proxy.ca_cert_pem", proxyConfig.CACertPEM.GetRawRef())
getLogger().Error(errMsg)
client.Dial = dialErrorFunc(errMsg)
return client
Expand Down Expand Up @@ -451,8 +451,8 @@ func createTLSConfigWithCA(caCertPEM string) (*tls.Config, error) {
// ConfigureTLS applies TLS settings from NetworkConfig to the fasthttp client.
// It merges with any existing TLSConfig (e.g., from ConfigureProxy).
func ConfigureTLS(client *fasthttp.Client, networkConfig schemas.NetworkConfig, logger schemas.Logger) *fasthttp.Client {
if networkConfig.CACertPEM != nil && networkConfig.CACertPEM.IsFromEnv() && networkConfig.CACertPEM.GetValue() == "" {
errMsg := fmt.Sprintf("invalid provider configuration: %s references %q but it resolved to an empty value", "network_config.ca_cert_pem", networkConfig.CACertPEM.EnvVar)
if networkConfig.CACertPEM != nil && networkConfig.CACertPEM.IsFromSecret() && networkConfig.CACertPEM.GetValue() == "" {
errMsg := fmt.Sprintf("invalid provider configuration: %s references %q but it resolved to an empty value", "network_config.ca_cert_pem", networkConfig.CACertPEM.GetRawRef())
logger.Error(errMsg)
client.Dial = dialErrorFunc(errMsg)
return client
Expand Down
Loading
Loading