Alias functional options

Author: maxsmythe

pkg/cache/cache.go

@@ -44,13 +44,15 @@ var (
 	defaultSyncPeriod = 10 * time.Hour
 )
 
+type InformerGetOptions internal.GetOptions
+
 // InformerGetOption defines an option that alters the behavior of how informers are retrieved.
-type InformerGetOption func(*internal.GetOptions)
+type InformerGetOption func(*InformerGetOptions)
 
 // BlockUntilSynced determines whether a get request for an informer should block
 // until the informer's cache has synced.
 func BlockUntilSynced(shouldBlock bool) InformerGetOption {
-	return func(opts *internal.GetOptions) {
+	return func(opts *InformerGetOptions) {
 		opts.BlockUntilSynced = &shouldBlock
 	}
 }

pkg/cache/informer_cache.go

@@ -142,11 +142,11 @@ func (ic *informerCache) objectTypeForListObject(list client.ObjectList) (*schem
 }
 
 func applyGetOptions(opts ...InformerGetOption) *internal.GetOptions {
-	cfg := &internal.GetOptions{}
+	cfg := &InformerGetOptions{}
 	for _, opt := range opts {
 		opt(cfg)
 	}
-	return cfg
+	return (*internal.GetOptions)(cfg)
 }
 
 // GetInformerForKind returns the informer for the GroupVersionKind. If no informer exists, one will be started.

pkg/cache/internal/informers.go

@@ -267,8 +267,8 @@ func (ip *Informers) Get(ctx context.Context, gvk schema.GroupVersionKind, obj r
 	}
 
 	shouldBlock := true
-	if cfg.BlockUntilSynced != nil {
-		shouldBlock = *cfg.BlockUntilSynced
+	if opts.BlockUntilSynced != nil {
+		shouldBlock = *opts.BlockUntilSynced
 	}
 
 	if shouldBlock && started && !i.Informer.HasSynced() {