Skip to content

Commit 1b82cd1

Browse files
committed
cleanup: move provider constants to provider specific file
Signed-off-by: Calum Murray <[email protected]>
1 parent ef063b6 commit 1b82cd1

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

pkg/config/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ const (
1212
ClusterProviderKubeConfig = "kubeconfig"
1313
ClusterProviderInCluster = "in-cluster"
1414
ClusterProviderDisabled = "disabled"
15-
ClusterProviderACM = "acm"
16-
ClusterProviderACMKubeConfig = "acm-kubeconfig"
1715
)
1816

1917
// StaticConfig is the configuration for the server.

pkg/kubernetes/provider_acm_hub.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ import (
2222
"github.com/containers/kubernetes-mcp-server/pkg/config"
2323
)
2424

25-
const ACMHubTargetParameterName = "cluster"
25+
const (
26+
ACMHubTargetParameterName = "cluster"
27+
ClusterProviderACM = "acm"
28+
ClusterProviderACMKubeConfig = "acm-kubeconfig"
29+
)
2630

2731
// ACMProviderConfig holds ACM-specific configuration that users can set in config.toml
2832
type ACMProviderConfig struct {
@@ -109,11 +113,11 @@ type acmHubClusterProvider struct {
109113
var _ Provider = &acmHubClusterProvider{}
110114

111115
func init() {
112-
RegisterProvider(config.ClusterProviderACM, newACMHubClusterProvider)
113-
RegisterProvider(config.ClusterProviderACMKubeConfig, newACMKubeConfigClusterProvider)
116+
RegisterProvider(ClusterProviderACM, newACMHubClusterProvider)
117+
RegisterProvider(ClusterProviderACMKubeConfig, newACMKubeConfigClusterProvider)
114118

115-
config.RegisterProviderConfig(config.ClusterProviderACM, parseAcmConfig)
116-
config.RegisterProviderConfig(config.ClusterProviderACMKubeConfig, parseAcmKubeConfigConfig)
119+
config.RegisterProviderConfig(ClusterProviderACM, parseAcmConfig)
120+
config.RegisterProviderConfig(ClusterProviderACMKubeConfig, parseAcmKubeConfigConfig)
117121
}
118122

119123
// IsACMHub checks if the current cluster is an ACM hub by looking for ACM CRDs
@@ -152,18 +156,18 @@ func newACMHubClusterProvider(cfg *config.StaticConfig) (Provider, error) {
152156
return nil, fmt.Errorf("failed to create in-cluster Kubernetes Manager for acm-hub cluster provider strategy: %w", err)
153157
}
154158

155-
providerCfg, ok := cfg.GetProviderConfig(config.ClusterProviderACM)
159+
providerCfg, ok := cfg.GetProviderConfig(ClusterProviderACM)
156160
if !ok {
157-
return nil, fmt.Errorf("missing required config for strategy '%s'", config.ClusterProviderACM)
161+
return nil, fmt.Errorf("missing required config for strategy '%s'", ClusterProviderACM)
158162
}
159163

160164
return newACMClusterProvider(m, providerCfg.(*ACMProviderConfig), false)
161165
}
162166

163167
func newACMKubeConfigClusterProvider(cfg *config.StaticConfig) (Provider, error) {
164-
providerCfg, ok := cfg.GetProviderConfig(config.ClusterProviderACMKubeConfig)
168+
providerCfg, ok := cfg.GetProviderConfig(ClusterProviderACMKubeConfig)
165169
if !ok {
166-
return nil, fmt.Errorf("missing required config for strategy '%s'", config.ClusterProviderACMKubeConfig)
170+
return nil, fmt.Errorf("missing required config for strategy '%s'", ClusterProviderACMKubeConfig)
167171
}
168172

169173
acmKubeConfigProviderCfg := providerCfg.(*ACMKubeConfigProviderConfig)

0 commit comments

Comments
 (0)