address review comments

Signed-off-by: Leonardo Luz Almeida <[email protected]>

Author: leoluz

cmd/controller/main.go

@@ -95,12 +95,12 @@ func main() {
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,
 		Metrics: metricsserver.Options{
-			BindAddress:   fmt.Sprintf(":%d", config.MetricsAddress()),
+			BindAddress:   config.MetricsAddress(),
 			SecureServing: config.MetricsSecure(),
 			TLSOpts:       tlsOpts,
 		},
 		WebhookServer:          webhookServer,
-		HealthProbeBindAddress: fmt.Sprintf(":%d", config.ControllerHealthProbeAddr()),
+		HealthProbeBindAddress: config.ControllerHealthProbeAddr(),
 		LeaderElection:         config.EnableLeaderElection(),
 		LeaderElectionID:       "8246dd0c.argoproj-labs.io",
 		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily

internal/controller/accessrequest_controller.go

@@ -55,7 +55,7 @@ const (
 	// managed by this controller
 	AccessRequestFinalizerName = "accessrequest.ephemeral-access.argoproj-labs.io/finalizer"
 	roleTemplateField          = ".spec.roleTemplateName"
-	projectField               = ".status.TargetProject"
+	projectField               = ".status.targetProject"
 )
 
 // +kubebuilder:rbac:groups=ephemeral-access.argoproj-labs.io,resources=accessrequests,verbs=get;list;watch;create;update;patch;delete

internal/controller/config/config.go

@@ -26,21 +26,21 @@ type LogConfigurer interface {
 
 // MetricsConfigurer defines the accessor methods for metrics configurations.
 type MetricsConfigurer interface {
-	MetricsAddress() int
+	MetricsAddress() string
 	MetricsSecure() bool
 }
 
 // ControllerConfigurer defines the accessor methods for the controller's
 // configurations.
 type ControllerConfigurer interface {
 	EnableLeaderElection() bool
-	ControllerHealthProbeAddr() int
+	ControllerHealthProbeAddr() string
 	ControllerEnableHTTP2() bool
 	ControllerRequeueInterval() time.Duration
 }
 
 // MetricsAddress acessor method
-func (c *Config) MetricsAddress() int {
+func (c *Config) MetricsAddress() string {
 	return c.Metrics.Address
 }
 
@@ -65,7 +65,7 @@ func (c *Config) EnableLeaderElection() bool {
 }
 
 // ControllerHealthProbeAddr acessor method
-func (c *Config) ControllerHealthProbeAddr() int {
+func (c *Config) ControllerHealthProbeAddr() string {
 	return c.Controller.HealthProbeAddr
 }
 
@@ -92,8 +92,8 @@ type Config struct {
 // MetricsConfig defines the metrics configurations
 type MetricsConfig struct {
 	// Address The address the metric endpoint binds to.
-	// Use the port 8080. If not set, it will be 0 in order to disable the metrics server.
-	Address int `env:"ADDR, default=0"`
+	// Use the port :8080. If not set, it will be 0 in order to disable the metrics server
+	Address string `env:"ADDR, default=0"`
 	// Secure If set the metrics endpoint is served securely.
 	Secure bool `env:"SECURE, default=false"`
 }
@@ -104,7 +104,7 @@ type ControllerConfig struct {
 	// Enabling this will ensure there is only one active controller manager.
 	EnableLeaderElection bool `env:"ENABLE_LEADER_ELECTION, default=false"`
 	// HealthProbeAddr The address the probe endpoint binds to.
-	HealthProbeAddr int `env:"HEALTH_PROBE_ADDR, default=8081"`
+	HealthProbeAddr string `env:"HEALTH_PROBE_ADDR, default=:8081"`
 	// EnableHTTP2 If set, HTTP/2 will be enabled for the metrics and webhook
 	// servers.
 	EnableHTTP2 bool `env:"ENABLE_HTTP2, default=false"`
@@ -129,7 +129,7 @@ type LogConfig struct {
 
 // String prints the config state
 func (c *Config) String() string {
-	return fmt.Sprintf("Metrics: [ Address: %d Secure: %t ] Log [ Level: %s Format: %s ] Controller [ EnableLeaderElection: %t HealthProbeAddress: %d EnableHTTP2: %t RequeueInterval: %s]", c.Metrics.Address, c.Metrics.Secure, c.Log.Level, c.Log.Format, c.Controller.EnableLeaderElection, c.Controller.HealthProbeAddr, c.Controller.EnableHTTP2, c.Controller.RequeueInterval)
+	return fmt.Sprintf("Metrics: [ Address: %s Secure: %t ] Log [ Level: %s Format: %s ] Controller [ EnableLeaderElection: %t HealthProbeAddress: %s EnableHTTP2: %t RequeueInterval: %s]", c.Metrics.Address, c.Metrics.Secure, c.Log.Level, c.Log.Format, c.Controller.EnableLeaderElection, c.Controller.HealthProbeAddr, c.Controller.EnableHTTP2, c.Controller.RequeueInterval)
 }
 
 // ReadEnvConfigs will read all environment variables as defined in the Config

internal/controller/config/config_test.go

@@ -17,21 +17,21 @@ func TestConfiguration(t *testing.T) {
 		assert.NoError(t, err, "NewConfiguration error")
 		assert.Equal(t, "info", config.LogLevel())
 		assert.Equal(t, "text", config.LogFormat())
-		assert.Equal(t, 0, config.MetricsAddress())
+		assert.Equal(t, "0", config.MetricsAddress())
 		assert.Equal(t, false, config.MetricsSecure())
 		assert.Equal(t, false, config.EnableLeaderElection())
-		assert.Equal(t, 8081, config.ControllerHealthProbeAddr())
+		assert.Equal(t, ":8081", config.ControllerHealthProbeAddr())
 		assert.Equal(t, false, config.ControllerEnableHTTP2())
 		assert.Equal(t, time.Minute*3, config.ControllerRequeueInterval())
 	})
 	t.Run("will validate if env vars are set properly", func(t *testing.T) {
 		// Given
 		t.Setenv("EPHEMERAL_LOG_LEVEL", "debug")
 		t.Setenv("EPHEMERAL_LOG_FORMAT", "json")
-		t.Setenv("EPHEMERAL_METRICS_ADDR", "9091")
+		t.Setenv("EPHEMERAL_METRICS_ADDR", ":9091")
 		t.Setenv("EPHEMERAL_METRICS_SECURE", "true")
 		t.Setenv("EPHEMERAL_CONTROLLER_ENABLE_LEADER_ELECTION", "true")
-		t.Setenv("EPHEMERAL_CONTROLLER_HEALTH_PROBE_ADDR", "1313")
+		t.Setenv("EPHEMERAL_CONTROLLER_HEALTH_PROBE_ADDR", ":1313")
 		t.Setenv("EPHEMERAL_CONTROLLER_ENABLE_HTTP2", "true")
 		t.Setenv("EPHEMERAL_CONTROLLER_REQUEUE_INTERVAL", "1s")
 
@@ -42,10 +42,10 @@ func TestConfiguration(t *testing.T) {
 		assert.NoError(t, err, "NewConfiguration error")
 		assert.Equal(t, "debug", config.LogLevel())
 		assert.Equal(t, "json", config.LogFormat())
-		assert.Equal(t, 9091, config.MetricsAddress())
+		assert.Equal(t, ":9091", config.MetricsAddress())
 		assert.Equal(t, true, config.MetricsSecure())
 		assert.Equal(t, true, config.EnableLeaderElection())
-		assert.Equal(t, 1313, config.ControllerHealthProbeAddr())
+		assert.Equal(t, ":1313", config.ControllerHealthProbeAddr())
 		assert.Equal(t, true, config.ControllerEnableHTTP2())
 		assert.Equal(t, time.Second, config.ControllerRequeueInterval())
 	})