Fix route_controller_test

Author: u-kai

.github/workflows/deploy-dev.yml

@@ -0,0 +1,41 @@
+name: Build and Deploy Apps
+
+on:
+  workflow_dispatch:
+  push:
+jobs:
+  build:
+    name: Build and Push to ECR with Docker Buildx Cache
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    strategy:
+      matrix:
+        service: [aws-gateway-controller]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Configure AWS credentials from OIDC
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: ap-northeast-1
+          role-to-assume: ${{ vars.AWS_ROLE_ARN }}
+          role-session-name: GitHubActions
+
+      - name: Login to Amazon ECR
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build and push Docker image with Buildx
+        run: |
+          docker buildx build \
+            -t "${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-1.amazonaws.com/${{ matrix.service }}:${{github.sha}}" \
+            -t "${{ vars.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-1.amazonaws.com/${{ matrix.service }}:latest" \
+            --push \
+            .

pkg/controllers/route_controller.go

@@ -85,32 +85,16 @@ func RegisterAllRouteControllers(
 	mgr ctrl.Manager,
 ) error {
 	mgrClient := mgr.GetClient()
-
 	gwEventHandler := eventhandlers.NewEnqueueRequestGatewayEvent(log, mgrClient)
 	svcEventHandler := eventhandlers.NewServiceEventHandler(log, mgrClient)
 
 	routeInfos := []struct {
 		routeType      core.RouteType
 		gatewayApiType client.Object
 	}{
-		{core.HttpRouteType, &gwv1.HTTPRoute{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: gwv1.GroupVersion.String(),
-				Kind:       "HTTPRoute",
-			},
-		}},
-		{core.GrpcRouteType, &gwv1.GRPCRoute{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: gwv1.GroupVersion.String(),
-				Kind:       "GRPCRoute",
-			},
-		}},
-		{core.TlsRouteType, &gwv1alpha2.TLSRoute{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: gwv1.GroupVersion.String(),
-				Kind:       "TLSRoute",
-			},
-		}},
+		{core.HttpRouteType, &gwv1.HTTPRoute{}},
+		{core.GrpcRouteType, &gwv1.GRPCRoute{}},
+		{core.TlsRouteType, &gwv1alpha2.TLSRoute{}},
 	}
 
 	for _, routeInfo := range routeInfos {
@@ -185,6 +169,7 @@ func (r *routeReconciler) reconcile(ctx context.Context, req ctrl.Request) error
 	if err != nil {
 		return client.IgnoreNotFound(err)
 	}
+
 	if err = r.client.Get(ctx, req.NamespacedName, route.K8sObject()); err != nil {
 		return client.IgnoreNotFound(err)
 	}

pkg/controllers/route_controller_test.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"context"
+	"testing"
+
 	mock_client "github.com/aws/aws-application-networking-k8s/mocks/controller-runtime/client"
 	anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
 	aws2 "github.com/aws/aws-application-networking-k8s/pkg/aws"
@@ -27,7 +29,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/external-dns/endpoint"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
-	"testing"
 )
 
 func TestRouteReconciler_ReconcileCreates(t *testing.T) {
@@ -52,8 +53,7 @@ func TestRouteReconciler_ReconcileCreates(t *testing.T) {
 
 	gwClass := &gwv1.GatewayClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "amazon-vpc-lattice",
-			Namespace: defaultNamespace,
+			Name: "amazon-vpc-lattice",
 		},
 		Spec: gwv1.GatewayClassSpec{
 			ControllerName: config.LatticeGatewayControllerName,

pkg/gateway/model_build_lattice_service.go

@@ -131,20 +131,18 @@ func (t *latticeServiceModelBuildTask) buildLatticeService(ctx context.Context)
 		}
 		err := t.client.Get(ctx, client.ObjectKey{Name: string(parentRef.Name), Namespace: parentNamespace}, gw)
 		if err != nil {
-			//TODO: error message
-			t.log.Infof(ctx, "Ignore %s route because failed to get gateway %s: %v", t.route.Name(), parentRef.Name, err)
+			t.log.Infof(ctx, "Ignoring route %s because failed to get gateway %s: %v", t.route.Name(), gw.Spec.GatewayClassName, err)
 			continue
 		}
 		gwClass := &gwv1.GatewayClass{}
 		// GatewayClass is cluster-scoped resource, so we don't need to specify namespace
 		err = t.client.Get(ctx, client.ObjectKey{Name: string(gw.Spec.GatewayClassName)}, gwClass)
 		if err != nil {
-			//TODO: error message
-			t.log.Infof(ctx, "Ignore %s route because failed to get gateway class %s: %v", t.route.Name(), gw.Spec.GatewayClassName, err)
+			t.log.Infof(ctx, "Ignoring route %s because failed to get gateway class %s: %v", t.route.Name(), gw.Spec.GatewayClassName, err)
 			continue
 		}
 		if gwClass.Spec.ControllerName != config.LatticeGatewayControllerName {
-			t.log.Infof(ctx, "Ignore %s route because gateway class %s is not for lattice gateway", t.route.Name(), gw.Spec.GatewayClassName)
+			t.log.Infof(ctx, "Ignoring route %s because gateway class %s is not for a VPCLattice", t.route.Name(), gw.Spec.GatewayClassName)
 			continue
 		}
 		spec.ServiceNetworkNames = append(spec.ServiceNetworkNames, string(parentRef.Name))