fix: r

Signed-off-by: Ashing Zheng <axingfly@gmail.com>

Author: ronething

internal/webhook/v1/ssl/conflict_detector.go

@@ -203,7 +203,7 @@ func (d *ConflictDetector) BuildGatewayMappings(ctx context.Context, gateway *ga
 				mappings = append(mappings, HostCertMapping{
 					Host:            host,
 					CertificateHash: info.hash,
-					ResourceRef:     fmt.Sprintf("Gateway/%s/%s", gateway.Namespace, gateway.Name),
+					ResourceRef:     fmt.Sprintf("%s/%s/%s", internaltypes.KindGateway, gateway.Namespace, gateway.Name),
 				})
 			}
 		}
@@ -238,7 +238,7 @@ func (d *ConflictDetector) BuildIngressMappings(ctx context.Context, ingress *ne
 			mappings = append(mappings, HostCertMapping{
 				Host:            host,
 				CertificateHash: info.hash,
-				ResourceRef:     fmt.Sprintf("Ingress/%s/%s", ingress.Namespace, ingress.Name),
+				ResourceRef:     fmt.Sprintf("%s/%s/%s", internaltypes.KindIngress, ingress.Namespace, ingress.Name),
 			})
 		}
 	}
@@ -276,7 +276,7 @@ func (d *ConflictDetector) BuildApisixTlsMappings(ctx context.Context, tls *apiv
 		mappings = append(mappings, HostCertMapping{
 			Host:            host,
 			CertificateHash: info.hash,
-			ResourceRef:     fmt.Sprintf("ApisixTls/%s/%s", tls.Namespace, tls.Name),
+			ResourceRef:     fmt.Sprintf("%s/%s/%s", internaltypes.KindApisixTls, tls.Namespace, tls.Name),
 		})
 	}
 

internal/webhook/v1/ssl/conflict_detector_test.go

@@ -101,13 +101,10 @@ func TestConflictDetectorDetectsGatewayConflict(t *testing.T) {
 		Spec: networkingv1.IngressClassSpec{
 			Controller: config.ControllerConfig.ControllerName,
 			Parameters: &networkingv1.IngressClassParametersReference{
-				APIGroup: ptr.To(v1alpha1.GroupVersion.Group),
-				Kind:     internaltypes.KindGatewayProxy,
-				Name:     gatewayProxy.Name,
-				Namespace: func() *string {
-					ns := testNamespace
-					return &ns
-				}(),
+				APIGroup:  ptr.To(v1alpha1.GroupVersion.Group),
+				Kind:      internaltypes.KindGatewayProxy,
+				Name:      gatewayProxy.Name,
+				Namespace: ptr.To(testNamespace),
 			},
 		},
 	}
@@ -206,13 +203,10 @@ func TestConflictDetectorAllowedWhenCertificateMatches(t *testing.T) {
 		Spec: networkingv1.IngressClassSpec{
 			Controller: config.ControllerConfig.ControllerName,
 			Parameters: &networkingv1.IngressClassParametersReference{
-				APIGroup: ptr.To(v1alpha1.GroupVersion.Group),
-				Kind:     internaltypes.KindGatewayProxy,
-				Name:     gatewayProxy.Name,
-				Namespace: func() *string {
-					ns := testNamespace
-					return &ns
-				}(),
+				APIGroup:  ptr.To(v1alpha1.GroupVersion.Group),
+				Kind:      internaltypes.KindGatewayProxy,
+				Name:      gatewayProxy.Name,
+				Namespace: ptr.To(testNamespace),
 			},
 		},
 	}