diff --git a/.gitattributes b/.gitattributes index 98610125da..91fd6e0fac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,15 +4,13 @@ **/zz_generated.*.go linguist-generated=true /pkg/client/** linguist-generated=true -/contrib/*/pkg/client/** linguist-generated=true -/kafka/*/pkg/client/** linguist-generated=true +/**/pkg/client/** linguist-generated=true # coverage-excluded is an attribute used to explicitly exclude a path from being included in code # coverage. If a path is marked as linguist-generated already, it will be implicitly excluded and # there is no need to add the coverage-excluded attribute /pkg/**/testing/** coverage-excluded=true -/contrib/*/pkg/**/testing/** coverage-excluded=true -/kafka/*/pkg/**/testing/** coverage-excluded=true +/**/pkg/**/testing/** coverage-excluded=true /vendor/** coverage-excluded=true /test/** coverage-excluded=true diff --git a/contrib/awssqs/cmd/controller/main.go b/awssqs/cmd/controller/main.go similarity index 92% rename from contrib/awssqs/cmd/controller/main.go rename to awssqs/cmd/controller/main.go index 7cd9266c57..ebfe332d24 100644 --- a/contrib/awssqs/cmd/controller/main.go +++ b/awssqs/cmd/controller/main.go @@ -19,8 +19,8 @@ package main import ( "log" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/reconciler" + "github.com/knative/eventing-contrib/awssqs/pkg/apis" + "github.com/knative/eventing-contrib/awssqs/pkg/reconciler" "go.uber.org/zap" "go.uber.org/zap/zapcore" "knative.dev/pkg/logging/logkey" diff --git a/contrib/awssqs/cmd/receive_adapter/main.go b/awssqs/cmd/receive_adapter/main.go similarity index 96% rename from contrib/awssqs/cmd/receive_adapter/main.go rename to awssqs/cmd/receive_adapter/main.go index 8a4bc0e131..1c2696614f 100644 --- a/contrib/awssqs/cmd/receive_adapter/main.go +++ b/awssqs/cmd/receive_adapter/main.go @@ -21,7 +21,7 @@ import ( "log" "os" - awssqs "github.com/knative/eventing-contrib/contrib/awssqs/pkg/adapter" + awssqs "github.com/knative/eventing-contrib/awssqs/pkg/adapter" "knative.dev/pkg/signals" "go.uber.org/zap" diff --git a/contrib/awssqs/config/100-namespace.yaml b/awssqs/config/100-namespace.yaml similarity index 100% rename from contrib/awssqs/config/100-namespace.yaml rename to awssqs/config/100-namespace.yaml diff --git a/contrib/awssqs/config/200-serviceaccount.yaml b/awssqs/config/200-serviceaccount.yaml similarity index 100% rename from contrib/awssqs/config/200-serviceaccount.yaml rename to awssqs/config/200-serviceaccount.yaml diff --git a/contrib/awssqs/config/201-clusterrole.yaml b/awssqs/config/201-clusterrole.yaml similarity index 100% rename from contrib/awssqs/config/201-clusterrole.yaml rename to awssqs/config/201-clusterrole.yaml diff --git a/contrib/awssqs/config/202-clusterrolebinding.yaml b/awssqs/config/202-clusterrolebinding.yaml similarity index 100% rename from contrib/awssqs/config/202-clusterrolebinding.yaml rename to awssqs/config/202-clusterrolebinding.yaml diff --git a/contrib/awssqs/config/300-awssqssource.yaml b/awssqs/config/300-awssqssource.yaml similarity index 100% rename from contrib/awssqs/config/300-awssqssource.yaml rename to awssqs/config/300-awssqssource.yaml diff --git a/contrib/awssqs/config/400-controller-service.yaml b/awssqs/config/400-controller-service.yaml similarity index 100% rename from contrib/awssqs/config/400-controller-service.yaml rename to awssqs/config/400-controller-service.yaml diff --git a/contrib/awssqs/config/500-controller.yaml b/awssqs/config/500-controller.yaml similarity index 88% rename from contrib/awssqs/config/500-controller.yaml rename to awssqs/config/500-controller.yaml index 00c769746a..fe3592d954 100644 --- a/contrib/awssqs/config/500-controller.yaml +++ b/awssqs/config/500-controller.yaml @@ -31,10 +31,10 @@ spec: control-plane: awssqs-controller-manager spec: containers: - - image: github.com/knative/eventing-contrib/contrib/awssqs/cmd/controller + - image: github.com/knative/eventing-contrib/awssqs/cmd/controller env: - name: AWSSQS_RA_IMAGE - value: github.com/knative/eventing-contrib/contrib/awssqs/cmd/receive_adapter + value: github.com/knative/eventing-contrib/awssqs/cmd/receive_adapter name: manager resources: limits: diff --git a/contrib/awssqs/config/600-istioegress.yaml b/awssqs/config/600-istioegress.yaml similarity index 100% rename from contrib/awssqs/config/600-istioegress.yaml rename to awssqs/config/600-istioegress.yaml diff --git a/contrib/awssqs/pkg/adapter/adapter.go b/awssqs/pkg/adapter/adapter.go similarity index 98% rename from contrib/awssqs/pkg/adapter/adapter.go rename to awssqs/pkg/adapter/adapter.go index d3111d3ba6..a277b8f7df 100644 --- a/contrib/awssqs/pkg/adapter/adapter.go +++ b/awssqs/pkg/adapter/adapter.go @@ -28,7 +28,7 @@ import ( "github.com/cloudevents/sdk-go/pkg/cloudevents" "github.com/cloudevents/sdk-go/pkg/cloudevents/client" "github.com/cloudevents/sdk-go/pkg/cloudevents/types" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" "github.com/knative/eventing-contrib/pkg/kncloudevents" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/contrib/awssqs/pkg/adapter/adapter_test.go b/awssqs/pkg/adapter/adapter_test.go similarity index 100% rename from contrib/awssqs/pkg/adapter/adapter_test.go rename to awssqs/pkg/adapter/adapter_test.go diff --git a/contrib/awssqs/pkg/apis/addtoscheme_eventing_v1alpha1.go b/awssqs/pkg/apis/addtoscheme_eventing_v1alpha1.go similarity index 100% rename from contrib/awssqs/pkg/apis/addtoscheme_eventing_v1alpha1.go rename to awssqs/pkg/apis/addtoscheme_eventing_v1alpha1.go diff --git a/contrib/awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go b/awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go similarity index 90% rename from contrib/awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go rename to awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go index 0284103d27..0c7cb92714 100644 --- a/contrib/awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go +++ b/awssqs/pkg/apis/addtoscheme_sources_v1alpha1.go @@ -16,7 +16,7 @@ limitations under the License. package apis -import "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" +import "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" func init() { // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back diff --git a/contrib/github/pkg/apis/apis.go b/awssqs/pkg/apis/apis.go similarity index 85% rename from contrib/github/pkg/apis/apis.go rename to awssqs/pkg/apis/apis.go index e2b6838f29..0b26fc6964 100644 --- a/contrib/github/pkg/apis/apis.go +++ b/awssqs/pkg/apis/apis.go @@ -15,7 +15,7 @@ limitations under the License. */ // Generate deepcopy for apis -//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../../../hack/boilerplate.go.txt +//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../../hack/boilerplate.go.txt // Package apis contains Kubernetes API groups. package apis diff --git a/contrib/awssqs/pkg/apis/sources/group.go b/awssqs/pkg/apis/sources/group.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/group.go rename to awssqs/pkg/apis/sources/group.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types.go b/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types.go rename to awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types_test.go b/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types_test.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types_test.go rename to awssqs/pkg/apis/sources/v1alpha1/aws_sqs_types_test.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/doc.go b/awssqs/pkg/apis/sources/v1alpha1/doc.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/doc.go rename to awssqs/pkg/apis/sources/v1alpha1/doc.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/register.go b/awssqs/pkg/apis/sources/v1alpha1/register.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/register.go rename to awssqs/pkg/apis/sources/v1alpha1/register.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/register_test.go b/awssqs/pkg/apis/sources/v1alpha1/register_test.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/register_test.go rename to awssqs/pkg/apis/sources/v1alpha1/register_test.go diff --git a/contrib/awssqs/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go b/awssqs/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from contrib/awssqs/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go rename to awssqs/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go diff --git a/contrib/github/pkg/client/clientset/versioned/clientset.go b/awssqs/pkg/client/clientset/versioned/clientset.go similarity index 95% rename from contrib/github/pkg/client/clientset/versioned/clientset.go rename to awssqs/pkg/client/clientset/versioned/clientset.go index ad8e51f40e..5190d66a38 100644 --- a/contrib/github/pkg/client/clientset/versioned/clientset.go +++ b/awssqs/pkg/client/clientset/versioned/clientset.go @@ -19,7 +19,7 @@ limitations under the License. package versioned import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/doc.go b/awssqs/pkg/client/clientset/versioned/doc.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/doc.go rename to awssqs/pkg/client/clientset/versioned/doc.go diff --git a/contrib/github/pkg/client/clientset/versioned/fake/clientset_generated.go b/awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 88% rename from contrib/github/pkg/client/clientset/versioned/fake/clientset_generated.go rename to awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go index 93949bcda5..4a075a502a 100644 --- a/contrib/github/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" - fakesourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake" + clientset "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" + fakesourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/fake/doc.go b/awssqs/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/fake/doc.go rename to awssqs/pkg/client/clientset/versioned/fake/doc.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/fake/register.go b/awssqs/pkg/client/clientset/versioned/fake/register.go similarity index 95% rename from contrib/awssqs/pkg/client/clientset/versioned/fake/register.go rename to awssqs/pkg/client/clientset/versioned/fake/register.go index f5a35de41a..cf8a4bc6aa 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/fake/register.go +++ b/awssqs/pkg/client/clientset/versioned/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/scheme/doc.go b/awssqs/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/scheme/doc.go rename to awssqs/pkg/client/clientset/versioned/scheme/doc.go diff --git a/contrib/github/pkg/client/clientset/versioned/scheme/register.go b/awssqs/pkg/client/clientset/versioned/scheme/register.go similarity index 95% rename from contrib/github/pkg/client/clientset/versioned/scheme/register.go rename to awssqs/pkg/client/clientset/versioned/scheme/register.go index 375e7113ca..d453eb070d 100644 --- a/contrib/github/pkg/client/clientset/versioned/scheme/register.go +++ b/awssqs/pkg/client/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go similarity index 96% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go index 895bc329c5..9d3f3ed538 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go +++ b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/awssqssource.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" - scheme "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" + scheme "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go similarity index 98% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go index 44f248e69e..b9c2c46e63 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go +++ b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_awssqssource.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go similarity index 90% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go index 4c552df9b5..d3011f559d 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go +++ b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go similarity index 100% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go similarity index 93% rename from contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go rename to awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go index f4e6e70740..2e14df010b 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go +++ b/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/contrib/github/pkg/client/informers/externalversions/factory.go b/awssqs/pkg/client/informers/externalversions/factory.go similarity index 94% rename from contrib/github/pkg/client/informers/externalversions/factory.go rename to awssqs/pkg/client/informers/externalversions/factory.go index 17501eaaca..6e50388a2a 100644 --- a/contrib/github/pkg/client/informers/externalversions/factory.go +++ b/awssqs/pkg/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/internalinterfaces" - sources "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/sources" + versioned "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned" + internalinterfaces "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" + sources "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/sources" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/awssqs/pkg/client/informers/externalversions/generic.go b/awssqs/pkg/client/informers/externalversions/generic.go similarity index 95% rename from contrib/awssqs/pkg/client/informers/externalversions/generic.go rename to awssqs/pkg/client/informers/externalversions/generic.go index ba4847f7c1..fb029b1479 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/generic.go +++ b/awssqs/pkg/client/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 92% rename from contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 7acf0b52a5..2b954e2a2b 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/awssqs/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned" + versioned "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/contrib/github/pkg/client/informers/externalversions/sources/interface.go b/awssqs/pkg/client/informers/externalversions/sources/interface.go similarity index 85% rename from contrib/github/pkg/client/informers/externalversions/sources/interface.go rename to awssqs/pkg/client/informers/externalversions/sources/interface.go index 71a478b106..4bce935776 100644 --- a/contrib/github/pkg/client/informers/externalversions/sources/interface.go +++ b/awssqs/pkg/client/informers/externalversions/sources/interface.go @@ -19,8 +19,8 @@ limitations under the License. package sources import ( - internalinterfaces "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/sources/v1alpha1" + internalinterfaces "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go b/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go similarity index 88% rename from contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go rename to awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go index b8c82875e2..867f957827 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go +++ b/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/awssqssource.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" - versioned "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/listers/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" + versioned "github.com/knative/eventing-contrib/awssqs/pkg/client/clientset/versioned" + internalinterfaces "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/client/listers/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go b/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go similarity index 91% rename from contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go rename to awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go index 5dc0d6773b..04e6e94b2d 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go +++ b/awssqs/pkg/client/informers/externalversions/sources/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/knative/eventing-contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/contrib/awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go b/awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go similarity index 97% rename from contrib/awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go rename to awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go index cbb0729589..04762f5ecd 100644 --- a/contrib/awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go +++ b/awssqs/pkg/client/listers/sources/v1alpha1/awssqssource.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/contrib/awssqs/pkg/client/listers/sources/v1alpha1/expansion_generated.go b/awssqs/pkg/client/listers/sources/v1alpha1/expansion_generated.go similarity index 100% rename from contrib/awssqs/pkg/client/listers/sources/v1alpha1/expansion_generated.go rename to awssqs/pkg/client/listers/sources/v1alpha1/expansion_generated.go diff --git a/contrib/awssqs/pkg/reconciler/awssqssource.go b/awssqs/pkg/reconciler/awssqssource.go similarity index 98% rename from contrib/awssqs/pkg/reconciler/awssqssource.go rename to awssqs/pkg/reconciler/awssqssource.go index b30eec19bf..8873fa191a 100644 --- a/contrib/awssqs/pkg/reconciler/awssqssource.go +++ b/awssqs/pkg/reconciler/awssqssource.go @@ -22,8 +22,8 @@ import ( "log" "os" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/reconciler/resources" + "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/awssqs/pkg/reconciler/resources" "github.com/knative/eventing-contrib/pkg/controller/sdk" "github.com/knative/eventing-contrib/pkg/controller/sinks" "github.com/knative/eventing-contrib/pkg/reconciler/eventtype" diff --git a/contrib/awssqs/pkg/reconciler/resources/receive_adapter.go b/awssqs/pkg/reconciler/resources/receive_adapter.go similarity index 97% rename from contrib/awssqs/pkg/reconciler/resources/receive_adapter.go rename to awssqs/pkg/reconciler/resources/receive_adapter.go index 8a126442ef..bb7b369213 100644 --- a/contrib/awssqs/pkg/reconciler/resources/receive_adapter.go +++ b/awssqs/pkg/reconciler/resources/receive_adapter.go @@ -19,7 +19,7 @@ package resources import ( "fmt" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/contrib/awssqs/samples/README.md b/awssqs/samples/README.md similarity index 100% rename from contrib/awssqs/samples/README.md rename to awssqs/samples/README.md diff --git a/contrib/awssqs/samples/awssqs-source.yaml b/awssqs/samples/awssqs-source.yaml similarity index 100% rename from contrib/awssqs/samples/awssqs-source.yaml rename to awssqs/samples/awssqs-source.yaml diff --git a/contrib/awssqs/samples/display-resources.yaml b/awssqs/samples/display-resources.yaml similarity index 100% rename from contrib/awssqs/samples/display-resources.yaml rename to awssqs/samples/display-resources.yaml diff --git a/contrib/github/cmd/controller/main.go b/github/cmd/controller/main.go similarity index 92% rename from contrib/github/cmd/controller/main.go rename to github/cmd/controller/main.go index a469c90d8e..7b339bad6a 100644 --- a/contrib/github/cmd/controller/main.go +++ b/github/cmd/controller/main.go @@ -19,8 +19,8 @@ package main import ( "log" - "github.com/knative/eventing-contrib/contrib/github/pkg/apis" - controller "github.com/knative/eventing-contrib/contrib/github/pkg/reconciler" + "github.com/knative/eventing-contrib/github/pkg/apis" + controller "github.com/knative/eventing-contrib/github/pkg/reconciler" "go.uber.org/zap" "go.uber.org/zap/zapcore" "knative.dev/pkg/logging/logkey" diff --git a/contrib/github/cmd/receive_adapter/main.go b/github/cmd/receive_adapter/main.go similarity index 97% rename from contrib/github/cmd/receive_adapter/main.go rename to github/cmd/receive_adapter/main.go index d5b95682dc..c9d4322410 100644 --- a/contrib/github/cmd/receive_adapter/main.go +++ b/github/cmd/receive_adapter/main.go @@ -23,7 +23,7 @@ import ( "net/http" "os" - github "github.com/knative/eventing-contrib/contrib/github/pkg/adapter" + github "github.com/knative/eventing-contrib/github/pkg/adapter" gh "gopkg.in/go-playground/webhooks.v5/github" ) diff --git a/contrib/github/config/100-namespace.yaml b/github/config/100-namespace.yaml similarity index 100% rename from contrib/github/config/100-namespace.yaml rename to github/config/100-namespace.yaml diff --git a/contrib/github/config/200-serviceaccount.yaml b/github/config/200-serviceaccount.yaml similarity index 100% rename from contrib/github/config/200-serviceaccount.yaml rename to github/config/200-serviceaccount.yaml diff --git a/contrib/github/config/201-clusterrole.yaml b/github/config/201-clusterrole.yaml similarity index 100% rename from contrib/github/config/201-clusterrole.yaml rename to github/config/201-clusterrole.yaml diff --git a/contrib/github/config/202-clusterrolebinding.yaml b/github/config/202-clusterrolebinding.yaml similarity index 100% rename from contrib/github/config/202-clusterrolebinding.yaml rename to github/config/202-clusterrolebinding.yaml diff --git a/contrib/github/config/300-githubsource.yaml b/github/config/300-githubsource.yaml similarity index 100% rename from contrib/github/config/300-githubsource.yaml rename to github/config/300-githubsource.yaml diff --git a/contrib/github/config/400-controller-service.yaml b/github/config/400-controller-service.yaml similarity index 100% rename from contrib/github/config/400-controller-service.yaml rename to github/config/400-controller-service.yaml diff --git a/contrib/github/config/500-controller.yaml b/github/config/500-controller.yaml similarity index 88% rename from contrib/github/config/500-controller.yaml rename to github/config/500-controller.yaml index baa6ab26e9..00fe4177ed 100644 --- a/contrib/github/config/500-controller.yaml +++ b/github/config/500-controller.yaml @@ -31,11 +31,11 @@ spec: spec: serviceAccountName: github-controller-manager containers: - - image: github.com/knative/eventing-contrib/contrib/github/cmd/controller + - image: github.com/knative/eventing-contrib/github/cmd/controller name: manager env: - name: GH_RA_IMAGE - value: github.com/knative/eventing-contrib/contrib/github/cmd/receive_adapter + value: github.com/knative/eventing-contrib/github/cmd/receive_adapter resources: requests: cpu: 100m diff --git a/contrib/github/pkg/adapter/OWNERS b/github/pkg/adapter/OWNERS similarity index 100% rename from contrib/github/pkg/adapter/OWNERS rename to github/pkg/adapter/OWNERS diff --git a/contrib/github/pkg/adapter/adapter.go b/github/pkg/adapter/adapter.go similarity index 98% rename from contrib/github/pkg/adapter/adapter.go rename to github/pkg/adapter/adapter.go index 7eb5278332..e652bc6cd1 100644 --- a/contrib/github/pkg/adapter/adapter.go +++ b/github/pkg/adapter/adapter.go @@ -25,7 +25,7 @@ import ( "strings" cloudevents "github.com/cloudevents/sdk-go" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" "github.com/knative/eventing-contrib/pkg/kncloudevents" gh "gopkg.in/go-playground/webhooks.v5/github" ) diff --git a/contrib/github/pkg/adapter/adapter_test.go b/github/pkg/adapter/adapter_test.go similarity index 99% rename from contrib/github/pkg/adapter/adapter_test.go rename to github/pkg/adapter/adapter_test.go index 67b6ac5715..f1ce64c012 100644 --- a/contrib/github/pkg/adapter/adapter_test.go +++ b/github/pkg/adapter/adapter_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" "github.com/google/go-cmp/cmp" diff --git a/contrib/github/pkg/apis/addtoscheme_eventing_v1alpha1.go b/github/pkg/apis/addtoscheme_eventing_v1alpha1.go similarity index 100% rename from contrib/github/pkg/apis/addtoscheme_eventing_v1alpha1.go rename to github/pkg/apis/addtoscheme_eventing_v1alpha1.go diff --git a/contrib/github/pkg/apis/addtoscheme_serving_v1beta1.go b/github/pkg/apis/addtoscheme_serving_v1beta1.go similarity index 100% rename from contrib/github/pkg/apis/addtoscheme_serving_v1beta1.go rename to github/pkg/apis/addtoscheme_serving_v1beta1.go diff --git a/contrib/github/pkg/apis/addtoscheme_sources_v1alpha1.go b/github/pkg/apis/addtoscheme_sources_v1alpha1.go similarity index 90% rename from contrib/github/pkg/apis/addtoscheme_sources_v1alpha1.go rename to github/pkg/apis/addtoscheme_sources_v1alpha1.go index 6db1a357ee..0ad79ee967 100644 --- a/contrib/github/pkg/apis/addtoscheme_sources_v1alpha1.go +++ b/github/pkg/apis/addtoscheme_sources_v1alpha1.go @@ -16,7 +16,7 @@ limitations under the License. package apis -import "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" +import "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" func init() { // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back diff --git a/contrib/awssqs/pkg/apis/apis.go b/github/pkg/apis/apis.go similarity index 85% rename from contrib/awssqs/pkg/apis/apis.go rename to github/pkg/apis/apis.go index e2b6838f29..0b26fc6964 100644 --- a/contrib/awssqs/pkg/apis/apis.go +++ b/github/pkg/apis/apis.go @@ -15,7 +15,7 @@ limitations under the License. */ // Generate deepcopy for apis -//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../../../hack/boilerplate.go.txt +//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../../hack/boilerplate.go.txt // Package apis contains Kubernetes API groups. package apis diff --git a/contrib/github/pkg/apis/sources/group.go b/github/pkg/apis/sources/group.go similarity index 100% rename from contrib/github/pkg/apis/sources/group.go rename to github/pkg/apis/sources/group.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/doc.go b/github/pkg/apis/sources/v1alpha1/doc.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/doc.go rename to github/pkg/apis/sources/v1alpha1/doc.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/githubsource_types.go b/github/pkg/apis/sources/v1alpha1/githubsource_types.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/githubsource_types.go rename to github/pkg/apis/sources/v1alpha1/githubsource_types.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/githubsource_types_test.go b/github/pkg/apis/sources/v1alpha1/githubsource_types_test.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/githubsource_types_test.go rename to github/pkg/apis/sources/v1alpha1/githubsource_types_test.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/register.go b/github/pkg/apis/sources/v1alpha1/register.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/register.go rename to github/pkg/apis/sources/v1alpha1/register.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/register_test.go b/github/pkg/apis/sources/v1alpha1/register_test.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/register_test.go rename to github/pkg/apis/sources/v1alpha1/register_test.go diff --git a/contrib/github/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go b/github/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from contrib/github/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go rename to github/pkg/apis/sources/v1alpha1/zz_generated.deepcopy.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/clientset.go b/github/pkg/client/clientset/versioned/clientset.go similarity index 95% rename from contrib/awssqs/pkg/client/clientset/versioned/clientset.go rename to github/pkg/client/clientset/versioned/clientset.go index 1f492500af..da7d2fd62f 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/clientset.go +++ b/github/pkg/client/clientset/versioned/clientset.go @@ -19,7 +19,7 @@ limitations under the License. package versioned import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/contrib/github/pkg/client/clientset/versioned/doc.go b/github/pkg/client/clientset/versioned/doc.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/doc.go rename to github/pkg/client/clientset/versioned/doc.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go b/github/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 88% rename from contrib/awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go rename to github/pkg/client/clientset/versioned/fake/clientset_generated.go index d1cbeb1e22..81ef294113 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/github/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1" - fakesourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake" + clientset "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" + fakesourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/contrib/github/pkg/client/clientset/versioned/fake/doc.go b/github/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/fake/doc.go rename to github/pkg/client/clientset/versioned/fake/doc.go diff --git a/contrib/github/pkg/client/clientset/versioned/fake/register.go b/github/pkg/client/clientset/versioned/fake/register.go similarity index 95% rename from contrib/github/pkg/client/clientset/versioned/fake/register.go rename to github/pkg/client/clientset/versioned/fake/register.go index 3f955b4ac5..144c816fd0 100644 --- a/contrib/github/pkg/client/clientset/versioned/fake/register.go +++ b/github/pkg/client/clientset/versioned/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/github/pkg/client/clientset/versioned/scheme/doc.go b/github/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/scheme/doc.go rename to github/pkg/client/clientset/versioned/scheme/doc.go diff --git a/contrib/awssqs/pkg/client/clientset/versioned/scheme/register.go b/github/pkg/client/clientset/versioned/scheme/register.go similarity index 95% rename from contrib/awssqs/pkg/client/clientset/versioned/scheme/register.go rename to github/pkg/client/clientset/versioned/scheme/register.go index b1086e2c0c..3a0d0edb55 100644 --- a/contrib/awssqs/pkg/client/clientset/versioned/scheme/register.go +++ b/github/pkg/client/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/doc.go diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/doc.go diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go similarity index 98% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go index f12b41a333..c37c1e354a 100644 --- a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go +++ b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_githubsource.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go similarity index 90% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go index 303b5e418b..19da5ee544 100644 --- a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go +++ b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/fake/fake_sources_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go similarity index 100% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/generated_expansion.go diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go similarity index 96% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go index ac88fe2742..59d005ce85 100644 --- a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go +++ b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/githubsource.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" - scheme "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" + scheme "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go similarity index 93% rename from contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go rename to github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go index af8f88c3e7..a6d0a8bcd3 100644 --- a/contrib/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go +++ b/github/pkg/client/clientset/versioned/typed/sources/v1alpha1/sources_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" - "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned/scheme" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) diff --git a/contrib/awssqs/pkg/client/informers/externalversions/factory.go b/github/pkg/client/informers/externalversions/factory.go similarity index 94% rename from contrib/awssqs/pkg/client/informers/externalversions/factory.go rename to github/pkg/client/informers/externalversions/factory.go index 88506b56a3..ef28d8ed07 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/factory.go +++ b/github/pkg/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" - sources "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/sources" + versioned "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned" + internalinterfaces "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/internalinterfaces" + sources "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/sources" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/contrib/github/pkg/client/informers/externalversions/generic.go b/github/pkg/client/informers/externalversions/generic.go similarity index 95% rename from contrib/github/pkg/client/informers/externalversions/generic.go rename to github/pkg/client/informers/externalversions/generic.go index 007e009e4e..019fe278be 100644 --- a/contrib/github/pkg/client/informers/externalversions/generic.go +++ b/github/pkg/client/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/contrib/github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 92% rename from contrib/github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index a1a83538d9..88bc6432ed 100644 --- a/contrib/github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/github/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned" + versioned "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/contrib/awssqs/pkg/client/informers/externalversions/sources/interface.go b/github/pkg/client/informers/externalversions/sources/interface.go similarity index 85% rename from contrib/awssqs/pkg/client/informers/externalversions/sources/interface.go rename to github/pkg/client/informers/externalversions/sources/interface.go index 4858840600..b9c2a78c2a 100644 --- a/contrib/awssqs/pkg/client/informers/externalversions/sources/interface.go +++ b/github/pkg/client/informers/externalversions/sources/interface.go @@ -19,8 +19,8 @@ limitations under the License. package sources import ( - internalinterfaces "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/eventing-contrib/contrib/awssqs/pkg/client/informers/externalversions/sources/v1alpha1" + internalinterfaces "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/sources/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go b/github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go similarity index 88% rename from contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go rename to github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go index bbc579e63a..828595ab17 100644 --- a/contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go +++ b/github/pkg/client/informers/externalversions/sources/v1alpha1/githubsource.go @@ -21,10 +21,10 @@ package v1alpha1 import ( time "time" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" - versioned "github.com/knative/eventing-contrib/contrib/github/pkg/client/clientset/versioned" - internalinterfaces "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/client/listers/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" + versioned "github.com/knative/eventing-contrib/github/pkg/client/clientset/versioned" + internalinterfaces "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/client/listers/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go b/github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go similarity index 91% rename from contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go rename to github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go index 0d0fbe419c..00055ed255 100644 --- a/contrib/github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go +++ b/github/pkg/client/informers/externalversions/sources/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/knative/eventing-contrib/contrib/github/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/knative/eventing-contrib/github/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/contrib/github/pkg/client/listers/sources/v1alpha1/expansion_generated.go b/github/pkg/client/listers/sources/v1alpha1/expansion_generated.go similarity index 100% rename from contrib/github/pkg/client/listers/sources/v1alpha1/expansion_generated.go rename to github/pkg/client/listers/sources/v1alpha1/expansion_generated.go diff --git a/contrib/github/pkg/client/listers/sources/v1alpha1/githubsource.go b/github/pkg/client/listers/sources/v1alpha1/githubsource.go similarity index 97% rename from contrib/github/pkg/client/listers/sources/v1alpha1/githubsource.go rename to github/pkg/client/listers/sources/v1alpha1/githubsource.go index 3c73b7e38b..0a4125811c 100644 --- a/contrib/github/pkg/client/listers/sources/v1alpha1/githubsource.go +++ b/github/pkg/client/listers/sources/v1alpha1/githubsource.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + v1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/contrib/github/pkg/reconciler/OWNERS b/github/pkg/reconciler/OWNERS similarity index 100% rename from contrib/github/pkg/reconciler/OWNERS rename to github/pkg/reconciler/OWNERS diff --git a/contrib/github/pkg/reconciler/doc.go b/github/pkg/reconciler/doc.go similarity index 100% rename from contrib/github/pkg/reconciler/doc.go rename to github/pkg/reconciler/doc.go diff --git a/contrib/github/pkg/reconciler/githubsource.go b/github/pkg/reconciler/githubsource.go similarity index 98% rename from contrib/github/pkg/reconciler/githubsource.go rename to github/pkg/reconciler/githubsource.go index 0d32dbb8f9..56bcdb6a7b 100644 --- a/contrib/github/pkg/reconciler/githubsource.go +++ b/github/pkg/reconciler/githubsource.go @@ -23,8 +23,8 @@ import ( "os" "strings" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" - "github.com/knative/eventing-contrib/contrib/github/pkg/reconciler/resources" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/github/pkg/reconciler/resources" "github.com/knative/eventing-contrib/pkg/controller/sdk" "github.com/knative/eventing-contrib/pkg/controller/sinks" "github.com/knative/eventing-contrib/pkg/reconciler/eventtype" diff --git a/contrib/github/pkg/reconciler/githubsource_test.go b/github/pkg/reconciler/githubsource_test.go similarity index 99% rename from contrib/github/pkg/reconciler/githubsource_test.go rename to github/pkg/reconciler/githubsource_test.go index 8dc31a74d2..9fb1044941 100644 --- a/contrib/github/pkg/reconciler/githubsource_test.go +++ b/github/pkg/reconciler/githubsource_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" - "github.com/knative/eventing-contrib/contrib/github/pkg/reconciler/resources" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/github/pkg/reconciler/resources" controllertesting "github.com/knative/eventing-contrib/pkg/controller/testing" "github.com/knative/eventing-contrib/pkg/reconciler/eventtype" eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1" diff --git a/contrib/github/pkg/reconciler/resources/labels.go b/github/pkg/reconciler/resources/labels.go similarity index 100% rename from contrib/github/pkg/reconciler/resources/labels.go rename to github/pkg/reconciler/resources/labels.go diff --git a/contrib/github/pkg/reconciler/resources/service.go b/github/pkg/reconciler/resources/service.go similarity index 95% rename from contrib/github/pkg/reconciler/resources/service.go rename to github/pkg/reconciler/resources/service.go index 6d7056633f..778575676b 100644 --- a/contrib/github/pkg/reconciler/resources/service.go +++ b/github/pkg/reconciler/resources/service.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - sourcesv1alpha1 "github.com/knative/eventing-contrib/contrib/github/pkg/apis/sources/v1alpha1" + sourcesv1alpha1 "github.com/knative/eventing-contrib/github/pkg/apis/sources/v1alpha1" servingv1beta1 "github.com/knative/serving/pkg/apis/serving/v1beta1" ) diff --git a/contrib/github/pkg/reconciler/webhook_client.go b/github/pkg/reconciler/webhook_client.go similarity index 100% rename from contrib/github/pkg/reconciler/webhook_client.go rename to github/pkg/reconciler/webhook_client.go diff --git a/contrib/github/samples/githubsource.yaml b/github/samples/githubsource.yaml similarity index 100% rename from contrib/github/samples/githubsource.yaml rename to github/samples/githubsource.yaml diff --git a/hack/release.sh b/hack/release.sh index c3d46476ed..bf400a77d6 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -22,13 +22,13 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/release.sh # Yaml files to generate, and the source config dir for them. declare -A COMPONENTS COMPONENTS=( - ["github.yaml"]="contrib/github/config" + ["github.yaml"]="github/config" ["gcppubsub.yaml"]="gcppubsub/config" ["event-display.yaml"]="config/tools/event-display" ["camel.yaml"]="camel/source/config" ["kafka-importer.yaml"]="kafka/source/config" ["kafka-channel.yaml"]="kafka/channel/config" - ["awssqs.yaml"]="contrib/awssqs/config" + ["awssqs.yaml"]="awssqs/config" ) readonly COMPONENTS diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 57f5884296..39995142a7 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -23,9 +23,9 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)} # Generate based on annotations -go generate ./pkg/... ./cmd/... ./contrib/github/pkg/... ./gcppubsub/pkg/... ./camel/source/pkg/... ./kafka/source/pkg/... ./kafka/channel/pkg/... ./contrib/awssqs/pkg/... +go generate ./pkg/... ./cmd/... ./github/pkg/... ./gcppubsub/pkg/... ./camel/source/pkg/... ./kafka/source/pkg/... ./kafka/channel/pkg/... ./awssqs/pkg/... -API_DIRS=(contrib/github/pkg gcppubsub/pkg camel/source/pkg kafka/source/pkg contrib/awssqs/pkg) +API_DIRS=(github/pkg gcppubsub/pkg camel/source/pkg kafka/source/pkg awssqs/pkg) for DIR in "${API_DIRS[@]}"; do # generate the code with: diff --git a/hack/update-deps.sh b/hack/update-deps.sh index 1ffac77c35..f602b09617 100755 --- a/hack/update-deps.sh +++ b/hack/update-deps.sh @@ -30,4 +30,4 @@ rm -rf $(find vendor/ -name 'BUILD') rm -rf $(find vendor/ -name 'BUILD.bazel') rm -fr vendor/knative.dev/test-infra/devstats -update_licenses third_party/VENDOR-LICENSE "./cmd/*" "./contrib/github/cmd/*" "./gcppubsub/cmd/*" "./camel/source/cmd/*" "./kafka/source/cmd/*" "./kafka/channel/cmd/*" "./contrib/awssqs/cmd/*" +update_licenses third_party/VENDOR-LICENSE "./cmd/*" "./github/cmd/*" "./gcppubsub/cmd/*" "./camel/source/cmd/*" "./kafka/source/cmd/*" "./kafka/channel/cmd/*" "./awssqs/cmd/*" diff --git a/pkg/controller/sdk/finalizers_accessor_test.go b/pkg/controller/sdk/finalizers_accessor_test.go index 584ea383a9..387423d245 100644 --- a/pkg/controller/sdk/finalizers_accessor_test.go +++ b/pkg/controller/sdk/finalizers_accessor_test.go @@ -19,7 +19,7 @@ package sdk import ( "testing" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/controller/sdk/status_accessor_test.go b/pkg/controller/sdk/status_accessor_test.go index 99c48d6612..f86b955f1a 100644 --- a/pkg/controller/sdk/status_accessor_test.go +++ b/pkg/controller/sdk/status_accessor_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/knative/eventing-contrib/contrib/awssqs/pkg/apis/sources/v1alpha1" + "github.com/knative/eventing-contrib/awssqs/pkg/apis/sources/v1alpha1" duckv1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" )