Merge c69c35bef4aa6305700fa4bab77142b6afc799fc into e3cbe1e9b47af34522cb3ba6050a9c3134c80082

🔖 Bump go version '1.22.6 -> 1.23.2'

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.6-alpine AS builder
+FROM golang:1.23.2-alpine AS builder
 
 WORKDIR /dodo
 

config/config.go

@@ -95,7 +95,7 @@ type Config struct {
 	Timeout      uint32              `json:"timeout" validate:"gte=1,lte=100000"`
 	DodosCount   uint                `json:"dodos_count" validate:"gte=1"`
 	RequestCount uint                `json:"request_count" validation_name:"request-count" validate:"gte=1"`
-	NoProxyCheck utils.Option[bool] `json:"no_proxy_check"`
+	NoProxyCheck utils.IOption[bool] `json:"no_proxy_check"`
 }
 
 func (config *Config) MergeConfigs(newConfig *Config) {

go.mod

@@ -1,6 +1,6 @@
 module github.com/aykhans/dodo
 
-go 1.22.6
+go 1.23.2
 
 require (
 	github.com/go-playground/validator/v10 v10.23.0

utils/types.go

@@ -5,20 +5,32 @@ import (
 	"errors"
 )
 
+type NonNilConcrete interface {
+    ~int | ~float64 | ~string | ~bool
+}
+
+type IOption[T NonNilConcrete] interface {
+	IsNone() bool
+	ValueOrErr() (*T, error)
+	ValueOr(def *T) *T
+	ValueOrPanic() *T
+	UnmarshalJSON(data []byte) error
+}
+
 // Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead.
-type Option[T any] struct {
+type option[T NonNilConcrete] struct {
 	// value holds the actual value of the Option if it is not None.
 	value T
 	// none indicates whether the Option is None (i.e., has no value).
 	none bool
 }
 
-func (o *Option[T]) IsNone() bool {
+func (o *option[T]) IsNone() bool {
 	return o.none
 }
 
 // The returned value can be nil, if the Option is None, it will return nil and an error.
-func (o *Option[T]) ValueOrErr() (*T, error) {
+func (o *option[T]) ValueOrErr() (*T, error) {
 	if o.IsNone() {
 		return nil, errors.New("Option is None")
 	}
@@ -26,7 +38,7 @@ func (o *Option[T]) ValueOrErr() (*T, error) {
 }
 
 // The returned value can't be nil, if the Option is None, it will return the default value.
-func (o *Option[T]) ValueOr(def *T) *T {
+func (o *option[T]) ValueOr(def *T) *T {
 	if o.IsNone() {
 		return def
 	}
@@ -34,14 +46,14 @@ func (o *Option[T]) ValueOr(def *T) *T {
 }
 
 // The returned value can't be nil, if the Option is None, it will panic.
-func (o *Option[T]) ValueOrPanic() *T {
+func (o *option[T]) ValueOrPanic() *T {
 	if o.IsNone() {
 		panic("Option is None")
 	}
 	return &o.value
 }
 
-func (o *Option[T]) UnmarshalJSON(data []byte) error {
+func (o *option[T]) UnmarshalJSON(data []byte) error {
 	if string(data) == "null" {
 		o.none = true
 		return nil
@@ -50,10 +62,10 @@ func (o *Option[T]) UnmarshalJSON(data []byte) error {
 	return json.Unmarshal(data, &o.value)
 }
 
-func NewOption[T any](value T) Option[T] {
+func NewOption[T NonNilConcrete](value T) *option[T] {
-	return Option[T]{value: value}
+	return &option[T]{value: value}
 }
 
-func NewNoneOption[T any]() Option[T] {
+func NewNoneOption[T NonNilConcrete]() *option[T] {
-	return Option[T]{none: true}
+	return &option[T]{none: true}
 }