Skip to content

Commit

Permalink
feat(3scale): handle code review feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
  • Loading branch information
AndrienkoAleksandr committed Sep 26, 2024
1 parent bffe9cc commit 5ed344a
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 1,243 deletions.
55 changes: 0 additions & 55 deletions workspaces/3scale/app-config.production.yaml

This file was deleted.

20 changes: 11 additions & 9 deletions workspaces/3scale/app-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
app:
title: Scaffolded Backstage App
title: 3scale Example App
baseUrl: http://localhost:3000

organization:
Expand Down Expand Up @@ -72,6 +72,16 @@ scaffolder:
# see https://backstage.io/docs/features/software-templates/configuration for software template options

catalog:
providers:
threeScaleApiEntity:
dev:
baseUrl: '${THREESCALE_BASE_URL}' # https://<TENANT>-admin.3scale.net
accessToken: '${THREESCALE_ACCESS_TOKEN}'
schedule: # optional; same options as in TaskScheduleDefinition
# supports cron, ISO duration, "human duration" as used in code
frequency: { minutes: 1 }
# supports ISO duration, "human duration" as used in code
timeout: { minutes: 1 }
import:
entityFilename: catalog-info.yaml
pullRequestBranchName: backstage-integration
Expand Down Expand Up @@ -103,11 +113,3 @@ catalog:
# target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
# rules:
# - allow: [User, Group]

kubernetes:
# see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options

# see https://backstage.io/docs/permissions/getting-started for more on the permission framework
permission:
# setting this to `false` will disable permissions
enabled: true
13 changes: 0 additions & 13 deletions workspaces/3scale/packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,12 @@
"@backstage/config": "^1.2.0",
"@backstage/plugin-app-backend": "^0.3.74",
"@backstage/plugin-auth-backend": "^0.23.0",
"@backstage/plugin-auth-backend-module-github-provider": "^0.2.0",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.0",
"@backstage/plugin-auth-node": "^0.5.2",
"@backstage/plugin-catalog-backend": "^1.26.0",
"@backstage/plugin-catalog-backend-module-logs": "^0.1.0",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.0",
"@backstage/plugin-kubernetes-backend": "^0.18.6",
"@backstage/plugin-permission-backend": "^0.5.49",
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.0",
"@backstage/plugin-permission-common": "^0.8.1",
"@backstage/plugin-permission-node": "^0.8.3",
"@backstage/plugin-proxy-backend": "^0.5.6",
"@backstage/plugin-scaffolder-backend": "^1.25.0",
"@backstage/plugin-search-backend": "^1.5.17",
"@backstage/plugin-search-backend-module-catalog": "^0.2.2",
"@backstage/plugin-search-backend-module-pg": "^0.5.35",
"@backstage/plugin-search-backend-module-techdocs": "^0.2.2",
"@backstage/plugin-search-backend-node": "^1.3.2",
"@backstage/plugin-techdocs-backend": "^1.10.13",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"node-gyp": "^10.0.0",
Expand Down
23 changes: 0 additions & 23 deletions workspaces/3scale/packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import { createBackend } from '@backstage/backend-defaults';
const backend = createBackend();

backend.add(import('@backstage/plugin-app-backend/alpha'));
backend.add(import('@backstage/plugin-proxy-backend/alpha'));
backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));

// auth plugin
backend.add(import('@backstage/plugin-auth-backend'));
Expand All @@ -30,27 +28,6 @@ backend.add(
// See https://backstage.io/docs/features/software-catalog/configuration#subscribing-to-catalog-errors
backend.add(import('@backstage/plugin-catalog-backend-module-logs'));

// permission plugin
backend.add(import('@backstage/plugin-permission-backend/alpha'));
// See https://backstage.io/docs/permissions/getting-started for how to create your own permission policy
backend.add(
import('@backstage/plugin-permission-backend-module-allow-all-policy'),
);

// search plugin
backend.add(import('@backstage/plugin-search-backend/alpha'));

// search engine
// See https://backstage.io/docs/features/search/search-engines
backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));

// search collators
backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));

// kubernetes
backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));

backend.add(import('@backstage-community/plugin-3scale-backend/alpha'));

backend.start();
Loading

0 comments on commit 5ed344a

Please sign in to comment.