linter fix

envoyproxy · Oct 10, 2023 · 4874209 · 4874209
1 parent 1b79369
commit 4874209
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 35 deletions.
diff --git a/internal/gatewayapi/testdata/merge-multiple-gateways.in.yaml b/internal/gatewayapi/testdata/merge-multiple-gateways.in.yaml
@@ -15,12 +15,12 @@ gateways:
     spec:
       gatewayClassName: envoy-gateway-class
       listeners:
-      - name: http
-        port: 80
-        protocol: HTTP
-        allowedRoutes:
-          namespaces:
-            from: Same
+        - name: http
+          port: 80
+          protocol: HTTP
+          allowedRoutes:
+            namespaces:
+              from: Same
   - apiVersion: gateway.networking.k8s.io/v1beta1
     kind: Gateway
     metadata:
@@ -29,9 +29,9 @@ gateways:
     spec:
       gatewayClassName: envoy-gateway-class
       listeners:
-      - name: http-2
-        port: 8888
-        protocol: HTTP
-        allowedRoutes:
-          namespaces:
-            from: Same
+        - name: http-2
+          port: 8888
+          protocol: HTTP
+          allowedRoutes:
+            namespaces:
+              from: Same
diff --git a/internal/gatewayapi/testdata/merge-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-multiple-gateways.out.yaml
@@ -48,7 +48,7 @@ gateways:
       protocol: HTTP
       allowedRoutes:
         namespaces:
-          from: Same      
+          from: Same
   status:
     listeners:
     - attachedRoutes: 0
@@ -63,7 +63,7 @@ gateways:
         message: Listener has been successfully translated
         reason: Accepted
         status: "True"
-        type: Accepted    
+        type: Accepted
       supportedKinds:
       - group: gateway.networking.k8s.io
         kind: HTTPRoute
@@ -80,7 +80,7 @@ infraIR:
           name: test
           namespace: envoy-gateway-system
         spec:
-          mergeGateways: true   
+          mergeGateways: true
       listeners:
       - address: ""
         ports:
@@ -107,11 +107,10 @@ xdsIR:
       - '*'
       isHTTP2: false
       name: envoy-gateway/gateway-1/http
-      port: 10080    
+      port: 10080
     - address: 0.0.0.0
       hostnames:
       - '*'
       isHTTP2: false
       name: envoy-gateway/gateway-2/http-2
       port: 8888
-
diff --git a/internal/gatewayapi/testdata/multiple-gateways.in.yaml b/internal/gatewayapi/testdata/multiple-gateways.in.yaml
@@ -7,12 +7,12 @@ gateways:
     spec:
       gatewayClassName: envoy-gateway-class
       listeners:
-      - name: http
-        port: 80
-        protocol: HTTP
-        allowedRoutes:
-          namespaces:
-            from: Same
+        - name: http
+          port: 80
+          protocol: HTTP
+          allowedRoutes:
+            namespaces:
+              from: Same
   - apiVersion: gateway.networking.k8s.io/v1beta1
     kind: Gateway
     metadata:
@@ -21,9 +21,9 @@ gateways:
     spec:
       gatewayClassName: envoy-gateway-class
       listeners:
-      - name: http-2
-        port: 8888
-        protocol: HTTP
-        allowedRoutes:
-          namespaces:
-            from: Same
+        - name: http-2
+          port: 8888
+          protocol: HTTP
+          allowedRoutes:
+            namespaces:
+              from: Same
diff --git a/internal/gatewayapi/testdata/multiple-gateways.out.yaml b/internal/gatewayapi/testdata/multiple-gateways.out.yaml
@@ -48,7 +48,7 @@ gateways:
       protocol: HTTP
       allowedRoutes:
         namespaces:
-          from: Same      
+          from: Same
   status:
     listeners:
     - attachedRoutes: 0
@@ -63,12 +63,12 @@ gateways:
         message: Listener has been successfully translated
         reason: Accepted
         status: "True"
-        type: Accepted    
+        type: Accepted
       supportedKinds:
       - group: gateway.networking.k8s.io
         kind: HTTPRoute
       - group: gateway.networking.k8s.io
-        kind: GRPCRoute         
+        kind: GRPCRoute
 infraIR:
   envoy-gateway/gateway-1:
     proxy:
@@ -97,7 +97,7 @@ infraIR:
         labels:
           gateway.envoyproxy.io/owning-gateway-name: gateway-2
           gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
-      name: envoy-gateway/gateway-2     
+      name: envoy-gateway/gateway-2
 xdsIR:
   envoy-gateway/gateway-1:
     accessLog:
@@ -120,4 +120,4 @@ xdsIR:
       - '*'
       isHTTP2: false
       name: envoy-gateway/gateway-2/http-2
-      port: 8888
+      port: 8888
diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
@@ -6,11 +6,11 @@
 package gatewayapi
 
 import (
-	"github.com/envoyproxy/gateway/internal/ir"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/gateway-api/apis/v1beta1"
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
+	"github.com/envoyproxy/gateway/internal/ir"
 )
 
 const (