Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework the way eventing-rabbitmq does Rabbit codegen #378

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Rework the way eventing-rabbitmq does Rabbit codegen #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ require (
knative.dev/hack v0.0.0-20210622141627-e28525d8d260
knative.dev/pkg v0.0.0-20210803160015-21eb4c167cc5
knative.dev/reconciler-test v0.0.0-20210803183715-b61cc77c06f6
sigs.k8s.io/controller-runtime v0.8.3
)

replace (
Expand Down
39 changes: 19 additions & 20 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ export GOFLAGS=-mod=

echo "=== Update Codegen for $MODULE_NAME"

# RabbitMQ uses Kubebuilder
# Kubebuilder project layout has API under 'api/v1beta1', ie. 'github.com/rabbitmq/messaging-topology-operator/api/v1beta1'
# client-go codegen expects group name (rabbitmq.com) in the path, ie. 'github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com/v1beta1'
# Because there's no way how to modify any of these settings, to enable client codegen,
# we need to reorganize things a little bit (copy to 'third_party/api/rabbitmq.com/v1beta1')
rm -rf ${REPO_ROOT_DIR}/third_party/pkg/apis/rabbitmq.com
mkdir -p ${REPO_ROOT_DIR}/third_party/pkg/apis/rabbitmq.com
cp -R "${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/v1beta1" ${REPO_ROOT_DIR}/third_party/pkg/apis/rabbitmq.com

group "Kubernetes Codegen"

# generate the code with:
Expand All @@ -42,6 +51,12 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
"duck:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Generate our own client (otherwise injection won't work)
${CODEGEN_PKG}/generate-groups.sh "client,informer,lister" \
knative.dev/eventing-rabbitmq/third_party/pkg/client knative.dev/eventing-rabbitmq/third_party/pkg/apis \
"rabbitmq.com:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

group "Knative Codegen"

# Knative Injection
Expand All @@ -52,26 +67,10 @@ ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \

group "RabbitMQ Codegen"

# RabbitMQ uses Kubebuilder
# Kubebuilder project layout has API under 'api/v1beta1', ie. 'github.com/rabbitmq/messaging-topology-operator/api/v1beta1'
# client-go codegen expects group name (rabbitmq.com) in the path, ie. 'github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com/v1beta1'
# Because there's no way how to modify any of these settings, to enable client codegen,
# we need to hack things a little bit (in vendor move temporarily api directory in 'api/rabbitmq.com/v1beta1')
rm -rf ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com
mkdir ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com
cp -R "${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/v1beta1/" ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com/v1beta1

OUTPUT_PKG="knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com" \
VERSIONED_CLIENTSET_PKG="github.com/rabbitmq/messaging-topology-operator/pkg/generated/clientset/versioned" \
EXTERNAL_INFORMER_PKG="github.com/rabbitmq/messaging-topology-operator/pkg/generated/informers/externalversions" \
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
github.com/rabbitmq/messaging-topology-operator/rabbitmq.com \
github.com/rabbitmq/messaging-topology-operator/api \
"rabbitmq.com:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \

mv ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com/v1beta1 ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/v1beta1
rm -rf ${REPO_ROOT_DIR}/vendor/github.com/rabbitmq/messaging-topology-operator/api/rabbitmq.com
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
knative.dev/eventing-rabbitmq/third_party/pkg/client knative.dev/eventing-rabbitmq/third_party/pkg/apis \
"rabbitmq.com:v1beta1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

group "Update deps post-codegen"

Expand Down
4 changes: 2 additions & 2 deletions hack/update-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ source $(dirname "$0")/../vendor/knative.dev/hack/library.sh

go_update_deps "$@"

rm -rf $(find third_party/ -name '*.mod')
rm -rf $(find third_party/ -name '*.go')
rm -rf $(find third_party/VENDOR-LICENSE/ -name '*.mod')
rm -rf $(find third_party/VENDOR-LICENSE/ -name '*.go')

# Remove the _webhook.go files that cause (unnecessarily) controller-runtime
# to get pulled in, which in turn causes issues with double-defining 'kubeconfig'
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/broker/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ import (
"knative.dev/pkg/logging"
"knative.dev/pkg/network"

"github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
rabbitclientset "github.com/rabbitmq/messaging-topology-operator/pkg/generated/clientset/versioned"
rabbitlisters "github.com/rabbitmq/messaging-topology-operator/pkg/generated/listers/rabbitmq.com/v1beta1"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
"knative.dev/eventing-rabbitmq/pkg/reconciler/broker/resources"
triggerresources "knative.dev/eventing-rabbitmq/pkg/reconciler/trigger/resources"
"knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
rabbitclientset "knative.dev/eventing-rabbitmq/third_party/pkg/client/clientset/versioned"
rabbitlisters "knative.dev/eventing-rabbitmq/third_party/pkg/client/listers/rabbitmq.com/v1beta1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
clientset "knative.dev/eventing/pkg/client/clientset/versioned"
brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/broker/broker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/scheme"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
clientgotesting "k8s.io/client-go/testing"
rabbitmqduck "knative.dev/eventing-rabbitmq/pkg/apis/duck/v1beta1"
rabbitduck "knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit"
fakerabbitclient "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
"knative.dev/eventing-rabbitmq/pkg/reconciler/broker/resources"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
fakerabbitclient "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/eventing/pkg/apis/eventing"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/broker/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"log"

"knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit"
rabbitmqclient "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client"
rabbitmqclient "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client"
eventingclient "knative.dev/eventing/pkg/client/injection/client"

"github.com/kelseyhightower/envconfig"
Expand All @@ -31,9 +31,9 @@ import (
"knative.dev/eventing/pkg/apis/eventing"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"

bindinginformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/binding"
exchangeinformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/exchange"
queueinformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/queue"
bindinginformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/binding"
exchangeinformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/exchange"
queueinformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/queue"
brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
"knative.dev/eventing/pkg/duck"
Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/broker/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (

// Fake injection informers
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/exchange/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/exchange/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
_ "knative.dev/pkg/client/injection/ducks/duck/v1/conditions/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/broker/resources/exchange.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/broker/resources/exchange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/eventing-rabbitmq/pkg/reconciler/broker/resources"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
duckv1 "knative.dev/pkg/apis/duck/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/testing/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"knative.dev/pkg/controller"
"knative.dev/pkg/reconciler"

fakerabbitclient "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
fakerabbitclient "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake"
fakedynamicclient "knative.dev/pkg/injection/clients/dynamicclient/fake"
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/testing/listers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ import (
"knative.dev/pkg/reconciler/testing"

rabbitclusterv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
fakerabbitclientset "github.com/rabbitmq/messaging-topology-operator/pkg/generated/clientset/versioned/fake"
rabbitlisters "github.com/rabbitmq/messaging-topology-operator/pkg/generated/listers/rabbitmq.com/v1beta1"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
fakerabbitclientset "knative.dev/eventing-rabbitmq/third_party/pkg/client/clientset/versioned/fake"
rabbitlisters "knative.dev/eventing-rabbitmq/third_party/pkg/client/listers/rabbitmq.com/v1beta1"
)

var subscriberAddToScheme = func(scheme *runtime.Scheme) error {
Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/trigger/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"log"

rabbitmqclient "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client"
rabbitmqclient "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client"
eventingclient "knative.dev/eventing/pkg/client/injection/client"
kubeclient "knative.dev/pkg/client/injection/kube/client"
"knative.dev/pkg/injection/clients/dynamicclient"
Expand All @@ -32,8 +32,8 @@ import (

v1 "knative.dev/eventing/pkg/apis/eventing/v1"

bindinginformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/binding"
exchangeinformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/exchange"
bindinginformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/binding"
exchangeinformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/exchange"
brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
triggerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger"
brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
Expand All @@ -43,7 +43,7 @@ import (
"knative.dev/pkg/client/injection/ducks/duck/v1/source"
deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"

queueinformer "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/queue"
queueinformer "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/queue"

"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/trigger/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (

// Fake injection informers
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/exchange/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/exchange/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake"
_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trigger/resources/binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"encoding/json"
"fmt"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
"knative.dev/pkg/kmeta"

"knative.dev/eventing/pkg/apis/eventing"
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trigger/resources/binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"encoding/json"
"testing"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"knative.dev/eventing-rabbitmq/pkg/reconciler/trigger/resources"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
"knative.dev/pkg/apis"
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trigger/resources/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package resources
import (
"context"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
"knative.dev/eventing/pkg/apis/eventing"
"knative.dev/pkg/kmeta"

Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trigger/resources/queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"encoding/json"
"testing"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
"knative.dev/eventing-rabbitmq/pkg/reconciler/trigger/resources"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/trigger/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"fmt"

"github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
"go.uber.org/zap"
v1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand All @@ -30,14 +29,15 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
appsv1listers "k8s.io/client-go/listers/apps/v1"
"knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/logging"

rabbitclientset "github.com/rabbitmq/messaging-topology-operator/pkg/generated/clientset/versioned"
rabbitlisters "github.com/rabbitmq/messaging-topology-operator/pkg/generated/listers/rabbitmq.com/v1beta1"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
"knative.dev/eventing-rabbitmq/pkg/reconciler/trigger/resources"
rabbitclientset "knative.dev/eventing-rabbitmq/third_party/pkg/client/clientset/versioned"
rabbitlisters "knative.dev/eventing-rabbitmq/third_party/pkg/client/listers/rabbitmq.com/v1beta1"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/eventing/pkg/apis/eventing"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/trigger/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/scheme"

rabbitv1beta1 "github.com/rabbitmq/messaging-topology-operator/api/v1beta1"
clientgotesting "k8s.io/client-go/testing"
rabbitduck "knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit"
fakerabbitclient "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
naming "knative.dev/eventing-rabbitmq/pkg/rabbitmqnaming"
"knative.dev/eventing-rabbitmq/pkg/reconciler/broker"
"knative.dev/eventing-rabbitmq/pkg/reconciler/trigger/resources"
rabbitv1beta1 "knative.dev/eventing-rabbitmq/third_party/pkg/apis/rabbitmq.com/v1beta1"
fakerabbitclient "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
"knative.dev/eventing/pkg/apis/eventing"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2"
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/triggerstandalone/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

// Fake injection informers
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/ducks/duck/v1beta1/rabbit/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/client/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/pkg/client/injection/rabbitmq.com/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/client/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/binding/fake"
_ "knative.dev/eventing-rabbitmq/third_party/pkg/client/injection/informers/rabbitmq.com/v1beta1/queue/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake"
_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
Expand Down
Loading