diff --git a/agent/pkg/config/config.go b/agent/pkg/config/config.go index f5cdb320a..0104a52b1 100644 --- a/agent/pkg/config/config.go +++ b/agent/pkg/config/config.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/tap/api" "io/ioutil" "os" ) @@ -46,7 +47,7 @@ func applyDefaultConfig() error { } func getDefaultConfig() (*shared.MizuAgentConfig, error) { - regex, err := shared.CompileRegexToSerializableRegexp(defaultRegexTarget) + regex, err := api.CompileRegexToSerializableRegexp(defaultRegexTarget) if err != nil { return nil, err } diff --git a/cli/config/config.go b/cli/config/config.go index ae8d172f2..a664d66b4 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -3,6 +3,7 @@ package config import ( "errors" "fmt" + "github.com/up9inc/mizu/tap/api" "io/ioutil" "k8s.io/apimachinery/pkg/util/json" "os" @@ -378,7 +379,7 @@ func GetSerializedMizuConfig() (string, error) { } func getMizuConfig() (*shared.MizuAgentConfig, error) { - serializableRegex, err := shared.CompileRegexToSerializableRegexp(Config.Tap.PodRegexStr) + serializableRegex, err := api.CompileRegexToSerializableRegexp(Config.Tap.PodRegexStr) if err != nil { return nil, err } diff --git a/shared/kubernetes/provider.go b/shared/kubernetes/provider.go index 3d927bd8b..9ff029584 100644 --- a/shared/kubernetes/provider.go +++ b/shared/kubernetes/provider.go @@ -167,8 +167,8 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS } } - configMapVolumeName := &core.ConfigMapVolumeSource{} - configMapVolumeName.Name = ConfigMapName + configMapVolume := &core.ConfigMapVolumeSource{} + configMapVolume.Name = ConfigMapName cpuLimit, err := resource.ParseQuantity(opts.Resources.CpuLimit) if err != nil { @@ -263,7 +263,7 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS { Name: ConfigMapName, VolumeSource: core.VolumeSource{ - ConfigMap: configMapVolumeName, + ConfigMap: configMapVolume, }, }, }, @@ -788,4 +788,4 @@ func validateKubernetesVersion(clientSet *kubernetes.Clientset) error { } return nil -} \ No newline at end of file +} diff --git a/shared/kubernetes/proxy.go b/shared/kubernetes/proxy.go index c6b180d52..cfb69e4db 100644 --- a/shared/kubernetes/proxy.go +++ b/shared/kubernetes/proxy.go @@ -64,4 +64,4 @@ func getRerouteHttpHandlerMizuStatic(proxyHandler http.Handler, mizuNamespace st r.URL.Path = strings.Replace(r.URL.Path, "/static/", fmt.Sprintf("%s/static/", getMizuApiServerProxiedHostAndPath(mizuNamespace, mizuServiceName)), 1) proxyHandler.ServeHTTP(w, r) }) -} \ No newline at end of file +} diff --git a/shared/kubernetes/utils.go b/shared/kubernetes/utils.go index 4c7697d15..2eb970308 100644 --- a/shared/kubernetes/utils.go +++ b/shared/kubernetes/utils.go @@ -55,4 +55,4 @@ func getMissingPods(pods1 []core.Pod, pods2 []core.Pod) []core.Pod { } } return missingPods -} \ No newline at end of file +} diff --git a/shared/models.go b/shared/models.go index 7f04493b7..e857d4cb2 100644 --- a/shared/models.go +++ b/shared/models.go @@ -1,6 +1,7 @@ package shared import ( + "github.com/up9inc/mizu/tap/api" "io/ioutil" "log" "strings" @@ -26,8 +27,8 @@ type Resources struct { } type MizuAgentConfig struct { - TapTargetRegex SerializableRegexp `yaml:"tapTargetRegex"` - MaxDBSizeBytes int64 `yaml:"maxDBSizeBytes"` + TapTargetRegex api.SerializableRegexp `yaml:"tapTargetRegex"` + MaxDBSizeBytes int64 `yaml:"maxDBSizeBytes"` } type WebSocketMessageMetadata struct { diff --git a/shared/serializable_regexp.go b/shared/serializable_regexp.go deleted file mode 100644 index e311fdeb5..000000000 --- a/shared/serializable_regexp.go +++ /dev/null @@ -1,30 +0,0 @@ -package shared - -import "regexp" - -type SerializableRegexp struct { - regexp.Regexp -} - -func CompileRegexToSerializableRegexp(expr string) (*SerializableRegexp, error) { - re, err := regexp.Compile(expr) - if err != nil { - return nil, err - } - return &SerializableRegexp{*re}, nil -} - -// UnmarshalText is by json.Unmarshal. -func (r *SerializableRegexp) UnmarshalText(text []byte) error { - rr, err := CompileRegexToSerializableRegexp(string(text)) - if err != nil { - return err - } - *r = *rr - return nil -} - -// MarshalText is used by json.Marshal. -func (r *SerializableRegexp) MarshalText() ([]byte, error) { - return []byte(r.String()), nil -}