more ci fixes

Author: alexbacchin

go.mod

@@ -4,7 +4,7 @@ go 1.23.8
 
 // Disable experimental post-quantum key exchange mechanism X25519Kyber768Draft00
 // This was causing errors with AWS Network Firewall
-godebug tlskyber=0
+//godebug tlskyber=0
 
 require (
 	github.com/ProtonMail/go-crypto v1.2.0

internal/service/ec2/vpc_route_server_association.go

@@ -280,16 +280,15 @@ func findVPCRouteServerAssociationByTwoPartKey(ctx context.Context, conn *ec2.Cl
 	}
 
 	out, err := conn.GetRouteServerAssociations(ctx, &input)
-		if tfresource.NotFound(err) {
-			return nil, &retry.NotFoundError{
-				LastError:   err,
-				LastRequest: &input,
-			}
-		}
-		if err != nil {
-			return nil, err
+	if tfresource.NotFound(err) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: &input,
 		}
 	}
+	if err != nil {
+		return nil, err
+	}
 	if out == nil || out.RouteServerAssociations == nil {
 		return nil, tfresource.NewEmptyResultError(&input)
 	}

internal/service/ec2/vpc_route_server_propagation.go

@@ -282,17 +282,15 @@ func findVPCRouteServerPropagationByTwoPartKey(ctx context.Context, conn *ec2.Cl
 	}
 
 	out, err := conn.GetRouteServerPropagations(ctx, &input)
-	if err != nil {
-		if tfresource.NotFound(err) {
-			return nil, &retry.NotFoundError{
-				LastError:   err,
-				LastRequest: &input,
-			}
-		}
-		if err != nil {
-			return nil, err
+	if tfresource.NotFound(err) {
+		return nil, &retry.NotFoundError{
+			LastError:   err,
+			LastRequest: &input,
 		}
 	}
+	if err != nil {
+		return nil, err
+	}
 	if out == nil || out.RouteServerPropagations == nil || len(out.RouteServerPropagations) == 0 {
 		return nil, tfresource.NewEmptyResultError(&input)
 	} else {