Skip to content

Commit

Permalink
fix lint issues
Browse files Browse the repository at this point in the history 
Signed-off-by: Eguzki Astiz Lezaun <eastizle@redhat.com>
  • Loading branch information
@eguzki
eguzki committed Sep 16, 2024
1 parent 6b0feae commit 442001f
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 49 deletions.
20 changes: 10 additions & 10 deletions controllers/authpolicy_envoysecuritypolicy_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ import (

egv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
"github.com/go-logr/logr"
kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
kuadrantenvoygateway "github.com/kuadrant/kuadrant-operator/pkg/envoygateway"
"github.com/kuadrant/kuadrant-operator/pkg/kuadranttools"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
"github.com/samber/lo"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand All @@ -25,6 +16,16 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
kuadrantenvoygateway "github.com/kuadrant/kuadrant-operator/pkg/envoygateway"
"github.com/kuadrant/kuadrant-operator/pkg/kuadranttools"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
)

// AuthPolicyEnvoySecurityPolicyReconciler reconciles SecurityPolicy objects for auth
Expand Down Expand Up @@ -90,7 +91,6 @@ func (r *AuthPolicyEnvoySecurityPolicyReconciler) reconcileSecurityPolicy(ctx co
}

func envoySecurityPolicy(policy kuadrantgatewayapi.PolicyNode, kuadrantNamespace string) *egv1alpha1.SecurityPolicy {

esp := &egv1alpha1.SecurityPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: EnvoySecurityPolicyName(policy.GetName()),
Expand Down
19 changes: 10 additions & 9 deletions controllers/authpolicy_istio_authorizationpolicy_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ import (

"github.com/go-logr/logr"
"github.com/google/uuid"
kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
"github.com/kuadrant/kuadrant-operator/pkg/common"
kuadrantistioutils "github.com/kuadrant/kuadrant-operator/pkg/istio"
"github.com/kuadrant/kuadrant-operator/pkg/kuadranttools"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
"github.com/samber/lo"
istiosecurity "istio.io/api/security/v1beta1"
istiov1beta1 "istio.io/client-go/pkg/apis/security/v1beta1"
Expand All @@ -28,6 +19,16 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
"github.com/kuadrant/kuadrant-operator/pkg/common"
kuadrantistioutils "github.com/kuadrant/kuadrant-operator/pkg/istio"
"github.com/kuadrant/kuadrant-operator/pkg/kuadranttools"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
)

var KuadrantExtAuthProviderName = env.GetString("AUTH_PROVIDER", "kuadrant-authorization")
Expand Down
8 changes: 4 additions & 4 deletions controllers/envoygateway_limitador_cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/common"
kuadrantenvoygateway "github.com/kuadrant/kuadrant-operator/pkg/envoygateway"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
)

// EnvoyGatewayLimitadorClusterReconciler reconciles an EnvoyGateway EnvoyPatchPolicy object
Expand Down Expand Up @@ -99,7 +100,7 @@ func (r *EnvoyGatewayLimitadorClusterReconciler) Reconcile(eventCtx context.Cont
return ctrl.Result{Requeue: true}, nil
}

limitadorClusterPatchPolicy, err := r.desiredLimitadorClusterPatchPolicy(ctx, extPolicy, limitador)
limitadorClusterPatchPolicy, err := r.desiredLimitadorClusterPatchPolicy(extPolicy, limitador)
if err != nil {
return ctrl.Result{}, err

Check warning on line 105 in controllers/envoygateway_limitador_cluster_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/envoygateway_limitador_cluster_controller.go#L105 

Added line #L105 was not covered by tests
}
Expand All @@ -114,9 +115,8 @@ func (r *EnvoyGatewayLimitadorClusterReconciler) Reconcile(eventCtx context.Cont
}

func (r *EnvoyGatewayLimitadorClusterReconciler) desiredLimitadorClusterPatchPolicy(
ctx context.Context, extPolicy *egv1alpha1.EnvoyExtensionPolicy,
extPolicy *egv1alpha1.EnvoyExtensionPolicy,
limitador *limitadorv1alpha1.Limitador) (*egv1alpha1.EnvoyPatchPolicy, error) {

patchPolicy := &egv1alpha1.EnvoyPatchPolicy{
TypeMeta: metav1.TypeMeta{
Kind: egv1alpha1.KindEnvoyPatchPolicy,
Expand Down
3 changes: 1 addition & 2 deletions controllers/envoygateway_wasm_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func (r *EnvoyGatewayWasmReconciler) desiredEnvoyExtensionPolicy(
ctx context.Context, gw kuadrantgatewayapi.GatewayNode,
kObj *kuadrantv1beta1.Kuadrant,
topology *kuadrantgatewayapi.Topology) (*egv1alpha1.EnvoyExtensionPolicy, error) {

baseLogger, err := logr.FromContext(ctx)
if err != nil {
return nil, err

Check warning on line 88 in controllers/envoygateway_wasm_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/envoygateway_wasm_controller.go#L88 

Added line #L88 was not covered by tests
Expand Down Expand Up @@ -131,7 +130,7 @@ func (r *EnvoyGatewayWasmReconciler) desiredEnvoyExtensionPolicy(

logger := baseLogger.WithValues("envoyextensionpolicy", client.ObjectKeyFromObject(envoyPolicy))

config, err := wasm.WasmConfigForGateway(ctx, gw.GetGateway(), topology)
config, err := wasm.ConfigForGateway(ctx, gw.GetGateway(), topology)
if err != nil {
return nil, err

Check warning on line 135 in controllers/envoygateway_wasm_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/envoygateway_wasm_controller.go#L135 

Added line #L135 was not covered by tests
}
Expand Down
15 changes: 8 additions & 7 deletions controllers/envoysecuritypolicy_referencegrant_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ import (

egv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
"github.com/go-logr/logr"
kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantenvoygateway "github.com/kuadrant/kuadrant-operator/pkg/envoygateway"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
"github.com/samber/lo"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -23,6 +16,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
gatewayapiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantenvoygateway "github.com/kuadrant/kuadrant-operator/pkg/envoygateway"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"github.com/kuadrant/kuadrant-operator/pkg/library/mappers"
"github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers"
"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/rate_limiting_istio_wasmplugin_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (r *RateLimitingIstioWASMPluginReconciler) wasmPluginConfig(ctx context.Con
return nil, err
}

config, err := wasm.WasmConfigForGateway(ctx, gw, topology)
config, err := wasm.ConfigForGateway(ctx, gw, topology)
if err != nil {
return nil, err
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/envoygateway/mutators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
egv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/kuadrant/kuadrant-operator/pkg/rlptools/wasm"
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayapiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

"github.com/kuadrant/kuadrant-operator/pkg/rlptools/wasm"
)

func EnvoyExtensionPolicyMutator(existingObj, desiredObj client.Object) (bool, error) {
Expand Down Expand Up @@ -90,9 +91,9 @@ func EnvoySecurityPolicyMutator(existingObj, desiredObj client.Object) (bool, er
existing.Spec.ExtAuth = desired.Spec.ExtAuth

Check warning on line 91 in pkg/envoygateway/mutators.go

View check run for this annotation

Codecov / codecov/patch

pkg/envoygateway/mutators.go#L90-L91 

Added lines #L90 - L91 were not covered by tests
}

if !reflect.DeepEqual(existing.Spec.TargetRef, desired.Spec.TargetRef) {
if !reflect.DeepEqual(existing.Spec.PolicyTargetReferences.TargetRefs, desired.Spec.PolicyTargetReferences.TargetRefs) {
update = true
existing.Spec.TargetRef = desired.Spec.TargetRef
existing.Spec.PolicyTargetReferences.TargetRefs = desired.Spec.PolicyTargetReferences.TargetRefs

Check warning on line 96 in pkg/envoygateway/mutators.go

View check run for this annotation

Codecov / codecov/patch

pkg/envoygateway/mutators.go#L95-L96 

Added lines #L95 - L96 were not covered by tests
}

if !reflect.DeepEqual(existing.Annotations, desired.Annotations) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/istio/mesh_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package istio
import (
"fmt"

"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"
istiomeshv1alpha1 "istio.io/api/mesh/v1alpha1"
Expand All @@ -16,6 +15,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

maistrav2 "github.com/kuadrant/kuadrant-operator/api/external/maistra/v2"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions pkg/library/mappers/envoysecuritypolicy_to_kuadrant.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"fmt"

egv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

type SecurityPolicyToKuadrantEventMapper struct {
Expand Down
5 changes: 3 additions & 2 deletions pkg/library/mappers/gateway_to_kuadrant.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"context"
"fmt"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

type GatewayToKuadrantEventMapper struct {
Expand Down
7 changes: 4 additions & 3 deletions pkg/library/mappers/httproute_to_kuadrant.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"
"fmt"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

type HTTPRouteToKuadrantEventMapper struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/library/mappers/kuadrant_list_mapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package mappers
import (
"context"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
)

type KuadrantListEventMapper struct {
Expand Down
5 changes: 3 additions & 2 deletions pkg/library/mappers/policy_to_kuadrant.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"context"
"fmt"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
)

type PolicyToKuadrantEventMapper struct {
Expand Down
3 changes: 1 addition & 2 deletions pkg/rlptools/wasm/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,9 @@ func wasmRateLimitPolicy(ctx context.Context, t *kuadrantgatewayapi.TopologyInde
}, nil
}

func WasmConfigForGateway(
func ConfigForGateway(
ctx context.Context, gw *gatewayapiv1.Gateway,
topology *kuadrantgatewayapi.Topology) (*Config, error) {

logger, err := logr.FromContext(ctx)
if err != nil {
return nil, err

Check warning on line 393 in pkg/rlptools/wasm/utils.go

View check run for this annotation

Codecov / codecov/patch

pkg/rlptools/wasm/utils.go#L393 

Added line #L393 was not covered by tests
Expand Down

0 comments on commit 442001f

Please sign in to comment.