Skip to content

golang format tools #1415

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
mattmoor-sockpuppet wants to merge 1 commit into from
Closed

golang format tools #1415

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pkg/duck/addressable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ import (
"context"
"sync"

"time"

"github.com/knative/pkg/apis/duck"
"github.com/knative/pkg/apis/duck/v1alpha1"
"github.com/knative/pkg/controller"
"github.com/knative/pkg/injection/clients/dynamicclient"
"github.com/knative/pkg/tracker"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"github.com/knative/pkg/injection/clients/dynamicclient"
"k8s.io/client-go/tools/cache"
"time"
"github.com/knative/pkg/tracker"
)

// AddressableInformer is an informer that allows tracking arbitrary Addressables.
Expand Down Expand Up @@ -77,9 +78,9 @@ func NewAddressableInformer(ctx context.Context) AddressableInformer {
}

func (i *addressableInformer) NewTracker(callback func(string), lease time.Duration) AddressableTracker {
return &addressableTracker {
return &addressableTracker{
informer: i,
tracker: tracker.New(callback, lease),
tracker: tracker.New(callback, lease),
concrete: map[schema.GroupVersionResource]struct{}{},
}
}
Expand Down Expand Up @@ -112,9 +113,9 @@ func (i *addressableInformer) ensureInformer(ref corev1.ObjectReference) (cache.
return informer, nil
}

type addressableTracker struct{
type addressableTracker struct {
informer *addressableInformer
tracker tracker.Interface
tracker tracker.Interface

concrete map[schema.GroupVersionResource]struct{}
concreteLock sync.RWMutex
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/sequence/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ func NewController(
addressableInformer := duck.NewAddressableInformer(ctx)

r := &Reconciler{
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
sequenceLister: sequenceInformer.Lister(),
subscriptionLister: subscriptionInformer.Lister(),
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
sequenceLister: sequenceInformer.Lister(),
subscriptionLister: subscriptionInformer.Lister(),
}
impl := controller.NewImpl(r, r.Logger, ReconcilerName)

Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/sequence/sequence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ type Reconciler struct {
*reconciler.Base

// listers index properties about resources
sequenceLister listers.SequenceLister
tracker tracker.Interface
addressableTracker duck.AddressableTracker
subscriptionLister eventinglisters.SubscriptionLister
sequenceLister listers.SequenceLister
tracker tracker.Interface
addressableTracker duck.AddressableTracker
subscriptionLister eventinglisters.SubscriptionLister
}

// Check that our Reconciler implements controller.Reconciler
Expand Down
13 changes: 7 additions & 6 deletions pkg/reconciler/sequence/sequence_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ import (
"k8s.io/client-go/kubernetes/scheme"
clientgotesting "k8s.io/client-go/testing"

"time"

eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
"github.com/knative/eventing/pkg/apis/messaging/v1alpha1"
"github.com/knative/eventing/pkg/duck"
"github.com/knative/eventing/pkg/reconciler"
"github.com/knative/eventing/pkg/reconciler/sequence/resources"
. "github.com/knative/eventing/pkg/reconciler/testing"
reconciletesting "github.com/knative/eventing/pkg/reconciler/testing"
"time"
"github.com/knative/eventing/pkg/duck"
)

const (
Expand Down Expand Up @@ -492,10 +493,10 @@ func TestAllCases(t *testing.T) {
defer logtesting.ClearAll()
table.Test(t, MakeFactory(func(ctx context.Context, listers *Listers, cmw configmap.Watcher) controller.Reconciler {
return &Reconciler{
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
sequenceLister: listers.GetSequenceLister(),
addressableTracker: fakeAddressableTracker{},
subscriptionLister: listers.GetSubscriptionLister(),
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
sequenceLister: listers.GetSequenceLister(),
addressableTracker: fakeAddressableTracker{},
subscriptionLister: listers.GetSubscriptionLister(),
}
}, false))
}
5 changes: 2 additions & 3 deletions pkg/reconciler/subscription/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ type Reconciler struct {
*reconciler.Base

// listers index properties about resources
subscriptionLister listers.SubscriptionLister
subscriptionLister listers.SubscriptionLister
customResourceDefinitionLister apiextensionslisters.CustomResourceDefinitionLister
addressableTracker eventingduck.AddressableTracker
addressableTracker eventingduck.AddressableTracker
}

// Check that our Reconciler implements controller.Reconciler
Expand Down Expand Up @@ -130,7 +130,6 @@ func (r *Reconciler) reconcile(ctx context.Context, subscription *v1alpha1.Subsc
return err
}


// Track the channel using the addressableTracker.
// We don't need the explicitly set a channelInformer, as this will dynamically generate one for us.
// This code needs to be called before checking the existence of the `channel`, in order to make sure the
Expand Down
5 changes: 3 additions & 2 deletions pkg/reconciler/subscription/subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ import (
"k8s.io/client-go/kubernetes/scheme"
clientgotesting "k8s.io/client-go/testing"

"time"

"github.com/knative/eventing/pkg/duck"
. "github.com/knative/eventing/pkg/reconciler/testing"
. "github.com/knative/pkg/reconciler/testing"
"github.com/knative/eventing/pkg/duck"
"time"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions pkg/reconciler/trigger/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ func NewController(
addressableInformer := duck.NewAddressableInformer(ctx)

r := &Reconciler{
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
triggerLister: triggerInformer.Lister(),
channelLister: channelInformer.Lister(),
subscriptionLister: subscriptionInformer.Lister(),
brokerLister: brokerInformer.Lister(),
serviceLister: serviceInformer.Lister(),
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
triggerLister: triggerInformer.Lister(),
channelLister: channelInformer.Lister(),
subscriptionLister: subscriptionInformer.Lister(),
brokerLister: brokerInformer.Lister(),
serviceLister: serviceInformer.Lister(),
}
impl := controller.NewImpl(r, r.Logger, ReconcilerName)

Expand Down
12 changes: 6 additions & 6 deletions pkg/reconciler/trigger/trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ const (
type Reconciler struct {
*reconciler.Base

triggerLister listers.TriggerLister
channelLister listers.ChannelLister
subscriptionLister listers.SubscriptionLister
brokerLister listers.BrokerLister
serviceLister corev1listers.ServiceLister
addressableTracker duck.AddressableTracker
triggerLister listers.TriggerLister
channelLister listers.ChannelLister
subscriptionLister listers.SubscriptionLister
brokerLister listers.BrokerLister
serviceLister corev1listers.ServiceLister
addressableTracker duck.AddressableTracker
}

var brokerGVK = v1alpha1.SchemeGroupVersion.WithKind("Broker")
Expand Down
17 changes: 9 additions & 8 deletions pkg/reconciler/trigger/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ import (

. "github.com/knative/pkg/reconciler/testing"

. "github.com/knative/eventing/pkg/reconciler/testing"
"time"

"github.com/knative/eventing/pkg/duck"
. "github.com/knative/eventing/pkg/reconciler/testing"
)

const (
Expand Down Expand Up @@ -500,13 +501,13 @@ func TestAllCases(t *testing.T) {
defer logtesting.ClearAll()
table.Test(t, MakeFactory(func(ctx context.Context, listers *Listers, cmw configmap.Watcher) controller.Reconciler {
return &Reconciler{
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
triggerLister: listers.GetTriggerLister(),
channelLister: listers.GetChannelLister(),
subscriptionLister: listers.GetSubscriptionLister(),
brokerLister: listers.GetBrokerLister(),
serviceLister: listers.GetK8sServiceLister(),
addressableTracker: fakeAddressableTracker{},
Base: reconciler.NewBase(ctx, controllerAgentName, cmw),
triggerLister: listers.GetTriggerLister(),
channelLister: listers.GetChannelLister(),
subscriptionLister: listers.GetSubscriptionLister(),
brokerLister: listers.GetBrokerLister(),
serviceLister: listers.GetK8sServiceLister(),
addressableTracker: fakeAddressableTracker{},
}
},
false,
Expand Down
2 changes: 1 addition & 1 deletion test/base/resources/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func EventWatcherClusterRole(crName string) *rbacv1.ClusterRole {
Name: crName,
},
Rules: []rbacv1.PolicyRule{
rbacv1.PolicyRule{
{
APIGroups: []string{rbacv1.APIGroupAll},
Resources: []string{"events"},
Verbs: []string{"get", "list", "watch"},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/source_api_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestApiServerSource(t *testing.T) {
// create the ApiServerSource
// apiServerSourceResources is the list of resources to watch for this ApiServerSource
apiServerSourceResources := []sourcesv1alpha1.ApiServerResource{
sourcesv1alpha1.ApiServerResource{
{
APIVersion: "v1",
Kind: "Event",
},
Expand Down