diff --git a/sink/cmd/controller/main.go b/cmd/sink/controller/main.go similarity index 92% rename from sink/cmd/controller/main.go rename to cmd/sink/controller/main.go index 1e4d193d..a4958caa 100644 --- a/sink/cmd/controller/main.go +++ b/cmd/sink/controller/main.go @@ -19,7 +19,7 @@ package main import ( "knative.dev/pkg/injection/sharedmain" - "knative.dev/eventing-redis/sink/pkg/reconciler/streamsink" + "knative.dev/eventing-redis/pkg/sink/reconciler/streamsink" ) func main() { diff --git a/sink/cmd/receiver/main.go b/cmd/sink/receiver/main.go similarity index 95% rename from sink/cmd/receiver/main.go rename to cmd/sink/receiver/main.go index e27b49ad..3970019a 100644 --- a/sink/cmd/receiver/main.go +++ b/cmd/sink/receiver/main.go @@ -19,10 +19,11 @@ package main import ( "log" - "knative.dev/eventing-redis/sink/pkg/receiver" adapter "knative.dev/eventing/pkg/adapter/v2" "knative.dev/pkg/signals" + "knative.dev/eventing-redis/pkg/sink/receiver" + cloudevents "github.com/cloudevents/sdk-go/v2" ) diff --git a/source/cmd/controller/main.go b/cmd/source/controller/main.go similarity index 91% rename from source/cmd/controller/main.go rename to cmd/source/controller/main.go index 40409e79..f0a8f223 100644 --- a/source/cmd/controller/main.go +++ b/cmd/source/controller/main.go @@ -19,7 +19,7 @@ package main import ( "knative.dev/pkg/injection/sharedmain" - "knative.dev/eventing-redis/source/pkg/reconciler/streamsource" + "knative.dev/eventing-redis/pkg/source/reconciler/streamsource" ) func main() { diff --git a/source/cmd/receive_adapter/main.go b/cmd/source/receive_adapter/main.go similarity index 92% rename from source/cmd/receive_adapter/main.go rename to cmd/source/receive_adapter/main.go index 3fd6b4b5..75d014dc 100644 --- a/source/cmd/receive_adapter/main.go +++ b/cmd/source/receive_adapter/main.go @@ -19,7 +19,7 @@ package main import ( "knative.dev/eventing/pkg/adapter/v2" - kadapter "knative.dev/eventing-redis/source/pkg/adapter" + kadapter "knative.dev/eventing-redis/pkg/source/adapter" ) func main() { diff --git a/sink/config/100-namespace.yaml b/config/sink/100-namespace.yaml similarity index 100% rename from sink/config/100-namespace.yaml rename to config/sink/100-namespace.yaml diff --git a/sink/config/200-receiver-clusterrole.yaml b/config/sink/200-receiver-clusterrole.yaml similarity index 100% rename from sink/config/200-receiver-clusterrole.yaml rename to config/sink/200-receiver-clusterrole.yaml diff --git a/sink/config/200-serviceaccount.yaml b/config/sink/200-serviceaccount.yaml similarity index 100% rename from sink/config/200-serviceaccount.yaml rename to config/sink/200-serviceaccount.yaml diff --git a/sink/config/201-clusterrole.yaml b/config/sink/201-clusterrole.yaml similarity index 100% rename from sink/config/201-clusterrole.yaml rename to config/sink/201-clusterrole.yaml diff --git a/sink/config/201-webhook-clusterrole.yaml b/config/sink/201-webhook-clusterrole.yaml similarity index 100% rename from sink/config/201-webhook-clusterrole.yaml rename to config/sink/201-webhook-clusterrole.yaml diff --git a/sink/config/202-clusterrolebinding.yaml b/config/sink/202-clusterrolebinding.yaml similarity index 100% rename from sink/config/202-clusterrolebinding.yaml rename to config/sink/202-clusterrolebinding.yaml diff --git a/sink/config/300-redisstreamsink.yaml b/config/sink/300-redisstreamsink.yaml similarity index 100% rename from sink/config/300-redisstreamsink.yaml rename to config/sink/300-redisstreamsink.yaml diff --git a/sink/config/400-controller-service.yaml b/config/sink/400-controller-service.yaml similarity index 100% rename from sink/config/400-controller-service.yaml rename to config/sink/400-controller-service.yaml diff --git a/sink/config/400-webhook-service.yaml b/config/sink/400-webhook-service.yaml similarity index 100% rename from sink/config/400-webhook-service.yaml rename to config/sink/400-webhook-service.yaml diff --git a/sink/config/500-controller.yaml b/config/sink/500-controller.yaml similarity index 92% rename from sink/config/500-controller.yaml rename to config/sink/500-controller.yaml index 35b80003..a4dd8985 100644 --- a/sink/config/500-controller.yaml +++ b/config/sink/500-controller.yaml @@ -31,7 +31,7 @@ spec: spec: serviceAccountName: redis-controller-manager containers: - - image: ko://knative.dev/eventing-redis/sink/cmd/controller + - image: ko://knative.dev/eventing-redis/cmd/sink/controller name: manager env: - name: SYSTEM_NAMESPACE @@ -47,7 +47,7 @@ spec: - name: CONFIG_LEADERELECTION_NAME value: config-leader-election-redis - name: STREAMSINK_RA_IMAGE - value: ko://knative.dev/eventing-redis/sink/cmd/receiver + value: ko://knative.dev/eventing-redis/cmd/sink/receiver - name: SECRET_TLS_TLSCERTIFICATE value: tls-secret terminationGracePeriodSeconds: 10 diff --git a/sink/README.md b/config/sink/README.md similarity index 100% rename from sink/README.md rename to config/sink/README.md diff --git a/sink/config/config-leader-election.yaml b/config/sink/config-leader-election.yaml similarity index 100% rename from sink/config/config-leader-election.yaml rename to config/sink/config-leader-election.yaml diff --git a/sink/config/config-logging.yaml b/config/sink/config-logging.yaml similarity index 100% rename from sink/config/config-logging.yaml rename to config/sink/config-logging.yaml diff --git a/sink/config/config-observability.yaml b/config/sink/config-observability.yaml similarity index 100% rename from sink/config/config-observability.yaml rename to config/sink/config-observability.yaml diff --git a/source/config/placeholder.go b/config/sink/placeholder.go similarity index 97% rename from source/config/placeholder.go rename to config/sink/placeholder.go index ec36cc37..16e62510 100644 --- a/source/config/placeholder.go +++ b/config/sink/placeholder.go @@ -16,4 +16,4 @@ limitations under the License. // Package config is a placeholder that allows us to pull in config files // via go mod vendor. -package config +package sink diff --git a/sink/config/tls-secret.yaml b/config/sink/tls-secret.yaml similarity index 100% rename from sink/config/tls-secret.yaml rename to config/sink/tls-secret.yaml diff --git a/source/config/100-namespace.yaml b/config/source/100-namespace.yaml similarity index 100% rename from source/config/100-namespace.yaml rename to config/source/100-namespace.yaml diff --git a/source/config/200-adapter-clusterrole.yaml b/config/source/200-adapter-clusterrole.yaml similarity index 100% rename from source/config/200-adapter-clusterrole.yaml rename to config/source/200-adapter-clusterrole.yaml diff --git a/source/config/200-serviceaccount.yaml b/config/source/200-serviceaccount.yaml similarity index 100% rename from source/config/200-serviceaccount.yaml rename to config/source/200-serviceaccount.yaml diff --git a/source/config/201-clusterrole.yaml b/config/source/201-clusterrole.yaml similarity index 100% rename from source/config/201-clusterrole.yaml rename to config/source/201-clusterrole.yaml diff --git a/source/config/201-webhook-clusterrole.yaml b/config/source/201-webhook-clusterrole.yaml similarity index 100% rename from source/config/201-webhook-clusterrole.yaml rename to config/source/201-webhook-clusterrole.yaml diff --git a/source/config/202-clusterrolebinding.yaml b/config/source/202-clusterrolebinding.yaml similarity index 100% rename from source/config/202-clusterrolebinding.yaml rename to config/source/202-clusterrolebinding.yaml diff --git a/source/config/300-redisstreamsource.yaml b/config/source/300-redisstreamsource.yaml similarity index 100% rename from source/config/300-redisstreamsource.yaml rename to config/source/300-redisstreamsource.yaml diff --git a/source/config/400-controller-service.yaml b/config/source/400-controller-service.yaml similarity index 100% rename from source/config/400-controller-service.yaml rename to config/source/400-controller-service.yaml diff --git a/source/config/400-webhook-service.yaml b/config/source/400-webhook-service.yaml similarity index 100% rename from source/config/400-webhook-service.yaml rename to config/source/400-webhook-service.yaml diff --git a/source/config/500-controller.yaml b/config/source/500-controller.yaml similarity index 93% rename from source/config/500-controller.yaml rename to config/source/500-controller.yaml index 29eedf83..1f14f986 100644 --- a/source/config/500-controller.yaml +++ b/config/source/500-controller.yaml @@ -31,7 +31,7 @@ spec: spec: serviceAccountName: redis-controller-manager containers: - - image: ko://knative.dev/eventing-redis/source/cmd/controller + - image: ko://knative.dev/eventing-redis/cmd/source/controller name: manager env: - name: SYSTEM_NAMESPACE @@ -47,7 +47,7 @@ spec: - name: CONFIG_LEADERELECTION_NAME value: config-leader-election-redis - name: STREAMSOURCE_RA_IMAGE - value: ko://knative.dev/eventing-redis/source/cmd/receive_adapter + value: ko://knative.dev/eventing-redis/cmd/source/receive_adapter - name: CONFIG_REDIS_NUMCONSUMERS value: config-redis - name: SECRET_TLS_TLSCERTIFICATE diff --git a/source/README.md b/config/source/README.md similarity index 100% rename from source/README.md rename to config/source/README.md diff --git a/source/config/config-leader-election.yaml b/config/source/config-leader-election.yaml similarity index 100% rename from source/config/config-leader-election.yaml rename to config/source/config-leader-election.yaml diff --git a/source/config/config-logging.yaml b/config/source/config-logging.yaml similarity index 100% rename from source/config/config-logging.yaml rename to config/source/config-logging.yaml diff --git a/source/config/config-observability.yaml b/config/source/config-observability.yaml similarity index 100% rename from source/config/config-observability.yaml rename to config/source/config-observability.yaml diff --git a/source/config/config-redis.yaml b/config/source/config-redis.yaml similarity index 100% rename from source/config/config-redis.yaml rename to config/source/config-redis.yaml diff --git a/sink/config/placeholder.go b/config/source/placeholder.go similarity index 97% rename from sink/config/placeholder.go rename to config/source/placeholder.go index ec36cc37..ebc580c3 100644 --- a/sink/config/placeholder.go +++ b/config/source/placeholder.go @@ -16,4 +16,4 @@ limitations under the License. // Package config is a placeholder that allows us to pull in config files // via go mod vendor. -package config +package source diff --git a/source/config/tls-secret.yaml b/config/source/tls-secret.yaml similarity index 100% rename from source/config/tls-secret.yaml rename to config/source/tls-secret.yaml diff --git a/hack/release.sh b/hack/release.sh index 3be2ff0b..c76c2c8e 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -24,8 +24,8 @@ export GO111MODULE=on # Yaml files to generate, and the source config dir for them. declare -A COMPONENTS COMPONENTS=( - ["redis-source.yaml"]="source/config" - ["redis-sink.yaml"]="sink/config" + ["redis-source.yaml"]="config/source" + ["redis-sink.yaml"]="config/sink" ) readonly COMPONENTS @@ -42,7 +42,7 @@ function build_release() { local all_yamls=() for yaml in "${!COMPONENTS[@]}"; do local config="${COMPONENTS[${yaml}]}" - echo "Building Knative Eventing Contrib - ${config}" + echo "Building Knative Eventing Redis - ${config}" # TODO(chizhg): reenable --strict mode after https://github.com/knative/test-infra/issues/1262 is fixed. ko resolve ${KO_FLAGS} -f ${config}/ | "${LABEL_YAML_CMD[@]}" > ${yaml} all_yamls+=(${yaml}) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index a61cf217..5240e536 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -32,12 +32,12 @@ group "Kubernetes Codegen" # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ - knative.dev/eventing-redis/source/pkg/client knative.dev/eventing-redis/source/pkg/apis \ + knative.dev/eventing-redis/pkg/source/client knative.dev/eventing-redis/pkg/source/apis \ "sources:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ - knative.dev/eventing-redis/sink/pkg/client knative.dev/eventing-redis/sink/pkg/apis \ + knative.dev/eventing-redis/pkg/sink/client knative.dev/eventing-redis/pkg/sink/apis \ "sinks:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt @@ -45,12 +45,12 @@ group "Knative Codegen" # Knative Injection ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \ - knative.dev/eventing-redis/source/pkg/client knative.dev/eventing-redis/source/pkg/apis \ + knative.dev/eventing-redis/pkg/source/client knative.dev/eventing-redis/pkg/source/apis \ "sources:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \ - knative.dev/eventing-redis/sink/pkg/client knative.dev/eventing-redis/sink/pkg/apis \ + knative.dev/eventing-redis/pkg/sink/client knative.dev/eventing-redis/pkg/sink/apis \ "sinks:v1alpha1" \ --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate.go.txt diff --git a/pkg/apis/v1alpha1/connection.go b/pkg/apis/v1alpha1/connection.go index 91150b1f..0f1f0863 100644 --- a/pkg/apis/v1alpha1/connection.go +++ b/pkg/apis/v1alpha1/connection.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/reconciler/deployment.go b/pkg/reconciler/deployment.go index 5b45774c..782f025a 100644 --- a/pkg/reconciler/deployment.go +++ b/pkg/reconciler/deployment.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package reconciler import ( diff --git a/pkg/reconciler/kservice.go b/pkg/reconciler/kservice.go index 9e83cc25..f768e75b 100644 --- a/pkg/reconciler/kservice.go +++ b/pkg/reconciler/kservice.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package reconciler import ( diff --git a/pkg/reconciler/rolebinding.go b/pkg/reconciler/rolebinding.go index c64ed1d3..8a83ac84 100644 --- a/pkg/reconciler/rolebinding.go +++ b/pkg/reconciler/rolebinding.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package reconciler import ( diff --git a/pkg/reconciler/serviceaccount.go b/pkg/reconciler/serviceaccount.go index 98ab7c93..45f181a6 100644 --- a/pkg/reconciler/serviceaccount.go +++ b/pkg/reconciler/serviceaccount.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package reconciler import ( diff --git a/sink/pkg/apis/sinks/register.go b/pkg/sink/apis/sinks/register.go similarity index 100% rename from sink/pkg/apis/sinks/register.go rename to pkg/sink/apis/sinks/register.go diff --git a/sink/pkg/apis/sinks/v1alpha1/doc.go b/pkg/sink/apis/sinks/v1alpha1/doc.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/doc.go rename to pkg/sink/apis/sinks/v1alpha1/doc.go diff --git a/sink/pkg/apis/sinks/v1alpha1/redisstream_lifecycle_test.go b/pkg/sink/apis/sinks/v1alpha1/redisstream_lifecycle_test.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/redisstream_lifecycle_test.go rename to pkg/sink/apis/sinks/v1alpha1/redisstream_lifecycle_test.go diff --git a/sink/pkg/apis/sinks/v1alpha1/redisstream_types.go b/pkg/sink/apis/sinks/v1alpha1/redisstream_types.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/redisstream_types.go rename to pkg/sink/apis/sinks/v1alpha1/redisstream_types.go diff --git a/sink/pkg/apis/sinks/v1alpha1/redisstream_types_test.go b/pkg/sink/apis/sinks/v1alpha1/redisstream_types_test.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/redisstream_types_test.go rename to pkg/sink/apis/sinks/v1alpha1/redisstream_types_test.go diff --git a/sink/pkg/apis/sinks/v1alpha1/redistream_lifecycle.go b/pkg/sink/apis/sinks/v1alpha1/redistream_lifecycle.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/redistream_lifecycle.go rename to pkg/sink/apis/sinks/v1alpha1/redistream_lifecycle.go diff --git a/sink/pkg/apis/sinks/v1alpha1/register.go b/pkg/sink/apis/sinks/v1alpha1/register.go similarity index 96% rename from sink/pkg/apis/sinks/v1alpha1/register.go rename to pkg/sink/apis/sinks/v1alpha1/register.go index 72e9ca37..8d44076f 100644 --- a/sink/pkg/apis/sinks/v1alpha1/register.go +++ b/pkg/sink/apis/sinks/v1alpha1/register.go @@ -20,7 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/eventing-redis/sink/pkg/apis/sinks" + + "knative.dev/eventing-redis/pkg/sink/apis/sinks" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sink/pkg/apis/sinks/v1alpha1/register_test.go b/pkg/sink/apis/sinks/v1alpha1/register_test.go similarity index 97% rename from sink/pkg/apis/sinks/v1alpha1/register_test.go rename to pkg/sink/apis/sinks/v1alpha1/register_test.go index 87d6725d..a88a6ad3 100644 --- a/sink/pkg/apis/sinks/v1alpha1/register_test.go +++ b/pkg/sink/apis/sinks/v1alpha1/register_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/sink/pkg/apis/sinks/v1alpha1/zz_generated.deepcopy.go b/pkg/sink/apis/sinks/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from sink/pkg/apis/sinks/v1alpha1/zz_generated.deepcopy.go rename to pkg/sink/apis/sinks/v1alpha1/zz_generated.deepcopy.go diff --git a/sink/pkg/client/clientset/versioned/clientset.go b/pkg/sink/client/clientset/versioned/clientset.go similarity index 98% rename from sink/pkg/client/clientset/versioned/clientset.go rename to pkg/sink/client/clientset/versioned/clientset.go index f912c4df..4c2900bb 100644 --- a/sink/pkg/client/clientset/versioned/clientset.go +++ b/pkg/sink/client/clientset/versioned/clientset.go @@ -25,7 +25,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - sourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1" ) type Interface interface { diff --git a/sink/pkg/client/clientset/versioned/doc.go b/pkg/sink/client/clientset/versioned/doc.go similarity index 100% rename from sink/pkg/client/clientset/versioned/doc.go rename to pkg/sink/client/clientset/versioned/doc.go diff --git a/sink/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/sink/client/clientset/versioned/fake/clientset_generated.go similarity index 93% rename from sink/pkg/client/clientset/versioned/fake/clientset_generated.go rename to pkg/sink/client/clientset/versioned/fake/clientset_generated.go index 66aa5acd..7b43addf 100644 --- a/sink/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/sink/client/clientset/versioned/fake/clientset_generated.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - sourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1" - fakesourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake" + clientset "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1" + fakesourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/sink/pkg/client/clientset/versioned/fake/doc.go b/pkg/sink/client/clientset/versioned/fake/doc.go similarity index 100% rename from sink/pkg/client/clientset/versioned/fake/doc.go rename to pkg/sink/client/clientset/versioned/fake/doc.go diff --git a/sink/pkg/client/clientset/versioned/fake/register.go b/pkg/sink/client/clientset/versioned/fake/register.go similarity index 96% rename from sink/pkg/client/clientset/versioned/fake/register.go rename to pkg/sink/client/clientset/versioned/fake/register.go index 2d6f6b73..5a1ed0a9 100644 --- a/sink/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/sink/client/clientset/versioned/fake/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - sourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/sink/pkg/client/clientset/versioned/scheme/doc.go b/pkg/sink/client/clientset/versioned/scheme/doc.go similarity index 100% rename from sink/pkg/client/clientset/versioned/scheme/doc.go rename to pkg/sink/client/clientset/versioned/scheme/doc.go diff --git a/sink/pkg/client/clientset/versioned/scheme/register.go b/pkg/sink/client/clientset/versioned/scheme/register.go similarity index 96% rename from sink/pkg/client/clientset/versioned/scheme/register.go rename to pkg/sink/client/clientset/versioned/scheme/register.go index d20f87c1..a00a1a91 100644 --- a/sink/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/sink/client/clientset/versioned/scheme/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - sourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/doc.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/doc.go similarity index 100% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/doc.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/doc.go diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/doc.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/doc.go similarity index 100% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/doc.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/doc.go diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go similarity index 98% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go index c58c4676..e10ec876 100644 --- a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go +++ b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_redisstreamsink.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) // FakeRedisStreamSinks implements RedisStreamSinkInterface diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go similarity index 94% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go index 538c3942..5caadf7d 100644 --- a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go +++ b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/fake/fake_sinks_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1" ) type FakeSourcesV1alpha1 struct { diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/generated_expansion.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/generated_expansion.go similarity index 100% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/generated_expansion.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/generated_expansion.go diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go similarity index 98% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go index 32412aa1..6aeda372 100644 --- a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go +++ b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/redisstreamsink.go @@ -26,8 +26,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - scheme "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/scheme" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + scheme "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/scheme" ) // RedisStreamSinksGetter has a method to return a RedisStreamSinkInterface. diff --git a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go similarity index 96% rename from sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go rename to pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go index 8d70d6f9..0691e922 100644 --- a/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go +++ b/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1/sinks_client.go @@ -22,8 +22,8 @@ import ( "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/scheme" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/scheme" ) type SourcesV1alpha1Interface interface { diff --git a/sink/pkg/client/informers/externalversions/factory.go b/pkg/sink/client/informers/externalversions/factory.go similarity index 97% rename from sink/pkg/client/informers/externalversions/factory.go rename to pkg/sink/client/informers/externalversions/factory.go index 93acf49b..a885596a 100644 --- a/sink/pkg/client/informers/externalversions/factory.go +++ b/pkg/sink/client/informers/externalversions/factory.go @@ -27,9 +27,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - internalinterfaces "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/internalinterfaces" - sinks "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + internalinterfaces "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/internalinterfaces" + sinks "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/sink/pkg/client/informers/externalversions/generic.go b/pkg/sink/client/informers/externalversions/generic.go similarity index 96% rename from sink/pkg/client/informers/externalversions/generic.go rename to pkg/sink/client/informers/externalversions/generic.go index ab7eb95d..cbf1783a 100644 --- a/sink/pkg/client/informers/externalversions/generic.go +++ b/pkg/sink/client/informers/externalversions/generic.go @@ -23,7 +23,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/sink/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/sink/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 95% rename from sink/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/sink/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 4bb203e0..fa618555 100644 --- a/sink/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/sink/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/sink/pkg/client/informers/externalversions/sinks/interface.go b/pkg/sink/client/informers/externalversions/sinks/interface.go similarity index 92% rename from sink/pkg/client/informers/externalversions/sinks/interface.go rename to pkg/sink/client/informers/externalversions/sinks/interface.go index 8145a45a..bfb8d20a 100644 --- a/sink/pkg/client/informers/externalversions/sinks/interface.go +++ b/pkg/sink/client/informers/externalversions/sinks/interface.go @@ -19,8 +19,8 @@ limitations under the License. package sinks import ( - internalinterfaces "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks/v1alpha1" + internalinterfaces "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/sink/pkg/client/informers/externalversions/sinks/v1alpha1/interface.go b/pkg/sink/client/informers/externalversions/sinks/v1alpha1/interface.go similarity index 96% rename from sink/pkg/client/informers/externalversions/sinks/v1alpha1/interface.go rename to pkg/sink/client/informers/externalversions/sinks/v1alpha1/interface.go index 4a731c2e..c01bf56d 100644 --- a/sink/pkg/client/informers/externalversions/sinks/v1alpha1/interface.go +++ b/pkg/sink/client/informers/externalversions/sinks/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/sink/pkg/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go b/pkg/sink/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go similarity index 93% rename from sink/pkg/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go rename to pkg/sink/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go index 80ff96ea..b7ab22ac 100644 --- a/sink/pkg/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go +++ b/pkg/sink/client/informers/externalversions/sinks/v1alpha1/redisstreamsink.go @@ -26,10 +26,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - internalinterfaces "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/client/listers/sinks/v1alpha1" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + internalinterfaces "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/client/listers/sinks/v1alpha1" ) // RedisStreamSinkInformer provides access to a shared informer and lister for diff --git a/sink/pkg/client/injection/client/client.go b/pkg/sink/client/injection/client/client.go similarity index 95% rename from sink/pkg/client/injection/client/client.go rename to pkg/sink/client/injection/client/client.go index 765647ff..c4f63943 100644 --- a/sink/pkg/client/injection/client/client.go +++ b/pkg/sink/client/injection/client/client.go @@ -33,9 +33,9 @@ import ( discovery "k8s.io/client-go/discovery" dynamic "k8s.io/client-go/dynamic" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - typedsourcesv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/typed/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + typedsourcesv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/typed/sinks/v1alpha1" injection "knative.dev/pkg/injection" dynamicclient "knative.dev/pkg/injection/clients/dynamicclient" logging "knative.dev/pkg/logging" @@ -66,10 +66,10 @@ func Get(ctx context.Context) versioned.Interface { if untyped == nil { if injection.GetConfig(ctx) == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/clientset/versioned.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/clientset/versioned.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") } else { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/clientset/versioned.Interface from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/clientset/versioned.Interface from context.") } } return untyped.(versioned.Interface) diff --git a/sink/pkg/client/injection/client/fake/fake.go b/pkg/sink/client/injection/client/fake/fake.go similarity index 89% rename from sink/pkg/client/injection/client/fake/fake.go rename to pkg/sink/client/injection/client/fake/fake.go index 76a49385..0d51a563 100644 --- a/sink/pkg/client/injection/client/fake/fake.go +++ b/pkg/sink/client/injection/client/fake/fake.go @@ -23,8 +23,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" rest "k8s.io/client-go/rest" - fake "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/fake" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" + fake "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/fake" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" ) @@ -51,7 +51,7 @@ func Get(ctx context.Context) *fake.Clientset { untyped := ctx.Value(client.Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/fake.Clientset from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/fake.Clientset from context.") } return untyped.(*fake.Clientset) } diff --git a/sink/pkg/client/injection/informers/factory/factory.go b/pkg/sink/client/injection/informers/factory/factory.go similarity index 90% rename from sink/pkg/client/injection/informers/factory/factory.go rename to pkg/sink/client/injection/informers/factory/factory.go index 5d71b567..d2f9e920 100644 --- a/sink/pkg/client/injection/informers/factory/factory.go +++ b/pkg/sink/client/injection/informers/factory/factory.go @@ -21,8 +21,8 @@ package factory import ( context "context" - externalversions "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" + externalversions "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -50,7 +50,7 @@ func Get(ctx context.Context) externalversions.SharedInformerFactory { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/informers/externalversions.SharedInformerFactory from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/informers/externalversions.SharedInformerFactory from context.") } return untyped.(externalversions.SharedInformerFactory) } diff --git a/sink/pkg/client/injection/informers/factory/fake/fake.go b/pkg/sink/client/injection/informers/factory/fake/fake.go similarity index 87% rename from sink/pkg/client/injection/informers/factory/fake/fake.go rename to pkg/sink/client/injection/informers/factory/fake/fake.go index f302143f..88f00c37 100644 --- a/sink/pkg/client/injection/informers/factory/fake/fake.go +++ b/pkg/sink/client/injection/informers/factory/fake/fake.go @@ -21,9 +21,9 @@ package fake import ( context "context" - externalversions "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions" - fake "knative.dev/eventing-redis/sink/pkg/client/injection/client/fake" - factory "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory" + externalversions "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions" + fake "knative.dev/eventing-redis/pkg/sink/client/injection/client/fake" + factory "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/sink/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go b/pkg/sink/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go similarity index 90% rename from sink/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go rename to pkg/sink/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go index 43c221e2..0b28aa0d 100644 --- a/sink/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go +++ b/pkg/sink/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go @@ -22,9 +22,9 @@ import ( context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - externalversions "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions" - fake "knative.dev/eventing-redis/sink/pkg/client/injection/client/fake" - filtered "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory/filtered" + externalversions "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions" + fake "knative.dev/eventing-redis/pkg/sink/client/injection/client/fake" + filtered "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/sink/pkg/client/injection/informers/factory/filtered/filtered_factory.go b/pkg/sink/client/injection/informers/factory/filtered/filtered_factory.go similarity index 92% rename from sink/pkg/client/injection/informers/factory/filtered/filtered_factory.go rename to pkg/sink/client/injection/informers/factory/filtered/filtered_factory.go index ecd0d118..e8b96eb3 100644 --- a/sink/pkg/client/injection/informers/factory/filtered/filtered_factory.go +++ b/pkg/sink/client/injection/informers/factory/filtered/filtered_factory.go @@ -22,8 +22,8 @@ import ( context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - externalversions "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" + externalversions "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -71,7 +71,7 @@ func Get(ctx context.Context, selector string) externalversions.SharedInformerFa untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) } return untyped.(externalversions.SharedInformerFactory) } diff --git a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go similarity index 89% rename from sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go rename to pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go index 41b3ed89..b0634568 100644 --- a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go +++ b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/fake/fake.go @@ -21,8 +21,8 @@ package fake import ( context "context" - fake "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory/fake" - redisstreamsink "knative.dev/eventing-redis/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink" + fake "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory/fake" + redisstreamsink "knative.dev/eventing-redis/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go similarity index 92% rename from sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go rename to pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go index ca28b015..e06086db 100644 --- a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go +++ b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/fake/fake.go @@ -21,8 +21,8 @@ package fake import ( context "context" - factoryfiltered "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory/filtered" - filtered "knative.dev/eventing-redis/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered" + factoryfiltered "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory/filtered" + filtered "knative.dev/eventing-redis/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go similarity index 90% rename from sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go rename to pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go index 6bf90e80..6f62c46e 100644 --- a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go +++ b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/filtered/redisstreamsink.go @@ -24,12 +24,12 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" cache "k8s.io/client-go/tools/cache" - apissinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks/v1alpha1" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" - filtered "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory/filtered" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/listers/sinks/v1alpha1" + apissinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks/v1alpha1" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" + filtered "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory/filtered" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/listers/sinks/v1alpha1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -81,7 +81,7 @@ func Get(ctx context.Context, selector string) v1alpha1.RedisStreamSinkInformer untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks/v1alpha1.RedisStreamSinkInformer with selector %s from context.", selector) + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks/v1alpha1.RedisStreamSinkInformer with selector %s from context.", selector) } return untyped.(v1alpha1.RedisStreamSinkInformer) } diff --git a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go similarity index 89% rename from sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go rename to pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go index 6fd1989b..02552f0b 100644 --- a/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go +++ b/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink/redisstreamsink.go @@ -24,12 +24,12 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" cache "k8s.io/client-go/tools/cache" - apissinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks/v1alpha1" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" - factory "knative.dev/eventing-redis/sink/pkg/client/injection/informers/factory" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/listers/sinks/v1alpha1" + apissinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks/v1alpha1" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" + factory "knative.dev/eventing-redis/pkg/sink/client/injection/informers/factory" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/listers/sinks/v1alpha1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -59,7 +59,7 @@ func Get(ctx context.Context) v1alpha1.RedisStreamSinkInformer { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/sink/pkg/client/informers/externalversions/sinks/v1alpha1.RedisStreamSinkInformer from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/sink/client/informers/externalversions/sinks/v1alpha1.RedisStreamSinkInformer from context.") } return untyped.(v1alpha1.RedisStreamSinkInformer) } diff --git a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go similarity index 96% rename from sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go rename to pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go index 53064e4c..2995dd24 100644 --- a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go +++ b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/controller.go @@ -32,9 +32,9 @@ import ( scheme "k8s.io/client-go/kubernetes/scheme" v1 "k8s.io/client-go/kubernetes/typed/core/v1" record "k8s.io/client-go/tools/record" - versionedscheme "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned/scheme" - client "knative.dev/eventing-redis/sink/pkg/client/injection/client" - redisstreamsink "knative.dev/eventing-redis/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink" + versionedscheme "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned/scheme" + client "knative.dev/eventing-redis/pkg/sink/client/injection/client" + redisstreamsink "knative.dev/eventing-redis/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink" kubeclient "knative.dev/pkg/client/injection/kube/client" controller "knative.dev/pkg/controller" logging "knative.dev/pkg/logging" diff --git a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go similarity index 98% rename from sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go rename to pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go index 0cf328ef..50ee5c3e 100644 --- a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go +++ b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/reconciler.go @@ -32,9 +32,9 @@ import ( types "k8s.io/apimachinery/pkg/types" sets "k8s.io/apimachinery/pkg/util/sets" record "k8s.io/client-go/tools/record" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - versioned "knative.dev/eventing-redis/sink/pkg/client/clientset/versioned" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/client/listers/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/sink/client/clientset/versioned" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/client/listers/sinks/v1alpha1" controller "knative.dev/pkg/controller" kmp "knative.dev/pkg/kmp" logging "knative.dev/pkg/logging" diff --git a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go similarity index 97% rename from sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go rename to pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go index aaa4acbb..ebbc7291 100644 --- a/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go +++ b/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink/state.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" cache "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" reconciler "knative.dev/pkg/reconciler" ) diff --git a/sink/pkg/client/listers/sinks/v1alpha1/expansion_generated.go b/pkg/sink/client/listers/sinks/v1alpha1/expansion_generated.go similarity index 100% rename from sink/pkg/client/listers/sinks/v1alpha1/expansion_generated.go rename to pkg/sink/client/listers/sinks/v1alpha1/expansion_generated.go diff --git a/sink/pkg/client/listers/sinks/v1alpha1/redisstreamsink.go b/pkg/sink/client/listers/sinks/v1alpha1/redisstreamsink.go similarity index 98% rename from sink/pkg/client/listers/sinks/v1alpha1/redisstreamsink.go rename to pkg/sink/client/listers/sinks/v1alpha1/redisstreamsink.go index a9c95849..210040f7 100644 --- a/sink/pkg/client/listers/sinks/v1alpha1/redisstreamsink.go +++ b/pkg/sink/client/listers/sinks/v1alpha1/redisstreamsink.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) // RedisStreamSinkLister helps list RedisStreamSinks. diff --git a/sink/pkg/receiver/config.go b/pkg/sink/receiver/config.go similarity index 94% rename from sink/pkg/receiver/config.go rename to pkg/sink/receiver/config.go index d597a66f..eb9ddfba 100644 --- a/sink/pkg/receiver/config.go +++ b/pkg/sink/receiver/config.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/sink/pkg/receiver/receiver.go b/pkg/sink/receiver/receiver.go similarity index 100% rename from sink/pkg/receiver/receiver.go rename to pkg/sink/receiver/receiver.go diff --git a/sink/pkg/reconciler/streamsink/config.go b/pkg/sink/reconciler/streamsink/config.go similarity index 96% rename from sink/pkg/reconciler/streamsink/config.go rename to pkg/sink/reconciler/streamsink/config.go index e17bcd40..68d55088 100644 --- a/sink/pkg/reconciler/streamsink/config.go +++ b/pkg/sink/reconciler/streamsink/config.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/sink/pkg/reconciler/streamsink/controller.go b/pkg/sink/reconciler/streamsink/controller.go similarity index 94% rename from sink/pkg/reconciler/streamsink/controller.go rename to pkg/sink/reconciler/streamsink/controller.go index 71284a64..4bd83e07 100644 --- a/sink/pkg/reconciler/streamsink/controller.go +++ b/pkg/sink/reconciler/streamsink/controller.go @@ -38,9 +38,9 @@ import ( reconcilersource "knative.dev/eventing/pkg/reconciler/source" "knative.dev/eventing-redis/pkg/reconciler" - "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - redisstreamsinkinformer "knative.dev/eventing-redis/sink/pkg/client/injection/informers/sinks/v1alpha1/redisstreamsink" - redisstreamssinkreconciler "knative.dev/eventing-redis/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink" + "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + redisstreamsinkinformer "knative.dev/eventing-redis/pkg/sink/client/injection/informers/sinks/v1alpha1/redisstreamsink" + redisstreamssinkreconciler "knative.dev/eventing-redis/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink" ) // envConfig will be used to extract the required environment variables using diff --git a/sink/pkg/reconciler/streamsink/resources/labels.go b/pkg/sink/reconciler/streamsink/resources/labels.go similarity index 100% rename from sink/pkg/reconciler/streamsink/resources/labels.go rename to pkg/sink/reconciler/streamsink/resources/labels.go diff --git a/sink/pkg/reconciler/streamsink/resources/receiver.go b/pkg/sink/reconciler/streamsink/resources/receiver.go similarity index 97% rename from sink/pkg/reconciler/streamsink/resources/receiver.go rename to pkg/sink/reconciler/streamsink/resources/receiver.go index 8cfa5a21..1cf89f2e 100644 --- a/sink/pkg/reconciler/streamsink/resources/receiver.go +++ b/pkg/sink/reconciler/streamsink/resources/receiver.go @@ -24,7 +24,7 @@ import ( servingv1 "knative.dev/serving/pkg/apis/serving/v1" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) func ReceiverName(source *sinksv1alpha1.RedisStreamSink) string { diff --git a/sink/pkg/reconciler/streamsink/resources/receiver_test.go b/pkg/sink/reconciler/streamsink/resources/receiver_test.go similarity index 97% rename from sink/pkg/reconciler/streamsink/resources/receiver_test.go rename to pkg/sink/reconciler/streamsink/resources/receiver_test.go index 2d2f2d64..92e81aae 100644 --- a/sink/pkg/reconciler/streamsink/resources/receiver_test.go +++ b/pkg/sink/reconciler/streamsink/resources/receiver_test.go @@ -22,10 +22,11 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "knative.dev/eventing-redis/pkg/apis/v1alpha1" - v1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" "knative.dev/pkg/kmeta" "knative.dev/pkg/kmp" + + apisv1alpha1 "knative.dev/eventing-redis/pkg/apis/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" ) func TestMakeReceive(t *testing.T) { diff --git a/sink/pkg/reconciler/streamsink/resources/role_binding.go b/pkg/sink/reconciler/streamsink/resources/role_binding.go similarity index 100% rename from sink/pkg/reconciler/streamsink/resources/role_binding.go rename to pkg/sink/reconciler/streamsink/resources/role_binding.go diff --git a/sink/pkg/reconciler/streamsink/resources/service_account.go b/pkg/sink/reconciler/streamsink/resources/service_account.go similarity index 100% rename from sink/pkg/reconciler/streamsink/resources/service_account.go rename to pkg/sink/reconciler/streamsink/resources/service_account.go diff --git a/sink/pkg/reconciler/streamsink/streamsink.go b/pkg/sink/reconciler/streamsink/streamsink.go similarity index 94% rename from sink/pkg/reconciler/streamsink/streamsink.go rename to pkg/sink/reconciler/streamsink/streamsink.go index 3942d2b3..09e7b09f 100644 --- a/sink/pkg/reconciler/streamsink/streamsink.go +++ b/pkg/sink/reconciler/streamsink/streamsink.go @@ -31,9 +31,9 @@ import ( reconcilersource "knative.dev/eventing/pkg/reconciler/source" "knative.dev/eventing-redis/pkg/reconciler" - sinksv1alpha1 "knative.dev/eventing-redis/sink/pkg/apis/sinks/v1alpha1" - streamsinkreconciler "knative.dev/eventing-redis/sink/pkg/client/injection/reconciler/sinks/v1alpha1/redisstreamsink" - "knative.dev/eventing-redis/sink/pkg/reconciler/streamsink/resources" + sinksv1alpha1 "knative.dev/eventing-redis/pkg/sink/apis/sinks/v1alpha1" + streamsinkreconciler "knative.dev/eventing-redis/pkg/sink/client/injection/reconciler/sinks/v1alpha1/redisstreamsink" + "knative.dev/eventing-redis/pkg/sink/reconciler/streamsink/resources" ) const ( diff --git a/source/pkg/adapter/adapter.go b/pkg/source/adapter/adapter.go similarity index 99% rename from source/pkg/adapter/adapter.go rename to pkg/source/adapter/adapter.go index 2fb01a6a..bc75c50f 100644 --- a/source/pkg/adapter/adapter.go +++ b/pkg/source/adapter/adapter.go @@ -27,7 +27,7 @@ import ( "sync" "time" - scan "knative.dev/eventing-redis/source/pkg/redis" + scan "knative.dev/eventing-redis/pkg/source/redis" cloudevents "github.com/cloudevents/sdk-go/v2" redisParse "github.com/go-redis/redis/v8" diff --git a/source/pkg/adapter/adapter_test.go b/pkg/source/adapter/adapter_test.go similarity index 100% rename from source/pkg/adapter/adapter_test.go rename to pkg/source/adapter/adapter_test.go diff --git a/source/pkg/adapter/config.go b/pkg/source/adapter/config.go similarity index 95% rename from source/pkg/adapter/config.go rename to pkg/source/adapter/config.go index e1be96f5..3f4c501d 100644 --- a/source/pkg/adapter/config.go +++ b/pkg/source/adapter/config.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/apis/sources/register.go b/pkg/source/apis/sources/register.go similarity index 100% rename from source/pkg/apis/sources/register.go rename to pkg/source/apis/sources/register.go diff --git a/source/pkg/apis/sources/v1alpha1/doc.go b/pkg/source/apis/sources/v1alpha1/doc.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/doc.go rename to pkg/source/apis/sources/v1alpha1/doc.go diff --git a/source/pkg/apis/sources/v1alpha1/redisstream_lifecycle.go b/pkg/source/apis/sources/v1alpha1/redisstream_lifecycle.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/redisstream_lifecycle.go rename to pkg/source/apis/sources/v1alpha1/redisstream_lifecycle.go diff --git a/source/pkg/apis/sources/v1alpha1/redisstream_lifecycle_test.go b/pkg/source/apis/sources/v1alpha1/redisstream_lifecycle_test.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/redisstream_lifecycle_test.go rename to pkg/source/apis/sources/v1alpha1/redisstream_lifecycle_test.go diff --git a/source/pkg/apis/sources/v1alpha1/redisstream_types.go b/pkg/source/apis/sources/v1alpha1/redisstream_types.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/redisstream_types.go rename to pkg/source/apis/sources/v1alpha1/redisstream_types.go diff --git a/source/pkg/apis/sources/v1alpha1/redisstream_types_test.go b/pkg/source/apis/sources/v1alpha1/redisstream_types_test.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/redisstream_types_test.go rename to pkg/source/apis/sources/v1alpha1/redisstream_types_test.go diff --git a/source/pkg/apis/sources/v1alpha1/register.go b/pkg/source/apis/sources/v1alpha1/register.go similarity index 96% rename from source/pkg/apis/sources/v1alpha1/register.go rename to pkg/source/apis/sources/v1alpha1/register.go index 9d76acdc..4b8e295c 100644 --- a/source/pkg/apis/sources/v1alpha1/register.go +++ b/pkg/source/apis/sources/v1alpha1/register.go @@ -20,7 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/eventing-redis/source/pkg/apis/sources" + + "knative.dev/eventing-redis/pkg/source/apis/sources" ) // SchemeGroupVersion is group version used to register these objects diff --git a/source/pkg/apis/sources/v1alpha1/register_test.go b/pkg/source/apis/sources/v1alpha1/register_test.go similarity index 97% rename from source/pkg/apis/sources/v1alpha1/register_test.go rename to pkg/source/apis/sources/v1alpha1/register_test.go index 70bd5b1e..d32126c8 100644 --- a/source/pkg/apis/sources/v1alpha1/register_test.go +++ b/pkg/source/apis/sources/v1alpha1/register_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go b/pkg/source/apis/sources/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from source/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go rename to pkg/source/apis/sources/v1alpha1/zz_generated.deepcopy.go diff --git a/source/pkg/client/clientset/versioned/clientset.go b/pkg/source/client/clientset/versioned/clientset.go similarity index 98% rename from source/pkg/client/clientset/versioned/clientset.go rename to pkg/source/client/clientset/versioned/clientset.go index 412aa50c..ff04d0d3 100644 --- a/source/pkg/client/clientset/versioned/clientset.go +++ b/pkg/source/client/clientset/versioned/clientset.go @@ -25,7 +25,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/typed/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/typed/sources/v1alpha1" ) type Interface interface { diff --git a/source/pkg/client/clientset/versioned/doc.go b/pkg/source/client/clientset/versioned/doc.go similarity index 100% rename from source/pkg/client/clientset/versioned/doc.go rename to pkg/source/client/clientset/versioned/doc.go diff --git a/source/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/source/client/clientset/versioned/fake/clientset_generated.go similarity index 93% rename from source/pkg/client/clientset/versioned/fake/clientset_generated.go rename to pkg/source/client/clientset/versioned/fake/clientset_generated.go index 2d351f85..8eeb288d 100644 --- a/source/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/source/client/clientset/versioned/fake/clientset_generated.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/typed/sources/v1alpha1" - fakesourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake" + clientset "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/typed/sources/v1alpha1" + fakesourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/source/pkg/client/clientset/versioned/fake/doc.go b/pkg/source/client/clientset/versioned/fake/doc.go similarity index 100% rename from source/pkg/client/clientset/versioned/fake/doc.go rename to pkg/source/client/clientset/versioned/fake/doc.go diff --git a/source/pkg/client/clientset/versioned/fake/register.go b/pkg/source/client/clientset/versioned/fake/register.go similarity index 96% rename from source/pkg/client/clientset/versioned/fake/register.go rename to pkg/source/client/clientset/versioned/fake/register.go index 3cfe9e26..b9d286a3 100644 --- a/source/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/source/client/clientset/versioned/fake/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/source/pkg/client/clientset/versioned/scheme/doc.go b/pkg/source/client/clientset/versioned/scheme/doc.go similarity index 100% rename from source/pkg/client/clientset/versioned/scheme/doc.go rename to pkg/source/client/clientset/versioned/scheme/doc.go diff --git a/source/pkg/client/clientset/versioned/scheme/register.go b/pkg/source/client/clientset/versioned/scheme/register.go similarity index 96% rename from source/pkg/client/clientset/versioned/scheme/register.go rename to pkg/source/client/clientset/versioned/scheme/register.go index b01d159a..d3831c33 100644 --- a/source/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/source/client/clientset/versioned/scheme/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/doc.go similarity index 100% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/doc.go diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go similarity index 100% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go similarity index 98% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go index 91ff3afe..f3140059 100644 --- a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go +++ b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_redisstreamsource.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) // FakeRedisStreamSources implements RedisStreamSourceInterface diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go similarity index 94% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go index 398cb710..f1a82517 100644 --- a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go +++ b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/typed/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/typed/sources/v1alpha1" ) type FakeSourcesV1alpha1 struct { diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go similarity index 100% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go similarity index 98% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go index ac6e0617..52f7e279 100644 --- a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go +++ b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/redisstreamsource.go @@ -26,8 +26,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - scheme "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/scheme" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + scheme "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/scheme" ) // RedisStreamSourcesGetter has a method to return a RedisStreamSourceInterface. diff --git a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go similarity index 96% rename from source/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go rename to pkg/source/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go index e5b6b866..39ef49da 100644 --- a/source/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go +++ b/pkg/source/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go @@ -22,8 +22,8 @@ import ( "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/scheme" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/scheme" ) type SourcesV1alpha1Interface interface { diff --git a/source/pkg/client/informers/externalversions/factory.go b/pkg/source/client/informers/externalversions/factory.go similarity index 97% rename from source/pkg/client/informers/externalversions/factory.go rename to pkg/source/client/informers/externalversions/factory.go index c1dbfa63..3ea015a1 100644 --- a/source/pkg/client/informers/externalversions/factory.go +++ b/pkg/source/client/informers/externalversions/factory.go @@ -27,9 +27,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - internalinterfaces "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/internalinterfaces" - sources "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + internalinterfaces "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/internalinterfaces" + sources "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/source/pkg/client/informers/externalversions/generic.go b/pkg/source/client/informers/externalversions/generic.go similarity index 96% rename from source/pkg/client/informers/externalversions/generic.go rename to pkg/source/client/informers/externalversions/generic.go index 3f00a3ff..f510a868 100644 --- a/source/pkg/client/informers/externalversions/generic.go +++ b/pkg/source/client/informers/externalversions/generic.go @@ -23,7 +23,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/source/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/source/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 95% rename from source/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/source/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 63b59375..65b3103c 100644 --- a/source/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/source/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/source/pkg/client/informers/externalversions/sources/interface.go b/pkg/source/client/informers/externalversions/sources/interface.go similarity index 92% rename from source/pkg/client/informers/externalversions/sources/interface.go rename to pkg/source/client/informers/externalversions/sources/interface.go index 6ae656a2..d034e500 100644 --- a/source/pkg/client/informers/externalversions/sources/interface.go +++ b/pkg/source/client/informers/externalversions/sources/interface.go @@ -19,8 +19,8 @@ limitations under the License. package sources import ( - internalinterfaces "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources/v1alpha1" + internalinterfaces "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/source/pkg/client/informers/externalversions/sources/v1alpha1/interface.go b/pkg/source/client/informers/externalversions/sources/v1alpha1/interface.go similarity index 96% rename from source/pkg/client/informers/externalversions/sources/v1alpha1/interface.go rename to pkg/source/client/informers/externalversions/sources/v1alpha1/interface.go index d934b25b..75639bb5 100644 --- a/source/pkg/client/informers/externalversions/sources/v1alpha1/interface.go +++ b/pkg/source/client/informers/externalversions/sources/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/source/pkg/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go b/pkg/source/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go similarity index 93% rename from source/pkg/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go rename to pkg/source/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go index 1123a515..b29a17ea 100644 --- a/source/pkg/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go +++ b/pkg/source/client/informers/externalversions/sources/v1alpha1/redisstreamsource.go @@ -26,10 +26,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - internalinterfaces "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "knative.dev/eventing-redis/source/pkg/client/listers/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + internalinterfaces "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/internalinterfaces" + v1alpha1 "knative.dev/eventing-redis/pkg/source/client/listers/sources/v1alpha1" ) // RedisStreamSourceInformer provides access to a shared informer and lister for diff --git a/source/pkg/client/injection/client/client.go b/pkg/source/client/injection/client/client.go similarity index 95% rename from source/pkg/client/injection/client/client.go rename to pkg/source/client/injection/client/client.go index 6fa60438..b5a84589 100644 --- a/source/pkg/client/injection/client/client.go +++ b/pkg/source/client/injection/client/client.go @@ -33,9 +33,9 @@ import ( discovery "k8s.io/client-go/discovery" dynamic "k8s.io/client-go/dynamic" rest "k8s.io/client-go/rest" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - typedsourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/typed/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + typedsourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/typed/sources/v1alpha1" injection "knative.dev/pkg/injection" dynamicclient "knative.dev/pkg/injection/clients/dynamicclient" logging "knative.dev/pkg/logging" @@ -66,10 +66,10 @@ func Get(ctx context.Context) versioned.Interface { if untyped == nil { if injection.GetConfig(ctx) == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/clientset/versioned.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/clientset/versioned.Interface from context. This context is not the application context (which is typically given to constructors via sharedmain).") } else { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/clientset/versioned.Interface from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/clientset/versioned.Interface from context.") } } return untyped.(versioned.Interface) diff --git a/source/pkg/client/injection/client/fake/fake.go b/pkg/source/client/injection/client/fake/fake.go similarity index 89% rename from source/pkg/client/injection/client/fake/fake.go rename to pkg/source/client/injection/client/fake/fake.go index cee598d7..529d44d1 100644 --- a/source/pkg/client/injection/client/fake/fake.go +++ b/pkg/source/client/injection/client/fake/fake.go @@ -23,8 +23,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" rest "k8s.io/client-go/rest" - fake "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/fake" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" + fake "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/fake" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" ) @@ -51,7 +51,7 @@ func Get(ctx context.Context) *fake.Clientset { untyped := ctx.Value(client.Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/clientset/versioned/fake.Clientset from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/clientset/versioned/fake.Clientset from context.") } return untyped.(*fake.Clientset) } diff --git a/source/pkg/client/injection/informers/factory/factory.go b/pkg/source/client/injection/informers/factory/factory.go similarity index 90% rename from source/pkg/client/injection/informers/factory/factory.go rename to pkg/source/client/injection/informers/factory/factory.go index ad5538d4..94006b33 100644 --- a/source/pkg/client/injection/informers/factory/factory.go +++ b/pkg/source/client/injection/informers/factory/factory.go @@ -21,8 +21,8 @@ package factory import ( context "context" - externalversions "knative.dev/eventing-redis/source/pkg/client/informers/externalversions" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" + externalversions "knative.dev/eventing-redis/pkg/source/client/informers/externalversions" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -50,7 +50,7 @@ func Get(ctx context.Context) externalversions.SharedInformerFactory { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/informers/externalversions.SharedInformerFactory from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/informers/externalversions.SharedInformerFactory from context.") } return untyped.(externalversions.SharedInformerFactory) } diff --git a/source/pkg/client/injection/informers/factory/fake/fake.go b/pkg/source/client/injection/informers/factory/fake/fake.go similarity index 87% rename from source/pkg/client/injection/informers/factory/fake/fake.go rename to pkg/source/client/injection/informers/factory/fake/fake.go index 250e8cd5..02fef324 100644 --- a/source/pkg/client/injection/informers/factory/fake/fake.go +++ b/pkg/source/client/injection/informers/factory/fake/fake.go @@ -21,9 +21,9 @@ package fake import ( context "context" - externalversions "knative.dev/eventing-redis/source/pkg/client/informers/externalversions" - fake "knative.dev/eventing-redis/source/pkg/client/injection/client/fake" - factory "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory" + externalversions "knative.dev/eventing-redis/pkg/source/client/informers/externalversions" + fake "knative.dev/eventing-redis/pkg/source/client/injection/client/fake" + factory "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/source/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go b/pkg/source/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go similarity index 90% rename from source/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go rename to pkg/source/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go index f7598d9a..800c5e6a 100644 --- a/source/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go +++ b/pkg/source/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go @@ -22,9 +22,9 @@ import ( context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - externalversions "knative.dev/eventing-redis/source/pkg/client/informers/externalversions" - fake "knative.dev/eventing-redis/source/pkg/client/injection/client/fake" - filtered "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory/filtered" + externalversions "knative.dev/eventing-redis/pkg/source/client/informers/externalversions" + fake "knative.dev/eventing-redis/pkg/source/client/injection/client/fake" + filtered "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/source/pkg/client/injection/informers/factory/filtered/filtered_factory.go b/pkg/source/client/injection/informers/factory/filtered/filtered_factory.go similarity index 92% rename from source/pkg/client/injection/informers/factory/filtered/filtered_factory.go rename to pkg/source/client/injection/informers/factory/filtered/filtered_factory.go index 84e2a078..cc97ec35 100644 --- a/source/pkg/client/injection/informers/factory/filtered/filtered_factory.go +++ b/pkg/source/client/injection/informers/factory/filtered/filtered_factory.go @@ -22,8 +22,8 @@ import ( context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - externalversions "knative.dev/eventing-redis/source/pkg/client/informers/externalversions" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" + externalversions "knative.dev/eventing-redis/pkg/source/client/informers/externalversions" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -71,7 +71,7 @@ func Get(ctx context.Context, selector string) externalversions.SharedInformerFa untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/informers/externalversions.SharedInformerFactory with selector %s from context.", selector) } return untyped.(externalversions.SharedInformerFactory) } diff --git a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go similarity index 89% rename from source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go rename to pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go index d1db26f7..e34ea16c 100644 --- a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go +++ b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/fake/fake.go @@ -21,8 +21,8 @@ package fake import ( context "context" - fake "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory/fake" - redisstreamsource "knative.dev/eventing-redis/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource" + fake "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory/fake" + redisstreamsource "knative.dev/eventing-redis/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" ) diff --git a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go similarity index 92% rename from source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go rename to pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go index 00d60988..84b10795 100644 --- a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go +++ b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/fake/fake.go @@ -21,8 +21,8 @@ package fake import ( context "context" - factoryfiltered "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory/filtered" - filtered "knative.dev/eventing-redis/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered" + factoryfiltered "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory/filtered" + filtered "knative.dev/eventing-redis/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go similarity index 90% rename from source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go rename to pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go index a83a7ef0..052949b4 100644 --- a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go +++ b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/filtered/redisstreamsource.go @@ -24,12 +24,12 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" cache "k8s.io/client-go/tools/cache" - apissourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - v1alpha1 "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources/v1alpha1" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" - filtered "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory/filtered" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/listers/sources/v1alpha1" + apissourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + v1alpha1 "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources/v1alpha1" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" + filtered "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory/filtered" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/listers/sources/v1alpha1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -81,7 +81,7 @@ func Get(ctx context.Context, selector string) v1alpha1.RedisStreamSourceInforme untyped := ctx.Value(Key{Selector: selector}) if untyped == nil { logging.FromContext(ctx).Panicf( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources/v1alpha1.RedisStreamSourceInformer with selector %s from context.", selector) + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources/v1alpha1.RedisStreamSourceInformer with selector %s from context.", selector) } return untyped.(v1alpha1.RedisStreamSourceInformer) } diff --git a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go similarity index 89% rename from source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go rename to pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go index c827233f..0e485eca 100644 --- a/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go +++ b/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource/redisstreamsource.go @@ -24,12 +24,12 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" cache "k8s.io/client-go/tools/cache" - apissourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - v1alpha1 "knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources/v1alpha1" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" - factory "knative.dev/eventing-redis/source/pkg/client/injection/informers/factory" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/listers/sources/v1alpha1" + apissourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + v1alpha1 "knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources/v1alpha1" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" + factory "knative.dev/eventing-redis/pkg/source/client/injection/informers/factory" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/listers/sources/v1alpha1" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" @@ -59,7 +59,7 @@ func Get(ctx context.Context) v1alpha1.RedisStreamSourceInformer { untyped := ctx.Value(Key{}) if untyped == nil { logging.FromContext(ctx).Panic( - "Unable to fetch knative.dev/eventing-redis/source/pkg/client/informers/externalversions/sources/v1alpha1.RedisStreamSourceInformer from context.") + "Unable to fetch knative.dev/eventing-redis/pkg/source/client/informers/externalversions/sources/v1alpha1.RedisStreamSourceInformer from context.") } return untyped.(v1alpha1.RedisStreamSourceInformer) } diff --git a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go similarity index 96% rename from source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go rename to pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go index fd8f33a9..d7278831 100644 --- a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go +++ b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/controller.go @@ -32,9 +32,9 @@ import ( scheme "k8s.io/client-go/kubernetes/scheme" v1 "k8s.io/client-go/kubernetes/typed/core/v1" record "k8s.io/client-go/tools/record" - versionedscheme "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/scheme" - client "knative.dev/eventing-redis/source/pkg/client/injection/client" - redisstreamsource "knative.dev/eventing-redis/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource" + versionedscheme "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/scheme" + client "knative.dev/eventing-redis/pkg/source/client/injection/client" + redisstreamsource "knative.dev/eventing-redis/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource" kubeclient "knative.dev/pkg/client/injection/kube/client" controller "knative.dev/pkg/controller" logging "knative.dev/pkg/logging" diff --git a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go similarity index 98% rename from source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go rename to pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go index 798d2218..bc5b38b6 100644 --- a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go +++ b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/reconciler.go @@ -32,9 +32,9 @@ import ( types "k8s.io/apimachinery/pkg/types" sets "k8s.io/apimachinery/pkg/util/sets" record "k8s.io/client-go/tools/record" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - versioned "knative.dev/eventing-redis/source/pkg/client/clientset/versioned" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/client/listers/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + versioned "knative.dev/eventing-redis/pkg/source/client/clientset/versioned" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/client/listers/sources/v1alpha1" controller "knative.dev/pkg/controller" kmp "knative.dev/pkg/kmp" logging "knative.dev/pkg/logging" diff --git a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go similarity index 97% rename from source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go rename to pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go index 1ba1d629..4b48aa28 100644 --- a/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go +++ b/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource/state.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" cache "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" reconciler "knative.dev/pkg/reconciler" ) diff --git a/source/pkg/client/listers/sources/v1alpha1/expansion_generated.go b/pkg/source/client/listers/sources/v1alpha1/expansion_generated.go similarity index 100% rename from source/pkg/client/listers/sources/v1alpha1/expansion_generated.go rename to pkg/source/client/listers/sources/v1alpha1/expansion_generated.go diff --git a/source/pkg/client/listers/sources/v1alpha1/redisstreamsource.go b/pkg/source/client/listers/sources/v1alpha1/redisstreamsource.go similarity index 98% rename from source/pkg/client/listers/sources/v1alpha1/redisstreamsource.go rename to pkg/source/client/listers/sources/v1alpha1/redisstreamsource.go index 8f7a6cec..4682d959 100644 --- a/source/pkg/client/listers/sources/v1alpha1/redisstreamsource.go +++ b/pkg/source/client/listers/sources/v1alpha1/redisstreamsource.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) // RedisStreamSourceLister helps list RedisStreamSources. diff --git a/source/pkg/reconciler/rolebinding.go b/pkg/source/reconciler/rolebinding.go similarity index 98% rename from source/pkg/reconciler/rolebinding.go rename to pkg/source/reconciler/rolebinding.go index 3f4e35d5..39206b26 100644 --- a/source/pkg/reconciler/rolebinding.go +++ b/pkg/source/reconciler/rolebinding.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/reconciler/serviceaccount.go b/pkg/source/reconciler/serviceaccount.go similarity index 98% rename from source/pkg/reconciler/serviceaccount.go rename to pkg/source/reconciler/serviceaccount.go index 87d5f9ab..1b2a377a 100644 --- a/source/pkg/reconciler/serviceaccount.go +++ b/pkg/source/reconciler/serviceaccount.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/reconciler/statefulset.go b/pkg/source/reconciler/statefulset.go similarity index 98% rename from source/pkg/reconciler/statefulset.go rename to pkg/source/reconciler/statefulset.go index 93575eb4..0303e6f5 100644 --- a/source/pkg/reconciler/statefulset.go +++ b/pkg/source/reconciler/statefulset.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/reconciler/streamsource/config.go b/pkg/source/reconciler/streamsource/config.go similarity index 98% rename from source/pkg/reconciler/streamsource/config.go rename to pkg/source/reconciler/streamsource/config.go index 3ba45c3b..e94cf64e 100644 --- a/source/pkg/reconciler/streamsource/config.go +++ b/pkg/source/reconciler/streamsource/config.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/pkg/reconciler/streamsource/controller.go b/pkg/source/reconciler/streamsource/controller.go similarity index 91% rename from source/pkg/reconciler/streamsource/controller.go rename to pkg/source/reconciler/streamsource/controller.go index 7c2613ab..e390a5bf 100644 --- a/source/pkg/reconciler/streamsource/controller.go +++ b/pkg/source/reconciler/streamsource/controller.go @@ -36,10 +36,10 @@ import ( "knative.dev/pkg/resolver" "knative.dev/pkg/system" - "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - redisstreamsourceinformer "knative.dev/eventing-redis/source/pkg/client/injection/informers/sources/v1alpha1/redisstreamsource" - redisstreamsourcereconciler "knative.dev/eventing-redis/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource" - "knative.dev/eventing-redis/source/pkg/reconciler" + "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + redisstreamsourceinformer "knative.dev/eventing-redis/pkg/source/client/injection/informers/sources/v1alpha1/redisstreamsource" + redisstreamsourcereconciler "knative.dev/eventing-redis/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource" + "knative.dev/eventing-redis/pkg/source/reconciler" ) // envConfig will be used to extract the required environment variables using diff --git a/source/pkg/reconciler/streamsource/resources/labels.go b/pkg/source/reconciler/streamsource/resources/labels.go similarity index 100% rename from source/pkg/reconciler/streamsource/resources/labels.go rename to pkg/source/reconciler/streamsource/resources/labels.go diff --git a/source/pkg/reconciler/streamsource/resources/receive_adapter.go b/pkg/source/reconciler/streamsource/resources/receive_adapter.go similarity index 97% rename from source/pkg/reconciler/streamsource/resources/receive_adapter.go rename to pkg/source/reconciler/streamsource/resources/receive_adapter.go index 2eb7e927..fa07dc70 100644 --- a/source/pkg/reconciler/streamsource/resources/receive_adapter.go +++ b/pkg/source/reconciler/streamsource/resources/receive_adapter.go @@ -25,7 +25,7 @@ import ( "knative.dev/pkg/kmeta" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) func AdapterName(source *sourcesv1alpha1.RedisStreamSource) string { diff --git a/source/pkg/reconciler/streamsource/resources/receive_adapter_test.go b/pkg/source/reconciler/streamsource/resources/receive_adapter_test.go similarity index 97% rename from source/pkg/reconciler/streamsource/resources/receive_adapter_test.go rename to pkg/source/reconciler/streamsource/resources/receive_adapter_test.go index f92e9913..2903e5b7 100644 --- a/source/pkg/reconciler/streamsource/resources/receive_adapter_test.go +++ b/pkg/source/reconciler/streamsource/resources/receive_adapter_test.go @@ -22,9 +22,10 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" "knative.dev/pkg/kmeta" "knative.dev/pkg/kmp" + + v1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) func TestMakeReceiveAdapter(t *testing.T) { diff --git a/source/pkg/reconciler/streamsource/resources/role_binding.go b/pkg/source/reconciler/streamsource/resources/role_binding.go similarity index 92% rename from source/pkg/reconciler/streamsource/resources/role_binding.go rename to pkg/source/reconciler/streamsource/resources/role_binding.go index 7044867f..bd3c6aa3 100644 --- a/source/pkg/reconciler/streamsource/resources/role_binding.go +++ b/pkg/source/reconciler/streamsource/resources/role_binding.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/kmeta" - "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) func RoleBindingName(source *sourcesv1alpha1.RedisStreamSource) string { diff --git a/source/pkg/reconciler/streamsource/resources/service_account.go b/pkg/source/reconciler/streamsource/resources/service_account.go similarity index 100% rename from source/pkg/reconciler/streamsource/resources/service_account.go rename to pkg/source/reconciler/streamsource/resources/service_account.go diff --git a/source/pkg/reconciler/streamsource/streamsource.go b/pkg/source/reconciler/streamsource/streamsource.go similarity index 95% rename from source/pkg/reconciler/streamsource/streamsource.go rename to pkg/source/reconciler/streamsource/streamsource.go index eff5d60b..1e6eabc7 100644 --- a/source/pkg/reconciler/streamsource/streamsource.go +++ b/pkg/source/reconciler/streamsource/streamsource.go @@ -32,10 +32,10 @@ import ( eventingresources "knative.dev/eventing/pkg/reconciler/resources" reconcilersource "knative.dev/eventing/pkg/reconciler/source" - sourcesv1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - streamsourcereconciler "knative.dev/eventing-redis/source/pkg/client/injection/reconciler/sources/v1alpha1/redisstreamsource" - "knative.dev/eventing-redis/source/pkg/reconciler" - "knative.dev/eventing-redis/source/pkg/reconciler/streamsource/resources" + sourcesv1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + streamsourcereconciler "knative.dev/eventing-redis/pkg/source/client/injection/reconciler/sources/v1alpha1/redisstreamsource" + "knative.dev/eventing-redis/pkg/source/reconciler" + "knative.dev/eventing-redis/pkg/source/reconciler/streamsource/resources" ) const ( diff --git a/source/pkg/redis/scan.go b/pkg/source/redis/scan.go similarity index 100% rename from source/pkg/redis/scan.go rename to pkg/source/redis/scan.go diff --git a/source/pkg/redis/scan_test.go b/pkg/source/redis/scan_test.go similarity index 100% rename from source/pkg/redis/scan_test.go rename to pkg/source/redis/scan_test.go diff --git a/test/lib/listers.go b/test/lib/listers.go index 7f4e02d6..b84193bf 100644 --- a/test/lib/listers.go +++ b/test/lib/listers.go @@ -23,9 +23,9 @@ import ( fakeeventingclientset "knative.dev/eventing/pkg/client/clientset/versioned/fake" "knative.dev/pkg/reconciler/testing" - redissourcev1alpha1 "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" - fakeredissourceclientset "knative.dev/eventing-redis/source/pkg/client/clientset/versioned/fake" - redissourcev1alpha1listers "knative.dev/eventing-redis/source/pkg/client/listers/sources/v1alpha1" + redissourcev1alpha1 "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" + fakeredissourceclientset "knative.dev/eventing-redis/pkg/source/client/clientset/versioned/fake" + redissourcev1alpha1listers "knative.dev/eventing-redis/pkg/source/client/listers/sources/v1alpha1" ) var clientSetSchemes = []func(*runtime.Scheme) error{ diff --git a/test/lib/resources/streamsource.go b/test/lib/resources/streamsource.go index 558142bd..c84b4581 100644 --- a/test/lib/resources/streamsource.go +++ b/test/lib/resources/streamsource.go @@ -18,7 +18,8 @@ package resources import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/eventing-redis/source/pkg/apis/sources/v1alpha1" + + "knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1" ) // RedisStreamSourceOptionV1Alpha1 enables further configuration of a RedisStreamSource.