Merge pull request #1052 from RedHatInsights/type_conversion_linter

fix: type conversion from int32 to uint32 causes an overflow error
RedHatInsights · Sep 18, 2024 · 3e6dacf · 3e6dacf
2 parents 6218273 + 3618244
commit 3e6dacf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/controllers/cloud.redhat.com/providers/web/caddy_reverse_proxy.go b/controllers/cloud.redhat.com/providers/web/caddy_reverse_proxy.go
@@ -13,7 +13,7 @@ import (
 	caddytls "github.com/caddyserver/caddy/v2/modules/caddytls"
 )
 
-func generateServers(pub bool, priv bool, pubPort uint32, privPort uint32, appPubPort int32, appPrivPort int32) (map[string]*caddyhttp.Server, error) {
+func generateServers(pub bool, priv bool, pubPort int32, privPort int32, appPubPort int32, appPrivPort int32) (map[string]*caddyhttp.Server, error) {
 	servers := make(map[string]*caddyhttp.Server)
 
 	tlsConnPolicy := []*caddytls.ConnectionPolicy{{
@@ -35,7 +35,7 @@ func generateServers(pub bool, priv bool, pubPort uint32, privPort uint32, appPu
 	return servers, nil
 }
 
-func generateServer(port uint32, appPort int32, tlsConnPolicy []*caddytls.ConnectionPolicy) *caddyhttp.Server {
+func generateServer(port int32, appPort int32, tlsConnPolicy []*caddytls.ConnectionPolicy) *caddyhttp.Server {
 
 	var warnings []caddyconfig.Warning
 
@@ -61,7 +61,7 @@ func generateServer(port uint32, appPort int32, tlsConnPolicy []*caddytls.Connec
 	return server
 }
 
-func generateCaddyConfig(pub bool, priv bool, pubPort uint32, privPort uint32, env *crd.ClowdEnvironment) (string, error) {
+func generateCaddyConfig(pub bool, priv bool, pubPort int32, privPort int32, env *crd.ClowdEnvironment) (string, error) {
 	var warnings []caddyconfig.Warning
 
 	var servers map[string]*caddyhttp.Server

diff --git a/controllers/cloud.redhat.com/providers/web/impl.go b/controllers/cloud.redhat.com/providers/web/impl.go
@@ -116,7 +116,7 @@ func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.Clo
 	}
 
 	var pub, priv bool
-	var pubPort, privPort uint32
+	var pubPort, privPort int32
 	if env.Spec.Providers.Web.TLS.Enabled {
 		if deployment.WebServices.Public.Enabled {
 			tlsPort := core.ServicePort{
@@ -128,7 +128,7 @@ func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.Clo
 			}
 			servicePorts = append(servicePorts, tlsPort)
 			pub = true
-			pubPort = uint32(env.Spec.Providers.Web.TLS.Port)
+			pubPort = int32(env.Spec.Providers.Web.TLS.Port)
 		}
 		if deployment.WebServices.Private.Enabled {
 			appProtocolPriv := "http"
@@ -146,7 +146,7 @@ func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.Clo
 				}
 				servicePorts = append(servicePorts, tlsPrivatePort)
 				priv = true
-				privPort = uint32(env.Spec.Providers.Web.TLS.PrivatePort)
+				privPort = int32(env.Spec.Providers.Web.TLS.PrivatePort)
 			}
 		}
 
@@ -170,7 +170,7 @@ func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.Clo
 	return cache.Update(deployProvider.CoreDeployment, d)
 }
 
-func generateCaddyConfigMap(cache *rc.ObjectCache, nn types.NamespacedName, app *crd.ClowdApp, pub bool, priv bool, pubPort uint32, privPort uint32, env *crd.ClowdEnvironment) error {
+func generateCaddyConfigMap(cache *rc.ObjectCache, nn types.NamespacedName, app *crd.ClowdApp, pub bool, priv bool, pubPort int32, privPort int32, env *crd.ClowdEnvironment) error {
 
 	cm := &core.ConfigMap{}
 	snn := types.NamespacedName{