mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 01:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix go conventions and ehance error messages

Browse Source
This commit is contained in:
David Pait 2023-08-09 08:41:50 -04:00
parent bd989eeac4
commit 1a5249af5e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/istio_gateway.go
View File

@ -243,7 +243,7 @@ func parseIngress(ingress string) (namespace, name string, err error) {
} else if len(parts) == 1 {
name = parts[0]
} else {
err = fmt.Errorf("invalid ingress name (name or namespace/name) found '%v'", ingress)
err = fmt.Errorf("invalid ingress name (name or namespace/name) found %q", ingress)
}
return
@ -252,8 +252,7 @@ func parseIngress(ingress string) (namespace, name string, err error) {
func (sc *gatewaySource) targetsFromIngress(ctx context.Context, ingressStr string, gateway *networkingv1alpha3.Gateway) (targets endpoint.Targets, err error) {
namespace, name, err := parseIngress(ingressStr)
if err != nil {
log.Debugf("Failed parsing ingressStr %s of Gateway %s/%s", ingressStr, gateway.Namespace, gateway.Name)
return nil, err
return nil, fmt.Errorf("failed to parse Ingress annotation on Gateway (%s/%s): %w", gateway.Namespace, gateway.Name, err)
}
if namespace == "" {
namespace = gateway.Namespace
@ -280,8 +279,8 @@ func (sc *gatewaySource) targetsFromGateway(ctx context.Context, gateway *networ
return
}
ingressStr, found := gateway.Annotations[IstioGatewayIngressSource]
if found && ingressStr != "" {
ingressStr, ok := gateway.Annotations[IstioGatewayIngressSource]
if ok && ingressStr != "" {
targets, err = sc.targetsFromIngress(ctx, ingressStr, gateway)
return
}

7
source/istio_virtualservice.go
View File

@ -434,8 +434,7 @@ func parseGateway(gateway string) (namespace, name string, err error) {
func (sc *virtualServiceSource) targetsFromIngress(ctx context.Context, ingressStr string, gateway *networkingv1alpha3.Gateway) (targets endpoint.Targets, err error) {
namespace, name, err := parseIngress(ingressStr)
if err != nil {
log.Debugf("Failed parsing ingressStr %s of Gateway %s/%s", ingressStr, gateway.Namespace, gateway.Name)
return nil, err
return nil, fmt.Errorf("failed to parse Ingress annotation on Gateway (%s/%s): %w", gateway.Namespace, gateway.Name, err)
}
if namespace == "" {
namespace = gateway.Namespace
@ -462,8 +461,8 @@ func (sc *virtualServiceSource) targetsFromGateway(ctx context.Context, gateway
return
}
ingressStr, found := gateway.Annotations[IstioGatewayIngressSource]
if found && ingressStr != "" {
ingressStr, ok := gateway.Annotations[IstioGatewayIngressSource]
if ok && ingressStr != "" {
targets, err = sc.targetsFromIngress(ctx, ingressStr, gateway)
return
}