feat: disable env values with option

Signed-off-by: Eray Ates <[email protected]>
worldline-go · Dec 4, 2023 · 367b3c5 · 367b3c5
1 parent cb57b48
commit 367b3c5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -127,3 +127,4 @@ if err != nil {
 | `KLIENT_BASE_URL`             | Base url of client same with `API_GATEWAY_ADDRESS` but more priority. |
 | `KLIENT_INSECURE_SKIP_VERIFY` | Skip tls verify. Ex `KLIENT_INSECURE_SKIP_VERIFY=true`                |
 | `KLIENT_TIMEOUT`              | Timeout for http client. Ex: `KLIENT_TIMEOUT=30s`                     |
+| `KLIENT_RETRY_DISABLE`        | Disable retry. Ex: `KLIENT_RETRY_DISABLE=true`                        |
diff --git a/client.go b/client.go
@@ -33,6 +33,7 @@ var (
 	EnvKlientBaseURLGlobal      = "API_GATEWAY_ADDRESS"
 	EnvKlientInsecureSkipVerify = "KLIENT_INSECURE_SKIP_VERIFY"
 	EnvKlientTimeout            = "KLIENT_TIMEOUT"
+	EnvKlientRetryDisable       = "KLIENT_RETRY_DISABLE"
 )
 
 type Client struct {
@@ -72,11 +73,15 @@ func New(opts ...OptionClientFn) (*Client, error) {
 		}
 	}
 
+	if DisableEnvValues {
+		o.DisableEnvValues = true
+	}
+
 	var baseURL *url.URL
 	if o.BaseURL == "" {
 		baseURL := DefaultBaseURL
 
-		if !DisableEnvValues {
+		if !o.DisableEnvValues {
 			if baseURL == "" {
 				baseURL = os.Getenv(EnvKlientBaseURL)
 			}
@@ -113,7 +118,7 @@ func New(opts ...OptionClientFn) (*Client, error) {
 	}
 
 	// skip verify
-	if !DisableEnvValues {
+	if !o.DisableEnvValues {
 		if v, _ := strconv.ParseBool(os.Getenv(EnvKlientInsecureSkipVerify)); v {
 			o.InsecureSkipVerify = true
 		}
@@ -135,7 +140,13 @@ func New(opts ...OptionClientFn) (*Client, error) {
 		client.Transport.(*http.Transport).TLSClientConfig = tlsClientConfig
 	}
 
-	// disable retry
+	// disable
+	if !o.DisableEnvValues {
+		if v, _ := strconv.ParseBool(os.Getenv(EnvKlientRetryDisable)); v {
+			o.DisableRetry = true
+		}
+	}
+
 	if !o.DisableRetry {
 		// create retry client
 		retryClient := retryablehttp.Client{
@@ -178,7 +189,7 @@ func New(opts ...OptionClientFn) (*Client, error) {
 	}
 
 	// set timeout
-	if !DisableEnvValues {
+	if !o.DisableEnvValues {
 		if v, _ := time.ParseDuration(os.Getenv(EnvKlientTimeout)); v > 0 {
 			o.Timeout = v
 		}

diff --git a/example/api/main.go b/example/api/main.go
@@ -77,6 +77,7 @@ func main() {
 	client, err := klient.New(
 		klient.WithBaseURL("https://api.punkapi.com/v2/"),
 		// klient.WithBaseURL("https://expired.badssl.com/"),
+		// klient.WithDisableEnvValues(true),
 		// klient.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		// 	Level: slog.LevelDebug,
 		// }))),

diff --git a/option.go b/option.go
@@ -60,6 +60,8 @@ type optionClientValue struct {
 	RetryLog bool
 	// OptionRetryFns is the retry options for default retry policy.
 	OptionRetryFns []OptionRetryFn
+	// DisableEnvValues is the flag to disable all env values check.
+	DisableEnvValues bool
 }
 
 // OptionClientFn is a function that configures the client.
@@ -201,3 +203,10 @@ func WithRetryOptions(opts ...OptionRetryFn) OptionClientFn {
 		options.OptionRetryFns = append(options.OptionRetryFns, opts...)
 	}
 }
+
+// WithDisableEnvValues configures the client to disable all env values check.
+func WithDisableEnvValues(disableEnvValues bool) OptionClientFn {
+	return func(options *optionClientValue) {
+		options.DisableEnvValues = disableEnvValues
+	}
+}