Create MustExtractGVK type

Author: Kate Osborn

internal/framework/kinds/kinds.go

@@ -1,5 +1,10 @@
 package kinds
 
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
 // Gateway API Kinds
 const (
 	// Gateway is the Gateway Kind
@@ -19,3 +24,7 @@ const (
 	// NginxProxy is the NginxProxy kind.
 	NginxProxy = "NginxProxy"
 )
+
+// MustExtractGVK is a function that extracts the GroupVersionKind (GVK) of a client.object.
+// It will panic if the GKV cannot be extracted.
+type MustExtractGVK func(object client.Object) schema.GroupVersionKind

internal/mode/static/manager.go

@@ -43,6 +43,7 @@ import (
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/events"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers"
+	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/runnables"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/status"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config"
@@ -290,7 +291,7 @@ func StartManager(cfg config.Config) error {
 }
 
 func createPolicyManager(
-	mustExtractGVK func(object client.Object) schema.GroupVersionKind,
+	mustExtractGVK kinds.MustExtractGVK,
 	validator validation.GenericValidator,
 ) *policies.Manager {
 	cfgs := []policies.ManagerConfig{

internal/mode/static/policies/manager.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds"
 )
 
 // GenerateFunc generates config as []byte for an NGF Policy.
@@ -24,7 +25,7 @@ type Validator interface {
 type Manager struct {
 	validators     map[schema.GroupVersionKind]Validator
 	generators     map[schema.GroupVersionKind]GenerateFunc
-	mustExtractGVK func(client.Object) schema.GroupVersionKind
+	mustExtractGVK kinds.MustExtractGVK
 }
 
 // ManagerConfig contains the config to register a Policy with the Manager.
@@ -40,7 +41,7 @@ type ManagerConfig struct {
 // NewManager returns a new Manager.
 // Implements dataplane.ConfigGenerator and validation.PolicyValidator.
 func NewManager(
-	mustExtractGVK func(client.Object) schema.GroupVersionKind,
+	mustExtractGVK kinds.MustExtractGVK,
 	configs ...ManagerConfig,
 ) *Manager {
 	v := &Manager{

internal/mode/static/state/change_processor.go

@@ -41,8 +41,6 @@ const (
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ChangeProcessor
 
-type extractGVKFunc func(obj client.Object) schema.GroupVersionKind
-
 // ChangeProcessor processes the changes to resources and produces a graph-like representation
 // of the Gateway configuration. It only supports one GatewayClass resource.
 type ChangeProcessor interface {

internal/mode/static/state/store.go

@@ -8,6 +8,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/policies"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph"
 )
@@ -29,13 +30,13 @@ type objectStore interface {
 // A single store should be used to store all types of policies.Policy.
 type ngfPolicyObjectStore struct {
 	policies       map[graph.PolicyKey]policies.Policy
-	extractGVKFunc extractGVKFunc
+	extractGVKFunc kinds.MustExtractGVK
 }
 
 // newNGFPolicyObjectStore returns a new ngfPolicyObjectStore.
 func newNGFPolicyObjectStore(
 	policies map[graph.PolicyKey]policies.Policy,
-	gvkFunc extractGVKFunc,
+	gvkFunc kinds.MustExtractGVK,
 ) *ngfPolicyObjectStore {
 	return &ngfPolicyObjectStore{
 		policies:       policies,
@@ -122,13 +123,13 @@ func (list gvkList) contains(gvk schema.GroupVersionKind) bool {
 
 type multiObjectStore struct {
 	stores        map[schema.GroupVersionKind]objectStore
-	extractGVK    extractGVKFunc
+	extractGVK    kinds.MustExtractGVK
 	persistedGVKs gvkList
 }
 
 func newMultiObjectStore(
 	stores map[schema.GroupVersionKind]objectStore,
-	extractGVK extractGVKFunc,
+	extractGVK kinds.MustExtractGVK,
 	persistedGVKs gvkList,
 ) *multiObjectStore {
 	return &multiObjectStore{
@@ -183,14 +184,14 @@ type changeTrackingUpdater struct {
 	store                  *multiObjectStore
 	stateChangedPredicates map[schema.GroupVersionKind]stateChangedPredicate
 
-	extractGVK    extractGVKFunc
+	extractGVK    kinds.MustExtractGVK
 	supportedGVKs gvkList
 
 	changeType ChangeType
 }
 
 func newChangeTrackingUpdater(
-	extractGVK extractGVKFunc,
+	extractGVK kinds.MustExtractGVK,
 	objectTypeCfgs []changeTrackingUpdaterObjectTypeCfg,
 ) *changeTrackingUpdater {
 	var (