From 64b9efac2e12a8523451e98f8ce12055beb61ef5 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 2 Feb 2021 23:51:30 +0100
Subject: [PATCH] kubernets: migrate to new composability API

---
 .changeset/shy-maps-guess.md          |  5 +++++
 plugins/kubernetes/dev/index.tsx      |  4 ++--
 plugins/kubernetes/package.json       |  1 +
 plugins/kubernetes/src/Router.tsx     | 11 +++++++++--
 plugins/kubernetes/src/index.ts       |  6 +++++-
 plugins/kubernetes/src/plugin.test.ts |  4 ++--
 plugins/kubernetes/src/plugin.ts      | 13 ++++++++++++-
 7 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/shy-maps-guess.md

diff --git a/.changeset/shy-maps-guess.md b/.changeset/shy-maps-guess.md
new file mode 100644
index 0000000000..2a50d3d461
--- /dev/null
+++ b/.changeset/shy-maps-guess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+Migrate to new composability API, exporting the plugin instance as `kubernetesPlugin` and entity content as `EntityKubernetesContent`.
diff --git a/plugins/kubernetes/dev/index.tsx b/plugins/kubernetes/dev/index.tsx
index f352fb9c34..de93d21348 100644
--- a/plugins/kubernetes/dev/index.tsx
+++ b/plugins/kubernetes/dev/index.tsx
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 import { createDevApp } from '@backstage/dev-utils';
-import { plugin } from '../src';
+import { kubernetesPlugin } from '../src';
 
-createDevApp().registerPlugin(plugin).render();
+createDevApp().registerPlugin(kubernetesPlugin).render();
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 1d985c0d10..3dc53a9ea4 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/config": "^0.1.2",
     "@backstage/core": "^0.5.0",
     "@backstage/plugin-kubernetes-backend": "^0.2.6",
diff --git a/plugins/kubernetes/src/Router.tsx b/plugins/kubernetes/src/Router.tsx
index 20a4c04285..36851b3c46 100644
--- a/plugins/kubernetes/src/Router.tsx
+++ b/plugins/kubernetes/src/Router.tsx
@@ -16,15 +16,22 @@
 
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { Route, Routes } from 'react-router-dom';
-
 import { rootCatalogKubernetesRouteRef } from './plugin';
 import { KubernetesContent } from './components/KubernetesContent';
 import { MissingAnnotationEmptyState } from '@backstage/core';
 
 const KUBERNETES_ANNOTATION = 'backstage.io/kubernetes-id';
 
-export const Router = ({ entity }: { entity: Entity }) => {
+type Props = {
+  /** @deprecated The entity is now grabbed from context instead */
+  entity?: Entity;
+};
+
+export const Router = (_props: Props) => {
+  const { entity } = useEntity();
+
   const kubernetesAnnotationValue =
     entity.metadata.annotations?.[KUBERNETES_ANNOTATION];
 
diff --git a/plugins/kubernetes/src/index.ts b/plugins/kubernetes/src/index.ts
index 8b5969666c..eca6b068f1 100644
--- a/plugins/kubernetes/src/index.ts
+++ b/plugins/kubernetes/src/index.ts
@@ -13,5 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { plugin } from './plugin';
+export {
+  kubernetesPlugin,
+  kubernetesPlugin as plugin,
+  EntityKubernetesContent,
+} from './plugin';
 export { Router } from './Router';
diff --git a/plugins/kubernetes/src/plugin.test.ts b/plugins/kubernetes/src/plugin.test.ts
index 20c50a813a..f176b7f451 100644
--- a/plugins/kubernetes/src/plugin.test.ts
+++ b/plugins/kubernetes/src/plugin.test.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { plugin } from './plugin';
+import { kubernetesPlugin } from './plugin';
 
 describe('kubernetes', () => {
   it('should export plugin', () => {
-    expect(plugin).toBeDefined();
+    expect(kubernetesPlugin).toBeDefined();
   });
 });
diff --git a/plugins/kubernetes/src/plugin.ts b/plugins/kubernetes/src/plugin.ts
index cff9e1468b..af29df3dcc 100644
--- a/plugins/kubernetes/src/plugin.ts
+++ b/plugins/kubernetes/src/plugin.ts
@@ -19,6 +19,7 @@ import {
   createRouteRef,
   discoveryApiRef,
   googleAuthApiRef,
+  createRoutableExtension,
 } from '@backstage/core';
 import { KubernetesBackendClient } from './api/KubernetesBackendClient';
 import { kubernetesApiRef } from './api/types';
@@ -30,7 +31,7 @@ export const rootCatalogKubernetesRouteRef = createRouteRef({
   title: 'Kubernetes',
 });
 
-export const plugin = createPlugin({
+export const kubernetesPlugin = createPlugin({
   id: 'kubernetes',
   apis: [
     createApiFactory({
@@ -47,4 +48,14 @@ export const plugin = createPlugin({
       },
     }),
   ],
+  routes: {
+    entityContent: rootCatalogKubernetesRouteRef,
+  },
 });
+
+export const EntityKubernetesContent = kubernetesPlugin.provide(
+  createRoutableExtension({
+    component: () => import('./Router').then(m => m.Router),
+    mountPoint: rootCatalogKubernetesRouteRef,
+  }),
+);