@@ -255,11 +255,11 @@ func (cnf *Configurator) deleteIngressMetricsLabels(key string) {
255255func (cnf * Configurator ) AddOrUpdateIngress (ingEx * IngressEx ) (Warnings , error ) {
256256 warnings , err := cnf .addOrUpdateIngress (ingEx )
257257 if err != nil {
258- return warnings , fmt .Errorf ("Error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
258+ return warnings , fmt .Errorf ("error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
259259 }
260260
261261 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
262- return warnings , fmt .Errorf ("Error reloading NGINX for %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
262+ return warnings , fmt .Errorf ("error reloading NGINX for %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
263263 }
264264
265265 return warnings , nil
@@ -287,7 +287,7 @@ func (cnf *Configurator) addOrUpdateIngress(ingEx *IngressEx) (Warnings, error)
287287 name := objectMetaToFileName (& ingEx .Ingress .ObjectMeta )
288288 content , err := cnf .templateExecutor .ExecuteIngressConfigTemplate (& nginxCfg )
289289 if err != nil {
290- return warnings , fmt .Errorf ("Error generating Ingress Config %v: %w" , name , err )
290+ return warnings , fmt .Errorf ("error generating Ingress Config %v: %w" , name , err )
291291 }
292292 cnf .nginxManager .CreateConfig (name , content )
293293
@@ -302,11 +302,11 @@ func (cnf *Configurator) addOrUpdateIngress(ingEx *IngressEx) (Warnings, error)
302302func (cnf * Configurator ) AddOrUpdateMergeableIngress (mergeableIngs * MergeableIngresses ) (Warnings , error ) {
303303 warnings , err := cnf .addOrUpdateMergeableIngress (mergeableIngs )
304304 if err != nil {
305- return warnings , fmt .Errorf ("Error when adding or updating ingress %v/%v: %w" , mergeableIngs .Master .Ingress .Namespace , mergeableIngs .Master .Ingress .Name , err )
305+ return warnings , fmt .Errorf ("error when adding or updating ingress %v/%v: %w" , mergeableIngs .Master .Ingress .Namespace , mergeableIngs .Master .Ingress .Name , err )
306306 }
307307
308308 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
309- return warnings , fmt .Errorf ("Error reloading NGINX for %v/%v: %w" , mergeableIngs .Master .Ingress .Namespace , mergeableIngs .Master .Ingress .Name , err )
309+ return warnings , fmt .Errorf ("error reloading NGINX for %v/%v: %w" , mergeableIngs .Master .Ingress .Namespace , mergeableIngs .Master .Ingress .Name , err )
310310 }
311311
312312 return warnings , nil
@@ -341,7 +341,7 @@ func (cnf *Configurator) addOrUpdateMergeableIngress(mergeableIngs *MergeableIng
341341 name := objectMetaToFileName (& mergeableIngs .Master .Ingress .ObjectMeta )
342342 content , err := cnf .templateExecutor .ExecuteIngressConfigTemplate (& nginxCfg )
343343 if err != nil {
344- return warnings , fmt .Errorf ("Error generating Ingress Config %v: %w" , name , err )
344+ return warnings , fmt .Errorf ("error generating Ingress Config %v: %w" , name , err )
345345 }
346346 cnf .nginxManager .CreateConfig (name , content )
347347
@@ -441,11 +441,11 @@ func (cnf *Configurator) deleteVirtualServerMetricsLabels(key string) {
441441func (cnf * Configurator ) AddOrUpdateVirtualServer (virtualServerEx * VirtualServerEx ) (Warnings , error ) {
442442 warnings , err := cnf .addOrUpdateVirtualServer (virtualServerEx )
443443 if err != nil {
444- return warnings , fmt .Errorf ("Error adding or updating VirtualServer %v/%v: %w" , virtualServerEx .VirtualServer .Namespace , virtualServerEx .VirtualServer .Name , err )
444+ return warnings , fmt .Errorf ("error adding or updating VirtualServer %v/%v: %w" , virtualServerEx .VirtualServer .Namespace , virtualServerEx .VirtualServer .Name , err )
445445 }
446446
447447 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
448- return warnings , fmt .Errorf ("Error reloading NGINX for VirtualServer %v/%v: %w" , virtualServerEx .VirtualServer .Namespace , virtualServerEx .VirtualServer .Name , err )
448+ return warnings , fmt .Errorf ("error reloading NGINX for VirtualServer %v/%v: %w" , virtualServerEx .VirtualServer .Namespace , virtualServerEx .VirtualServer .Name , err )
449449 }
450450
451451 return warnings , nil
@@ -473,7 +473,7 @@ func (cnf *Configurator) addOrUpdateVirtualServer(virtualServerEx *VirtualServer
473473 vsCfg , warnings := vsc .GenerateVirtualServerConfig (virtualServerEx , apResources , dosResources )
474474 content , err := cnf .templateExecutorV2 .ExecuteVirtualServerTemplate (& vsCfg )
475475 if err != nil {
476- return warnings , fmt .Errorf ("Error generating VirtualServer config: %v: %w" , name , err )
476+ return warnings , fmt .Errorf ("error generating VirtualServer config: %v: %w" , name , err )
477477 }
478478 cnf .nginxManager .CreateConfig (name , content )
479479
@@ -498,7 +498,7 @@ func (cnf *Configurator) AddOrUpdateVirtualServers(virtualServerExes []*VirtualS
498498 }
499499
500500 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
501- return allWarnings , fmt .Errorf ("Error when reloading NGINX when updating Policy: %w" , err )
501+ return allWarnings , fmt .Errorf ("error when reloading NGINX when updating Policy: %w" , err )
502502 }
503503
504504 return allWarnings , nil
@@ -630,7 +630,7 @@ func (cnf *Configurator) updateTLSPassthroughHostsConfig() error {
630630
631631 content , err := cnf .templateExecutorV2 .ExecuteTLSPassthroughHostsTemplate (cfg )
632632 if err != nil {
633- return fmt .Errorf ("Error generating config for TLS Passthrough Unix Sockets map: %w" , err )
633+ return fmt .Errorf ("error generating config for TLS Passthrough Unix Sockets map: %w" , err )
634634 }
635635
636636 cnf .nginxManager .CreateTLSPassthroughHostsConfig (content )
@@ -673,23 +673,23 @@ func (cnf *Configurator) AddOrUpdateResources(resources ExtendedResources) (Warn
673673 for _ , ingEx := range resources .IngressExes {
674674 warnings , err := cnf .addOrUpdateIngress (ingEx )
675675 if err != nil {
676- return nil , fmt .Errorf ("Error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
676+ return nil , fmt .Errorf ("error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
677677 }
678678 allWarnings .Add (warnings )
679679 }
680680
681681 for _ , m := range resources .MergeableIngresses {
682682 warnings , err := cnf .addOrUpdateMergeableIngress (m )
683683 if err != nil {
684- return nil , fmt .Errorf ("Error adding or updating mergeableIngress %v/%v: %w" , m .Master .Ingress .Namespace , m .Master .Ingress .Name , err )
684+ return nil , fmt .Errorf ("error adding or updating mergeableIngress %v/%v: %w" , m .Master .Ingress .Namespace , m .Master .Ingress .Name , err )
685685 }
686686 allWarnings .Add (warnings )
687687 }
688688
689689 for _ , vsEx := range resources .VirtualServerExes {
690690 warnings , err := cnf .addOrUpdateVirtualServer (vsEx )
691691 if err != nil {
692- return nil , fmt .Errorf ("Error adding or updating VirtualServer %v/%v: %w" , vsEx .VirtualServer .Namespace , vsEx .VirtualServer .Name , err )
692+ return nil , fmt .Errorf ("error adding or updating VirtualServer %v/%v: %w" , vsEx .VirtualServer .Namespace , vsEx .VirtualServer .Name , err )
693693 }
694694 allWarnings .Add (warnings )
695695 }
@@ -703,7 +703,7 @@ func (cnf *Configurator) AddOrUpdateResources(resources ExtendedResources) (Warn
703703 }
704704
705705 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
706- return nil , fmt .Errorf ("Error when reloading NGINX when updating resources: %w" , err )
706+ return nil , fmt .Errorf ("error when reloading NGINX when updating resources: %w" , err )
707707 }
708708 return allWarnings , nil
709709}
@@ -723,7 +723,7 @@ func (cnf *Configurator) AddOrUpdateSpecialTLSSecrets(secret *api_v1.Secret, sec
723723 }
724724
725725 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
726- return fmt .Errorf ("Error when reloading NGINX when updating the special Secrets: %w" , err )
726+ return fmt .Errorf ("error when reloading NGINX when updating the special Secrets: %w" , err )
727727 }
728728
729729 return nil
@@ -762,7 +762,7 @@ func (cnf *Configurator) DeleteIngress(key string) error {
762762 }
763763
764764 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
765- return fmt .Errorf ("Error when removing ingress %v: %w" , key , err )
765+ return fmt .Errorf ("error when removing ingress %v: %w" , key , err )
766766 }
767767
768768 return nil
@@ -779,7 +779,7 @@ func (cnf *Configurator) DeleteVirtualServer(key string) error {
779779 }
780780
781781 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
782- return fmt .Errorf ("Error when removing VirtualServer %v: %w" , key , err )
782+ return fmt .Errorf ("error when removing VirtualServer %v: %w" , key , err )
783783 }
784784
785785 return nil
@@ -793,12 +793,12 @@ func (cnf *Configurator) DeleteTransportServer(key string) error {
793793
794794 err := cnf .deleteTransportServer (key )
795795 if err != nil {
796- return fmt .Errorf ("Error when removing TransportServer %v: %w" , key , err )
796+ return fmt .Errorf ("error when removing TransportServer %v: %w" , key , err )
797797 }
798798
799799 err = cnf .reload (nginx .ReloadForOtherUpdate )
800800 if err != nil {
801- return fmt .Errorf ("Error when removing TransportServer %v: %w" , key , err )
801+ return fmt .Errorf ("error when removing TransportServer %v: %w" , key , err )
802802 }
803803
804804 return nil
@@ -826,7 +826,7 @@ func (cnf *Configurator) UpdateEndpoints(ingExes []*IngressEx) error {
826826 // It is safe to ignore warnings here as no new warnings should appear when updating Endpoints for Ingresses
827827 _ , err := cnf .addOrUpdateIngress (ingEx )
828828 if err != nil {
829- return fmt .Errorf ("Error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
829+ return fmt .Errorf ("error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
830830 }
831831
832832 if cnf .isPlus {
@@ -844,7 +844,7 @@ func (cnf *Configurator) UpdateEndpoints(ingExes []*IngressEx) error {
844844 }
845845
846846 if err := cnf .reload (nginx .ReloadForEndpointsUpdate ); err != nil {
847- return fmt .Errorf ("Error reloading NGINX when updating endpoints: %w" , err )
847+ return fmt .Errorf ("error reloading NGINX when updating endpoints: %w" , err )
848848 }
849849
850850 return nil
@@ -858,7 +858,7 @@ func (cnf *Configurator) UpdateEndpointsMergeableIngress(mergeableIngresses []*M
858858 // It is safe to ignore warnings here as no new warnings should appear when updating Endpoints for Ingresses
859859 _ , err := cnf .addOrUpdateMergeableIngress (mergeableIngresses [i ])
860860 if err != nil {
861- return fmt .Errorf ("Error adding or updating mergeableIngress %v/%v: %w" , mergeableIngresses [i ].Master .Ingress .Namespace , mergeableIngresses [i ].Master .Ingress .Name , err )
861+ return fmt .Errorf ("error adding or updating mergeableIngress %v/%v: %w" , mergeableIngresses [i ].Master .Ingress .Namespace , mergeableIngresses [i ].Master .Ingress .Name , err )
862862 }
863863
864864 if cnf .isPlus {
@@ -878,7 +878,7 @@ func (cnf *Configurator) UpdateEndpointsMergeableIngress(mergeableIngresses []*M
878878 }
879879
880880 if err := cnf .reload (nginx .ReloadForEndpointsUpdate ); err != nil {
881- return fmt .Errorf ("Error reloading NGINX when updating endpoints for %v: %w" , mergeableIngresses , err )
881+ return fmt .Errorf ("error reloading NGINX when updating endpoints for %v: %w" , mergeableIngresses , err )
882882 }
883883
884884 return nil
@@ -892,7 +892,7 @@ func (cnf *Configurator) UpdateEndpointsForVirtualServers(virtualServerExes []*V
892892 // It is safe to ignore warnings here as no new warnings should appear when updating Endpoints for VirtualServers
893893 _ , err := cnf .addOrUpdateVirtualServer (vs )
894894 if err != nil {
895- return fmt .Errorf ("Error adding or updating VirtualServer %v/%v: %w" , vs .VirtualServer .Namespace , vs .VirtualServer .Name , err )
895+ return fmt .Errorf ("error adding or updating VirtualServer %v/%v: %w" , vs .VirtualServer .Namespace , vs .VirtualServer .Name , err )
896896 }
897897
898898 if cnf .isPlus {
@@ -910,7 +910,7 @@ func (cnf *Configurator) UpdateEndpointsForVirtualServers(virtualServerExes []*V
910910 }
911911
912912 if err := cnf .reload (nginx .ReloadForEndpointsUpdate ); err != nil {
913- return fmt .Errorf ("Error reloading NGINX when updating endpoints: %w" , err )
913+ return fmt .Errorf ("error reloading NGINX when updating endpoints: %w" , err )
914914 }
915915
916916 return nil
@@ -925,7 +925,7 @@ func (cnf *Configurator) updatePlusEndpointsForVirtualServer(virtualServerEx *Vi
925925
926926 err := cnf .updateServersInPlus (upstream .Name , endpoints , serverCfg )
927927 if err != nil {
928- return fmt .Errorf ("Couldn 't update the endpoints for %v: %w" , upstream .Name , err )
928+ return fmt .Errorf ("couldn 't update the endpoints for %v: %w" , upstream .Name , err )
929929 }
930930 }
931931
@@ -973,7 +973,7 @@ func (cnf *Configurator) updatePlusEndpointsForTransportServer(transportServerEx
973973
974974 err := cnf .updateStreamServersInPlus (name , endpoints )
975975 if err != nil {
976- return fmt .Errorf ("Couldn 't update the endpoints for %v: %w" , u .Name , err )
976+ return fmt .Errorf ("couldn 't update the endpoints for %v: %w" , u .Name , err )
977977 }
978978 }
979979
@@ -999,7 +999,7 @@ func (cnf *Configurator) updatePlusEndpoints(ingEx *IngressEx) error {
999999 name := getNameForUpstream (ingEx .Ingress , emptyHost , ingEx .Ingress .Spec .DefaultBackend )
10001000 err := cnf .updateServersInPlus (name , endps , cfg )
10011001 if err != nil {
1002- return fmt .Errorf ("Couldn 't update the endpoints for %v: %w" , name , err )
1002+ return fmt .Errorf ("couldn 't update the endpoints for %v: %w" , name , err )
10031003 }
10041004 }
10051005 }
@@ -1021,7 +1021,7 @@ func (cnf *Configurator) updatePlusEndpoints(ingEx *IngressEx) error {
10211021 name := getNameForUpstream (ingEx .Ingress , rule .Host , & path .Backend )
10221022 err := cnf .updateServersInPlus (name , endps , cfg )
10231023 if err != nil {
1024- return fmt .Errorf ("Couldn 't update the endpoints for %v: %w" , name , err )
1024+ return fmt .Errorf ("couldn 't update the endpoints for %v: %w" , name , err )
10251025 }
10261026 }
10271027 }
@@ -1156,19 +1156,19 @@ func (cnf *Configurator) UpdateTransportServers(updatedTSExes []*TransportServer
11561156 for _ , tsEx := range updatedTSExes {
11571157 _ , err := cnf .addOrUpdateTransportServer (tsEx )
11581158 if err != nil {
1159- return fmt .Errorf ("Error adding or updating TransportServer %v/%v: %w" , tsEx .TransportServer .Namespace , tsEx .TransportServer .Name , err )
1159+ return fmt .Errorf ("error adding or updating TransportServer %v/%v: %w" , tsEx .TransportServer .Namespace , tsEx .TransportServer .Name , err )
11601160 }
11611161 }
11621162
11631163 for _ , key := range deletedKeys {
11641164 err := cnf .deleteTransportServer (key )
11651165 if err != nil {
1166- return fmt .Errorf ("Error when removing TransportServer %v: %w" , key , err )
1166+ return fmt .Errorf ("error when removing TransportServer %v: %w" , key , err )
11671167 }
11681168 }
11691169
11701170 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
1171- return fmt .Errorf ("Error when updating TransportServers: %w" , err )
1171+ return fmt .Errorf ("error when updating TransportServers: %w" , err )
11721172 }
11731173
11741174 return nil
@@ -1379,12 +1379,12 @@ type ResourceOperation func(resource *v1beta1.DosProtectedResource, ingExes []*I
13791379func (cnf * Configurator ) AddOrUpdateAppProtectResource (resource * unstructured.Unstructured , ingExes []* IngressEx , mergeableIngresses []* MergeableIngresses , vsExes []* VirtualServerEx ) (Warnings , error ) {
13801380 warnings , err := cnf .addOrUpdateIngressesAndVirtualServers (ingExes , mergeableIngresses , vsExes )
13811381 if err != nil {
1382- return warnings , fmt .Errorf ("Error when updating %v %v/%v: %w" , resource .GetKind (), resource .GetNamespace (), resource .GetName (), err )
1382+ return warnings , fmt .Errorf ("error when updating %v %v/%v: %w" , resource .GetKind (), resource .GetNamespace (), resource .GetName (), err )
13831383 }
13841384
13851385 err = cnf .reload (nginx .ReloadForOtherUpdate )
13861386 if err != nil {
1387- return warnings , fmt .Errorf ("Error when reloading NGINX when updating %v %v/%v: %w" , resource .GetKind (), resource .GetNamespace (), resource .GetName (), err )
1387+ return warnings , fmt .Errorf ("error when reloading NGINX when updating %v %v/%v: %w" , resource .GetKind (), resource .GetNamespace (), resource .GetName (), err )
13881388 }
13891389
13901390 return warnings , nil
@@ -1411,23 +1411,23 @@ func (cnf *Configurator) addOrUpdateIngressesAndVirtualServers(ingExes []*Ingres
14111411 for _ , ingEx := range ingExes {
14121412 warnings , err := cnf .addOrUpdateIngress (ingEx )
14131413 if err != nil {
1414- return allWarnings , fmt .Errorf ("Error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
1414+ return allWarnings , fmt .Errorf ("error adding or updating ingress %v/%v: %w" , ingEx .Ingress .Namespace , ingEx .Ingress .Name , err )
14151415 }
14161416 allWarnings .Add (warnings )
14171417 }
14181418
14191419 for _ , m := range mergeableIngresses {
14201420 warnings , err := cnf .addOrUpdateMergeableIngress (m )
14211421 if err != nil {
1422- return allWarnings , fmt .Errorf ("Error adding or updating mergeableIngress %v/%v: %w" , m .Master .Ingress .Namespace , m .Master .Ingress .Name , err )
1422+ return allWarnings , fmt .Errorf ("error adding or updating mergeableIngress %v/%v: %w" , m .Master .Ingress .Namespace , m .Master .Ingress .Name , err )
14231423 }
14241424 allWarnings .Add (warnings )
14251425 }
14261426
14271427 for _ , vs := range vsExes {
14281428 warnings , err := cnf .addOrUpdateVirtualServer (vs )
14291429 if err != nil {
1430- return allWarnings , fmt .Errorf ("Error adding or updating VirtualServer %v/%v: %w" , vs .VirtualServer .Namespace , vs .VirtualServer .Name , err )
1430+ return allWarnings , fmt .Errorf ("error adding or updating VirtualServer %v/%v: %w" , vs .VirtualServer .Namespace , vs .VirtualServer .Name , err )
14311431 }
14321432 allWarnings .Add (warnings )
14331433 }
@@ -1503,11 +1503,11 @@ func (cnf *Configurator) AddInternalRouteConfig() error {
15031503 mainCfg := GenerateNginxMainConfig (cnf .staticCfgParams , cnf .cfgParams )
15041504 mainCfgContent , err := cnf .templateExecutor .ExecuteMainConfigTemplate (mainCfg )
15051505 if err != nil {
1506- return fmt .Errorf ("Error when writing main Config: %w" , err )
1506+ return fmt .Errorf ("error when writing main Config: %w" , err )
15071507 }
15081508 cnf .nginxManager .CreateMainConfig (mainCfgContent )
15091509 if err := cnf .reload (nginx .ReloadForOtherUpdate ); err != nil {
1510- return fmt .Errorf ("Error when reloading nginx: %w" , err )
1510+ return fmt .Errorf ("error when reloading nginx: %w" , err )
15111511 }
15121512 return nil
15131513}
0 commit comments