refactor: simplify string formatting and update webhook configuration references

Evsyukov Denis · Evsyukov Denis · commit 41458680f20e · 2025-05-20T14:34:08.000+03:00
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -106,15 +106,15 @@ func (c *Config) List() []map[string]string {
 func (c *Config) String() string {
 	b := new(strings.Builder)
 	// Header
-	b.WriteString(fmt.Sprintf("%-30s %-20s %-20s %-40s\n", "NAME", "VALUE", "EXPIRE AT", "DESCRIPTION"))
+	fmt.Fprintf(b, "%-30s %-20s %-20s %-40s\n", "NAME", "VALUE", "EXPIRE AT", "DESCRIPTION")
 
 	params := c.List()
 	for _, param := range params {
 		description := param["description"]
 		if param["lastError"] != "" {
 			description = "Error: " + param["lastError"]
 		}
-		b.WriteString(fmt.Sprintf("%-30s %-20s %-20s %-40s\n", param["name"], param["value"], param["expireAt"], description))
+		fmt.Fprintf(b, "%-30s %-20s %-20s %-40s\n", param["name"], param["value"], param["expireAt"], description)
 	}
 
 	return b.String()
diff --git a/pkg/debug/debug-cmd.go b/pkg/debug/debug-cmd.go
@@ -44,7 +44,7 @@ func DefineDebugCommands(kpApp *kingpin.Application) {
 				var err error
 				refreshInterval, err = time.ParseDuration(watchInterval)
 				if err != nil {
-					output.WriteString(fmt.Sprintf("could not parse watch refresh interval: %s, default 1s applied\n", err))
+					fmt.Fprintf(output, "could not parse watch refresh interval: %s, default 1s applied\n", err)
 					refreshInterval = time.Second
 				}
 			}
diff --git a/pkg/hook/config/config_v1.go b/pkg/hook/config/config_v1.go
@@ -463,8 +463,8 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf
 	cfg.Webhook = &admission.ValidatingWebhookConfig{
 		ValidatingWebhook: webhook,
 	}
-	cfg.Webhook.Metadata.LogLabels = map[string]string{}
-	cfg.Webhook.Metadata.MetricLabels = map[string]string{}
+	cfg.Webhook.LogLabels = map[string]string{}
+	cfg.Webhook.MetricLabels = map[string]string{}
 
 	return cfg, nil
 }
@@ -511,8 +511,8 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
 	cfg.Webhook = &admission.MutatingWebhookConfig{
 		MutatingWebhook: webhook,
 	}
-	cfg.Webhook.Metadata.LogLabels = map[string]string{}
-	cfg.Webhook.Metadata.MetricLabels = map[string]string{}
+	cfg.Webhook.LogLabels = map[string]string{}
+	cfg.Webhook.MetricLabels = map[string]string{}
 
 	return cfg, nil
 }
diff --git a/pkg/hook/controller/admission_bindings_controller.go b/pkg/hook/controller/admission_bindings_controller.go
@@ -61,27 +61,27 @@ func (c *AdmissionBindingsController) EnableValidatingBindings() {
 	}
 
 	for _, config := range c.ValidatingBindings {
-		if config.Webhook.Metadata.ConfigurationId == "" && confId == "" {
+		if config.Webhook.ConfigurationId == "" && confId == "" {
 			continue
 		}
-		if config.Webhook.Metadata.ConfigurationId != "" && confId == "" {
-			confId = config.Webhook.Metadata.ConfigurationId
+		if config.Webhook.ConfigurationId != "" && confId == "" {
+			confId = config.Webhook.ConfigurationId
 			continue
 		}
-		if config.Webhook.Metadata.ConfigurationId != confId {
+		if config.Webhook.ConfigurationId != confId {
 			log.Error("Possible bug!!! kubernetesValidating has non-unique configurationIds",
-				slog.String("configurationID", config.Webhook.Metadata.ConfigurationId),
+				slog.String("configurationID", config.Webhook.ConfigurationId),
 				slog.String("confID", confId))
 		}
 	}
 	c.ConfigurationId = confId
 
 	for _, config := range c.ValidatingBindings {
-		c.AdmissionLinks[config.Webhook.Metadata.WebhookId] = &AdmissionBindingToWebhookLink{
+		c.AdmissionLinks[config.Webhook.WebhookId] = &AdmissionBindingToWebhookLink{
 			BindingType:      htypes.KubernetesValidating,
 			BindingName:      config.BindingName,
 			ConfigurationId:  c.ConfigurationId,
-			WebhookId:        config.Webhook.Metadata.WebhookId,
+			WebhookId:        config.Webhook.WebhookId,
 			IncludeSnapshots: config.IncludeSnapshotsFrom,
 			Group:            config.Group,
 		}
@@ -97,27 +97,27 @@ func (c *AdmissionBindingsController) EnableMutatingBindings() {
 	}
 
 	for _, config := range c.MutatingBindings {
-		if config.Webhook.Metadata.ConfigurationId == "" && confId == "" {
+		if config.Webhook.ConfigurationId == "" && confId == "" {
 			continue
 		}
-		if config.Webhook.Metadata.ConfigurationId != "" && confId == "" {
-			confId = config.Webhook.Metadata.ConfigurationId
+		if config.Webhook.ConfigurationId != "" && confId == "" {
+			confId = config.Webhook.ConfigurationId
 			continue
 		}
-		if config.Webhook.Metadata.ConfigurationId != confId {
+		if config.Webhook.ConfigurationId != confId {
 			log.Error("Possible bug!!! kubernetesMutating has non-unique configurationIds",
-				slog.String("configurationID", config.Webhook.Metadata.ConfigurationId),
+				slog.String("configurationID", config.Webhook.ConfigurationId),
 				slog.String("confID", confId))
 		}
 	}
 	c.ConfigurationId = confId
 
 	for _, config := range c.MutatingBindings {
-		c.AdmissionLinks[config.Webhook.Metadata.WebhookId] = &AdmissionBindingToWebhookLink{
+		c.AdmissionLinks[config.Webhook.WebhookId] = &AdmissionBindingToWebhookLink{
 			BindingType:      htypes.KubernetesMutating,
 			BindingName:      config.BindingName,
 			ConfigurationId:  c.ConfigurationId,
-			WebhookId:        config.Webhook.Metadata.WebhookId,
+			WebhookId:        config.Webhook.WebhookId,
 			IncludeSnapshots: config.IncludeSnapshotsFrom,
 			Group:            config.Group,
 		}
diff --git a/pkg/hook/hook_manager.go b/pkg/hook/hook_manager.go
@@ -179,17 +179,17 @@ func (hm *Manager) loadHook(hookPath string) (*Hook, error) {
 	}
 
 	for _, validatingCfg := range hook.GetConfig().KubernetesValidating {
-		validatingCfg.Webhook.Metadata.LogLabels["hook"] = hook.Name
-		validatingCfg.Webhook.Metadata.MetricLabels = map[string]string{
+		validatingCfg.Webhook.LogLabels["hook"] = hook.Name
+		validatingCfg.Webhook.MetricLabels = map[string]string{
 			"hook":    hook.Name,
 			"binding": validatingCfg.BindingName,
 		}
 		validatingCfg.Webhook.UpdateIds("", validatingCfg.BindingName)
 	}
 
 	for _, mutatingCfg := range hook.GetConfig().KubernetesMutating {
-		mutatingCfg.Webhook.Metadata.LogLabels["hook"] = hook.Name
-		mutatingCfg.Webhook.Metadata.MetricLabels = map[string]string{
+		mutatingCfg.Webhook.LogLabels["hook"] = hook.Name
+		mutatingCfg.Webhook.MetricLabels = map[string]string{
 			"hook":    hook.Name,
 			"binding": mutatingCfg.BindingName,
 		}
diff --git a/pkg/webhook/admission/config.go b/pkg/webhook/admission/config.go
@@ -55,17 +55,17 @@ func (c *MutatingWebhookConfig) SetClientConfig(cc v1.WebhookClientConfig) {
 
 // UpdateIds use confId and webhookId to set a ConfigurationId prefix and a WebhookId.
 func (c *ValidatingWebhookConfig) UpdateIds(confID, webhookID string) {
-	c.Metadata.ConfigurationId = confID
+	c.ConfigurationId = confID
 	if confID == "" {
-		c.Metadata.ConfigurationId = DefaultConfigurationId
+		c.ConfigurationId = DefaultConfigurationId
 	}
-	c.Metadata.WebhookId = string_helper.SafeURLString(webhookID)
+	c.WebhookId = string_helper.SafeURLString(webhookID)
 }
 
 func (c *MutatingWebhookConfig) UpdateIds(confID, webhookID string) {
-	c.Metadata.ConfigurationId = confID
+	c.ConfigurationId = confID
 	if confID == "" {
-		c.Metadata.ConfigurationId = DefaultConfigurationId
+		c.ConfigurationId = DefaultConfigurationId
 	}
-	c.Metadata.WebhookId = string_helper.SafeURLString(webhookID)
+	c.WebhookId = string_helper.SafeURLString(webhookID)
 }
diff --git a/pkg/webhook/admission/manager.go b/pkg/webhook/admission/manager.go
@@ -77,7 +77,7 @@ func (m *WebhookManager) Init() error {
 }
 
 func (m *WebhookManager) AddValidatingWebhook(config *ValidatingWebhookConfig) {
-	confId := config.Metadata.ConfigurationId
+	confId := config.ConfigurationId
 	if confId == "" {
 		confId = m.DefaultConfigurationId
 	}
@@ -99,7 +99,7 @@ func (m *WebhookManager) AddValidatingWebhook(config *ValidatingWebhookConfig) {
 }
 
 func (m *WebhookManager) AddMutatingWebhook(config *MutatingWebhookConfig) {
-	confId := config.Metadata.ConfigurationId
+	confId := config.ConfigurationId
 	if confId == "" {
 		confId = m.DefaultConfigurationId
 	}
diff --git a/pkg/webhook/admission/resource.go b/pkg/webhook/admission/resource.go
@@ -33,7 +33,7 @@ func NewValidatingWebhookResource(opts WebhookResourceOptions) *ValidatingWebhoo
 }
 
 func (w *ValidatingWebhookResource) Set(whc *ValidatingWebhookConfig) {
-	w.hooks[whc.Metadata.WebhookId] = whc
+	w.hooks[whc.WebhookId] = whc
 }
 
 func (w *ValidatingWebhookResource) Get(id string) *ValidatingWebhookConfig {
@@ -134,7 +134,7 @@ func NewMutatingWebhookResource(opts WebhookResourceOptions) *MutatingWebhookRes
 }
 
 func (w *MutatingWebhookResource) Set(whc *MutatingWebhookConfig) {
-	w.hooks[whc.Metadata.WebhookId] = whc
+	w.hooks[whc.WebhookId] = whc
 }
 
 func (w *MutatingWebhookResource) Get(id string) *MutatingWebhookConfig {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func DefineDebugCommands(kpApp *kingpin.Application) {`
`44`	`44`	`var err error`
`45`	`45`	`refreshInterval, err = time.ParseDuration(watchInterval)`
`46`	`46`	`if err != nil {`
`47`		`- output.WriteString(fmt.Sprintf("could not parse watch refresh interval: %s, default 1s applied\n", err))`
	`47`	`+ fmt.Fprintf(output, "could not parse watch refresh interval: %s, default 1s applied\n", err)`
`48`	`48`	`refreshInterval = time.Second`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,8 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf`
`463`	`463`	`cfg.Webhook = &admission.ValidatingWebhookConfig{`
`464`	`464`	`ValidatingWebhook: webhook,`
`465`	`465`	`}`
`466`		`- cfg.Webhook.Metadata.LogLabels = map[string]string{}`
`467`		`- cfg.Webhook.Metadata.MetricLabels = map[string]string{}`
	`466`	`+ cfg.Webhook.LogLabels = map[string]string{}`
	`467`	`+ cfg.Webhook.MetricLabels = map[string]string{}`
`468`	`468`
`469`	`469`	`return cfg, nil`
`470`	`470`	`}`
`@@ -511,8 +511,8 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,`
`511`	`511`	`cfg.Webhook = &admission.MutatingWebhookConfig{`
`512`	`512`	`MutatingWebhook: webhook,`
`513`	`513`	`}`
`514`		`- cfg.Webhook.Metadata.LogLabels = map[string]string{}`
`515`		`- cfg.Webhook.Metadata.MetricLabels = map[string]string{}`
	`514`	`+ cfg.Webhook.LogLabels = map[string]string{}`
	`515`	`+ cfg.Webhook.MetricLabels = map[string]string{}`
`516`	`516`
`517`	`517`	`return cfg, nil`
`518`	`518`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,17 +179,17 @@ func (hm Manager) loadHook(hookPath string) (Hook, error) {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`for _, validatingCfg := range hook.GetConfig().KubernetesValidating {`
`182`		`- validatingCfg.Webhook.Metadata.LogLabels["hook"] = hook.Name`
`183`		`- validatingCfg.Webhook.Metadata.MetricLabels = map[string]string{`
	`182`	`+ validatingCfg.Webhook.LogLabels["hook"] = hook.Name`
	`183`	`+ validatingCfg.Webhook.MetricLabels = map[string]string{`
`184`	`184`	`"hook": hook.Name,`
`185`	`185`	`"binding": validatingCfg.BindingName,`
`186`	`186`	`}`
`187`	`187`	`validatingCfg.Webhook.UpdateIds("", validatingCfg.BindingName)`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`for _, mutatingCfg := range hook.GetConfig().KubernetesMutating {`
`191`		`- mutatingCfg.Webhook.Metadata.LogLabels["hook"] = hook.Name`
`192`		`- mutatingCfg.Webhook.Metadata.MetricLabels = map[string]string{`
	`191`	`+ mutatingCfg.Webhook.LogLabels["hook"] = hook.Name`
	`192`	`+ mutatingCfg.Webhook.MetricLabels = map[string]string{`
`193`	`193`	`"hook": hook.Name,`
`194`	`194`	`"binding": mutatingCfg.BindingName,`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,17 +55,17 @@ func (c *MutatingWebhookConfig) SetClientConfig(cc v1.WebhookClientConfig) {`
`55`	`55`
`56`	`56`	`// UpdateIds use confId and webhookId to set a ConfigurationId prefix and a WebhookId.`
`57`	`57`	`func (c *ValidatingWebhookConfig) UpdateIds(confID, webhookID string) {`
`58`		`- c.Metadata.ConfigurationId = confID`
	`58`	`+ c.ConfigurationId = confID`
`59`	`59`	`if confID == "" {`
`60`		`- c.Metadata.ConfigurationId = DefaultConfigurationId`
	`60`	`+ c.ConfigurationId = DefaultConfigurationId`
`61`	`61`	`}`
`62`		`- c.Metadata.WebhookId = string_helper.SafeURLString(webhookID)`
	`62`	`+ c.WebhookId = string_helper.SafeURLString(webhookID)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func (c *MutatingWebhookConfig) UpdateIds(confID, webhookID string) {`
`66`		`- c.Metadata.ConfigurationId = confID`
	`66`	`+ c.ConfigurationId = confID`
`67`	`67`	`if confID == "" {`
`68`		`- c.Metadata.ConfigurationId = DefaultConfigurationId`
	`68`	`+ c.ConfigurationId = DefaultConfigurationId`
`69`	`69`	`}`
`70`		`- c.Metadata.WebhookId = string_helper.SafeURLString(webhookID)`
	`70`	`+ c.WebhookId = string_helper.SafeURLString(webhookID)`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func (m *WebhookManager) Init() error {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func (m WebhookManager) AddValidatingWebhook(config ValidatingWebhookConfig) {`
`80`		`- confId := config.Metadata.ConfigurationId`
	`80`	`+ confId := config.ConfigurationId`
`81`	`81`	`if confId == "" {`
`82`	`82`	`confId = m.DefaultConfigurationId`
`83`	`83`	`}`
`@@ -99,7 +99,7 @@ func (m WebhookManager) AddValidatingWebhook(config ValidatingWebhookConfig) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`func (m WebhookManager) AddMutatingWebhook(config MutatingWebhookConfig) {`
`102`		`- confId := config.Metadata.ConfigurationId`
	`102`	`+ confId := config.ConfigurationId`
`103`	`103`	`if confId == "" {`
`104`	`104`	`confId = m.DefaultConfigurationId`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func NewValidatingWebhookResource(opts WebhookResourceOptions) *ValidatingWebhoo`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (w ValidatingWebhookResource) Set(whc ValidatingWebhookConfig) {`
`36`		`- w.hooks[whc.Metadata.WebhookId] = whc`
	`36`	`+ w.hooks[whc.WebhookId] = whc`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (w ValidatingWebhookResource) Get(id string) ValidatingWebhookConfig {`
`@@ -134,7 +134,7 @@ func NewMutatingWebhookResource(opts WebhookResourceOptions) *MutatingWebhookRes`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func (w MutatingWebhookResource) Set(whc MutatingWebhookConfig) {`
`137`		`- w.hooks[whc.Metadata.WebhookId] = whc`
	`137`	`+ w.hooks[whc.WebhookId] = whc`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`func (w MutatingWebhookResource) Get(id string) MutatingWebhookConfig {`