better error client when proxy has conflict (#2305)

myakove · web-flow · commit 51da61ec15db · 2025-01-30T21:24:56.000+02:00
diff --git a/ocp_resources/resource.py b/ocp_resources/resource.py
@@ -126,7 +126,7 @@ def get_client(
             if client_configuration.proxy and client_configuration.proxy != proxy:
                 raise ValueError(
                     f"Conflicting proxy settings: client_configuration.proxy={client_configuration.proxy}, "
-                    f"but the environment variable 'OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY' defines proxy as {proxy}."
+                    f"but the environment variable 'HTTPS_PROXY/HTTP_PROXY' defines proxy as {proxy}."
                 )
             client_configuration.proxy = proxy
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def get_client(`
`126`	`126`	`if client_configuration.proxy and client_configuration.proxy != proxy:`
`127`	`127`	`raise ValueError(`
`128`	`128`	`f"Conflicting proxy settings: client_configuration.proxy={client_configuration.proxy}, "`
`129`		`- f"but the environment variable 'OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY' defines proxy as {proxy}."`
	`129`	`+ f"but the environment variable 'HTTPS_PROXY/HTTP_PROXY' defines proxy as {proxy}."`
`130`	`130`	`)`
`131`	`131`	`client_configuration.proxy = proxy`
`132`	`132`