squashme: match port type to crd

Author: SalimKayal

internal/remote/config/config.go

@@ -54,13 +54,13 @@ type RemoteSessionControllerConfig struct {
 	Runai     runaiConfig.RunaiConfig
 
 	// The port the server will listen to
-	ServerPort int
+	ServerPort int32
 
 	// FakeStart if true, do not start the remote session and print debug information
 	FakeStart bool
 
 	// SessionPort is the port where the remote session is expected to be serving
-	SessionPort int
+	SessionPort int32
 
 	// SessionURLPath is the URL path for the HTTP readiness probe
 	SessionURLPath string
@@ -133,9 +133,9 @@ func GetConfig() (cfg RemoteSessionControllerConfig, err error) {
 	cfg.Firecrest = firecrestConfig.GetConfig()
 	cfg.Runai = runaiConfig.GetConfig()
 
-	cfg.ServerPort = viper.GetInt(serverPortFlag)
+	cfg.ServerPort = viper.GetInt32(serverPortFlag)
 	cfg.FakeStart = viper.GetBool(fakeStartFlag)
-	cfg.SessionPort = viper.GetInt(sessionPortFlag)
+	cfg.SessionPort = viper.GetInt32(sessionPortFlag)
 	cfg.SessionURLPath = viper.GetString(sessionURLPathFlag)
 	cfg.ReadinessProbeType = viper.GetString(readinessProbeTypeFlag)
 

internal/remote/config/config_test.go

@@ -94,7 +94,7 @@ func TestConfigNewFlags(t *testing.T) {
 		args            []string
 		env             map[string]string
 		wantProbeType   string
-		wantSessionPort int
+		wantSessionPort int32
 		wantURLPath     string
 		wantErr         bool
 	}{

internal/remote/server/server_test.go

@@ -22,7 +22,7 @@ func (m *mockController) Status(ctx context.Context) (models.RemoteSessionState,
 func (m *mockController) Start(ctx context.Context) error { return nil }
 func (m *mockController) Stop(ctx context.Context) error  { return nil }
 
-func getFreePortOrDie() int {
+func getFreePortOrDie() int32 {
 	var a *net.TCPAddr
 	var err error
 	if a, err = net.ResolveTCPAddr("tcp", "localhost:0"); err == nil {
@@ -34,7 +34,7 @@ func getFreePortOrDie() int {
 					panic(err)
 				}
 			}()
-			return l.Addr().(*net.TCPAddr).Port
+			return int32(l.Addr().(*net.TCPAddr).Port)
 		}
 		panic(err)
 	}
@@ -51,13 +51,13 @@ func TestReadyEndpoint(t *testing.T) {
 
 	tests := []struct {
 		name         string
-		makeCfg      func(port int) config.RemoteSessionControllerConfig
-		setupBackend func(port int) (cleanup func())
+		makeCfg      func(port int32) config.RemoteSessionControllerConfig
+		setupBackend func(port int32) (cleanup func())
 		wantStatus   int
 	}{
 		{
 			name: "none probe returns 200",
-			makeCfg: func(int) config.RemoteSessionControllerConfig {
+			makeCfg: func(int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.None)
 				return c
@@ -66,13 +66,13 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive tcp open port returns 200",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.TCP)
 				c.SessionPort = port
 				return c
 			},
-			setupBackend: func(port int) func() {
+			setupBackend: func(port int32) func() {
 				ln, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 				if err != nil {
 					panic(err)
@@ -83,7 +83,7 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive tcp closed port returns 503",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.TCP)
 				c.SessionPort = port
@@ -93,14 +93,14 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive http serving 200 returns 200",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.HTTP)
 				c.SessionPort = port
 				c.SessionURLPath = "/lab"
 				return c
 			},
-			setupBackend: func(port int) func() {
+			setupBackend: func(port int32) func() {
 				ln, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 				if err != nil {
 					panic(err)
@@ -121,14 +121,14 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive http redirect 302 returns 200",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.HTTP)
 				c.SessionPort = port
 				c.SessionURLPath = "/"
 				return c
 			},
-			setupBackend: func(port int) func() {
+			setupBackend: func(port int32) func() {
 				ln, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 				if err != nil {
 					panic(err)
@@ -145,14 +145,14 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive http serving 500 returns 503",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.HTTP)
 				c.SessionPort = port
 				c.SessionURLPath = "/"
 				return c
 			},
-			setupBackend: func(port int) func() {
+			setupBackend: func(port int32) func() {
 				ln, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 				if err != nil {
 					panic(err)
@@ -169,7 +169,7 @@ func TestReadyEndpoint(t *testing.T) {
 		},
 		{
 			name: "interactive http connection refused returns 503",
-			makeCfg: func(port int) config.RemoteSessionControllerConfig {
+			makeCfg: func(port int32) config.RemoteSessionControllerConfig {
 				c := baseCfg
 				c.ReadinessProbeType = string(amaltheadevv1alpha1.HTTP)
 				c.SessionPort = port