Fixed deps, renamed backend plugin

Signed-off-by: Andrew Lee <andrewkl@enclavenet.com>

packages/backend/package.json

@@ -47,10 +47,10 @@
     "@backstage/plugin-search-backend-node": "^1.2.21",
     "@backstage/plugin-techdocs-backend": "^1.10.4",
     "@backstage/types": "^1.1.1",
-    "@internal/backstage-plugin-terraformv2-backend": "^0.1.0",
     "@kubernetes/client-node": "~0.20.0",
     "@roadiehq/backstage-plugin-argo-cd-backend": "3.0.2",
     "@roadiehq/scaffolder-backend-module-utils": "^1.17.0",
+    "@internal/backstage-plugin-terraform-backend": "^0.1.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",

packages/backend/src/index.ts

@@ -32,6 +32,6 @@ backend.add(legacyPlugin('argocd', import('./plugins/argocd')));
 // cnoe plugins
 backend.add(authModuleKeycloakOIDCProvider);
 backend.add(cnoeScaffolderActions);
-backend.add(import('@internal/backstage-plugin-terraformv2-backend'));
+backend.add(import('@internal/backstage-plugin-terraform-backend'));
 
 backend.start();

plugins/terraform-backend/README.md

@@ -1,13 +1,13 @@
-# terraformv2
+# terraform
 
-Welcome to the terraformv2 backend plugin!
+Welcome to the terraform backend plugin!
 
 _This plugin was created through the Backstage CLI_
 
 ## Getting started
 
 Your plugin has been added to the example app in this repository, meaning you'll be able to access it by running `yarn
-start` in the root directory, and then navigating to [/terraformv2Plugin/health](http://localhost:7007/api/terraformv2Plugin/health).
+start` in the root directory, and then navigating to [/terraformPlugin/health](http://localhost:7007/api/terraformv2Plugin/health).
 
 You can also serve the plugin in isolation by running `yarn start` in the plugin directory.
 This method of serving the plugin provides quicker iteration speed and a faster startup and hot reloads.

plugins/terraform-backend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@internal/backstage-plugin-terraformv2-backend",
+  "name": "@internal/backstage-plugin-terraform-backend",
   "version": "0.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",

plugins/terraform-backend/src/index.ts

@@ -0,0 +1,2 @@
+export * from './service/router';
+export { terraformPlugin as default } from './plugin';

plugins/terraform-backend/src/plugin.ts

@@ -5,12 +5,12 @@ import {
 import { createRouter } from './service/router';
 
 /**
- * terraformv2Plugin backend plugin
+ * terraformPlugin backend plugin
  *
  * @public
  */
-export const terraformv2Plugin = createBackendPlugin({
-  pluginId: 'terraformv2',
+export const terraformPlugin = createBackendPlugin({
+  pluginId: 'terraform',
   register(env) {
     env.registerInit({
       deps: {

plugins/terraform/package.json

@@ -24,9 +24,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "~0.13.10",
-    "@backstage/core-plugin-api": "~1.8.2",
-    "@backstage/theme": "~0.5.0",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "~0.25.1",
-    "@backstage/core-app-api": "~1.11.3",
+    "@backstage/cli": "^0.26.4",
+    "@backstage/core-app-api": "^1.12.6",
     "@backstage/dev-utils": "^1.0.26",
     "@backstage/test-utils": "^1.4.7",
     "@testing-library/jest-dom": "^5.10.1",

plugins/terraform/src/api/Terraform.ts

@@ -41,7 +41,7 @@ export class Terraform implements TerraformApi {
       tfState
     };
 
-    const response = await this.fetchURL('/api/terraformv2/deflate', 'post', requestBody);
+    const response = await this.fetchURL('/api/terraform/deflate', 'post', requestBody);
     
     if (!response.ok) {
       return Promise.reject(
@@ -62,7 +62,7 @@ export class Terraform implements TerraformApi {
       Prefix
     };
 
-    const response = await this.fetchURL('/api/terraformv2/getFileList', 'post', requestBody);
+    const response = await this.fetchURL('/api/terraform/getFileList', 'post', requestBody);
     if (!response.ok) {
       return Promise.reject(
         `failed to fetch resources: ${response.status}, ${
@@ -80,7 +80,7 @@ export class Terraform implements TerraformApi {
       FileLocation,
     };
 
-    const response = await this.fetchURL('/api/terraformv2/getLocalFileList', 'post', requestBody);
+    const response = await this.fetchURL('/api/terraform/getLocalFileList', 'post', requestBody);
     if (!response.ok) {
       return Promise.reject(
         `failed to fetch resources: ${response.status}, ${
@@ -102,7 +102,7 @@ export class Terraform implements TerraformApi {
       bodyObj.Bucket = Bucket;
     }
 
-    const response = await this.fetchURL('/api/terraformv2/getTFStateFile', 'post', bodyObj);
+    const response = await this.fetchURL('/api/terraform/getTFStateFile', 'post', bodyObj);
     if (!response.ok) {
       return Promise.reject(
         `failed to fetch resources: ${response.status}, ${

plugins/terraformv2-backend/src/index.ts

@@ -1,2 +0,0 @@
-export * from './service/router';
-export { terraformv2Plugin as default } from './plugin';