chore: fix up code review comments

Signed-off-by: benjdlambert <ben@blam.sh>

plugins/kubernetes-node/report.api.md

@@ -100,17 +100,18 @@ export interface KubernetesClusterSupplierExtensionPoint {
   addClusterSupplier(
     clusterSupplier:
       | KubernetesClustersSupplier_2
-      | (({
-          getDefault,
-        }: {
-          getDefault: () => KubernetesClustersSupplier_2;
-        }) => KubernetesClustersSupplier_2),
+      | KubernetesClusterSupplierFactory,
   ): void;
 }
 
 // @public
 export const kubernetesClusterSupplierExtensionPoint: ExtensionPoint<KubernetesClusterSupplierExtensionPoint>;
 
+// @public
+export type KubernetesClusterSupplierFactory = (opts: {
+  getDefault: () => Promise<KubernetesClustersSupplier_2>;
+}) => Promise<KubernetesClustersSupplier_2>;
+
 // @public
 export type KubernetesCredential =
   | {
@@ -144,20 +145,17 @@ export interface KubernetesFetcher {
 // @public
 export interface KubernetesFetcherExtensionPoint {
   // (undocumented)
-  addFetcher(
-    fetcher:
-      | KubernetesFetcher_2
-      | (({
-          getDefault,
-        }: {
-          getDefault: () => KubernetesFetcher_2;
-        }) => KubernetesFetcher_2),
-  ): void;
+  addFetcher(fetcher: KubernetesFetcher_2 | KubernetesFetcherFactory): void;
 }
 
 // @public
 export const kubernetesFetcherExtensionPoint: ExtensionPoint<KubernetesFetcherExtensionPoint>;
 
+// @public
+export type KubernetesFetcherFactory = (opts: {
+  getDefault: () => Promise<KubernetesFetcher_2>;
+}) => Promise<KubernetesFetcher_2>;
+
 // @public (undocumented)
 export interface KubernetesObjectsByEntity {
   // (undocumented)
@@ -188,29 +186,23 @@ export interface KubernetesObjectsProvider {
 export interface KubernetesObjectsProviderExtensionPoint {
   // (undocumented)
   addObjectsProvider(
-    provider:
-      | KubernetesObjectsProvider_2
-      | (({
-          getDefault,
-          clusterSupplier,
-          serviceLocator,
-          customResources,
-          objectTypesToFetch,
-          authStrategy,
-        }: {
-          getDefault: () => KubernetesObjectsProvider_2;
-          clusterSupplier: KubernetesClustersSupplier_2;
-          serviceLocator: KubernetesServiceLocator_2;
-          customResources: CustomResource_2[];
-          objectTypesToFetch?: ObjectToFetch_2[];
-          authStrategy: AuthenticationStrategy_2;
-        }) => KubernetesObjectsProvider_2),
+    provider: KubernetesObjectsProvider_2 | KubernetesObjectsProviderFactory,
   ): void;
 }
 
 // @public
 export const kubernetesObjectsProviderExtensionPoint: ExtensionPoint<KubernetesObjectsProviderExtensionPoint>;
 
+// @public
+export type KubernetesObjectsProviderFactory = (opts: {
+  getDefault: () => Promise<KubernetesObjectsProvider_2>;
+  clusterSupplier: KubernetesClustersSupplier_2;
+  serviceLocator: KubernetesServiceLocator_2;
+  customResources: CustomResource_2[];
+  objectTypesToFetch?: ObjectToFetch_2[];
+  authStrategy: AuthenticationStrategy_2;
+}) => Promise<KubernetesObjectsProvider_2>;
+
 // @public (undocumented)
 export type KubernetesObjectTypes =
   | 'pods'
@@ -246,19 +238,19 @@ export interface KubernetesServiceLocatorExtensionPoint {
   addServiceLocator(
     serviceLocator:
       | KubernetesServiceLocator_2
-      | (({
-          getDefault,
-          clusterSupplier,
-        }: {
-          getDefault: () => KubernetesServiceLocator_2;
-          clusterSupplier: KubernetesClustersSupplier_2;
-        }) => KubernetesServiceLocator_2),
+      | KubernetesServiceLocatorFactory,
   ): void;
 }
 
 // @public
 export const kubernetesServiceLocatorExtensionPoint: ExtensionPoint<KubernetesServiceLocatorExtensionPoint>;
 
+// @public
+export type KubernetesServiceLocatorFactory = (opts: {
+  getDefault: () => Promise<KubernetesServiceLocator_2>;
+  clusterSupplier: KubernetesClustersSupplier_2;
+}) => Promise<KubernetesServiceLocator_2>;
+
 // @public (undocumented)
 export interface ObjectFetchParams {
   // (undocumented)

plugins/kubernetes-node/src/extensions.ts

@@ -24,6 +24,20 @@ import {
   KubernetesServiceLocator,
 } from '@backstage/plugin-kubernetes-node';
 
+/**
+ * A factory function for creating a KubernetesObjectsProvider.
+ *
+ * @public
+ */
+export type KubernetesObjectsProviderFactory = (opts: {
+  getDefault: () => Promise<KubernetesObjectsProvider>;
+  clusterSupplier: KubernetesClustersSupplier;
+  serviceLocator: KubernetesServiceLocator;
+  customResources: CustomResource[];
+  objectTypesToFetch?: ObjectToFetch[];
+  authStrategy: AuthenticationStrategy;
+}) => Promise<KubernetesObjectsProvider>;
+
 /**
  * The interface for {@link kubernetesObjectsProviderExtensionPoint}.
  *
@@ -31,23 +45,7 @@ import {
  */
 export interface KubernetesObjectsProviderExtensionPoint {
   addObjectsProvider(
-    provider:
-      | KubernetesObjectsProvider
-      | (({
-          getDefault,
-          clusterSupplier,
-          serviceLocator,
-          customResources,
-          objectTypesToFetch,
-          authStrategy,
-        }: {
-          getDefault: () => KubernetesObjectsProvider;
-          clusterSupplier: KubernetesClustersSupplier;
-          serviceLocator: KubernetesServiceLocator;
-          customResources: CustomResource[];
-          objectTypesToFetch?: ObjectToFetch[];
-          authStrategy: AuthenticationStrategy;
-        }) => KubernetesObjectsProvider),
+    provider: KubernetesObjectsProvider | KubernetesObjectsProviderFactory,
   ): void;
 }
 
@@ -61,6 +59,15 @@ export const kubernetesObjectsProviderExtensionPoint =
     id: 'kubernetes.objects-provider',
   });
 
+/**
+ * A factory function for creating a KubernetesClustersSupplier.
+ *
+ * @public
+ */
+export type KubernetesClusterSupplierFactory = (opts: {
+  getDefault: () => Promise<KubernetesClustersSupplier>;
+}) => Promise<KubernetesClustersSupplier>;
+
 /**
  * The interface for {@link kubernetesClusterSupplierExtensionPoint}.
  *
@@ -70,11 +77,7 @@ export interface KubernetesClusterSupplierExtensionPoint {
   addClusterSupplier(
     clusterSupplier:
       | KubernetesClustersSupplier
-      | (({
-          getDefault,
-        }: {
-          getDefault: () => KubernetesClustersSupplier;
-        }) => KubernetesClustersSupplier),
+      | KubernetesClusterSupplierFactory,
   ): void;
 }
 
@@ -107,21 +110,22 @@ export const kubernetesAuthStrategyExtensionPoint =
     id: 'kubernetes.auth-strategy',
   });
 
+/**
+ * A factory function for creating a KubernetesFetcher.
+ *
+ * @public
+ */
+export type KubernetesFetcherFactory = (opts: {
+  getDefault: () => Promise<KubernetesFetcher>;
+}) => Promise<KubernetesFetcher>;
+
 /**
  * The interface for {@link kubernetesFetcherExtensionPoint}.
  *
  * @public
  */
 export interface KubernetesFetcherExtensionPoint {
-  addFetcher(
-    fetcher:
-      | KubernetesFetcher
-      | (({
-          getDefault,
-        }: {
-          getDefault: () => KubernetesFetcher;
-        }) => KubernetesFetcher),
-  ): void;
+  addFetcher(fetcher: KubernetesFetcher | KubernetesFetcherFactory): void;
 }
 
 /**
@@ -134,6 +138,16 @@ export const kubernetesFetcherExtensionPoint =
     id: 'kubernetes.fetcher',
   });
 
+/**
+ * A factory function for creating a KubernetesServiceLocator.
+ *
+ * @public
+ */
+export type KubernetesServiceLocatorFactory = (opts: {
+  getDefault: () => Promise<KubernetesServiceLocator>;
+  clusterSupplier: KubernetesClustersSupplier;
+}) => Promise<KubernetesServiceLocator>;
+
 /**
  * The interface for {@link kubernetesServiceLocatorExtensionPoint}.
  *
@@ -141,15 +155,7 @@ export const kubernetesFetcherExtensionPoint =
  */
 export interface KubernetesServiceLocatorExtensionPoint {
   addServiceLocator(
-    serviceLocator:
-      | KubernetesServiceLocator
-      | (({
-          getDefault,
-          clusterSupplier,
-        }: {
-          getDefault: () => KubernetesServiceLocator;
-          clusterSupplier: KubernetesClustersSupplier;
-        }) => KubernetesServiceLocator),
+    serviceLocator: KubernetesServiceLocator | KubernetesServiceLocatorFactory,
   ): void;
 }