resolve merge conflicts

Signed-off-by: Robert Bunning <rbunning@webstaurantstore.com>
This commit is contained in:
Robert Bunning
2023-08-09 09:48:19 -04:00
689 changed files with 16492 additions and 3253 deletions
+23
View File
@@ -1,5 +1,28 @@
# @backstage/plugin-adr-backend
## 0.3.6-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
## 0.3.6-next.1
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/integration@1.5.1
- @backstage/catalog-client@1.4.3
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
- @backstage/plugin-adr-common@0.2.11
- @backstage/plugin-search-common@1.2.5
## 0.3.6-next.0
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-adr-backend",
"version": "0.3.6-next.0",
"version": "0.3.6-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+24
View File
@@ -1,5 +1,29 @@
# @backstage/plugin-adr
## 0.6.4-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
- @backstage/integration-react@1.1.16-next.1
## 0.6.4-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/integration-react@1.1.16-next.1
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
- @backstage/plugin-adr-common@0.2.11
- @backstage/plugin-catalog-react@1.8.1-next.0
- @backstage/plugin-search-common@1.2.5
- @backstage/plugin-search-react@1.6.4-next.0
## 0.6.4-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-adr",
"version": "0.6.4-next.0",
"version": "0.6.4-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/adr"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
+19
View File
@@ -1,5 +1,24 @@
# @backstage/plugin-airbrake-backend
## 0.2.21-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
## 0.2.21-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/config@1.0.8
## 0.2.21-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-airbrake-backend",
"version": "0.2.21-next.0",
"version": "0.2.21-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "backend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/airbrake-backend"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
+1 -1
View File
@@ -32,7 +32,7 @@ export const airbrakePlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
httpRouter: coreServices.httpRouter,
},
+22
View File
@@ -1,5 +1,27 @@
# @backstage/plugin-airbrake
## 0.3.21-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
- @backstage/dev-utils@1.0.18-next.2
## 0.3.21-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/dev-utils@1.0.18-next.1
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/test-utils@1.4.2-next.0
- @backstage/theme@0.4.1
- @backstage/plugin-catalog-react@1.8.1-next.0
## 0.3.21-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-airbrake",
"version": "0.3.21-next.0",
"version": "0.3.21-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/airbrake"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
+19
View File
@@ -1,5 +1,24 @@
# @backstage/plugin-allure
## 0.1.37-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
## 0.1.37-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
- @backstage/plugin-catalog-react@1.8.1-next.0
## 0.1.37-next.0
### Patch Changes
+7 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-allure",
"description": "A Backstage plugin that integrates with Allure",
"version": "0.1.37-next.0",
"version": "0.1.37-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -13,6 +13,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/allure"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
+11
View File
@@ -1,5 +1,16 @@
# @backstage/plugin-analytics-module-ga
## 0.1.32-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/config@1.0.8
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
## 0.1.32-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-analytics-module-ga",
"version": "0.1.32-next.0",
"version": "0.1.32-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin-module"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/analytics-module-ga"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
+11
View File
@@ -1,5 +1,16 @@
# @backstage/plugin-analytics-module-ga4
## 0.1.3-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/config@1.0.8
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
## 0.1.3-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-analytics-module-ga4",
"version": "0.1.3-next.0",
"version": "0.1.3-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin-module"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/plugins/analytics-module-ga4"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
+9
View File
@@ -1,5 +1,14 @@
# @backstage/plugin-apache-airflow
## 0.2.14-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
## 0.2.14-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-apache-airflow",
"version": "0.2.14-next.0",
"version": "0.2.14-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/apache-airflow"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
+20
View File
@@ -1,5 +1,25 @@
# @backstage/plugin-api-docs
## 0.9.7-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
- @backstage/plugin-catalog@1.12.1-next.2
## 0.9.7-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog@1.12.1-next.1
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
- @backstage/plugin-catalog-react@1.8.1-next.0
## 0.9.7-next.0
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-api-docs",
"description": "A Backstage plugin that helps represent API entities in the frontend",
"version": "0.9.7-next.0",
"version": "0.9.7-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+10
View File
@@ -1,5 +1,15 @@
# @backstage/plugin-apollo-explorer
## 0.1.14-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
## 0.1.14-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-apollo-explorer",
"version": "0.1.14-next.0",
"version": "0.1.14-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/apollo-explorer"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
+23
View File
@@ -1,5 +1,28 @@
# @backstage/plugin-app-backend
## 0.3.48-next.2
### Patch Changes
- d564ad142b17: Migrated the alpha `appBackend` export to use static configuration and extension points rather than accepting options.
- Updated dependencies
- @backstage/plugin-app-node@0.1.0-next.0
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/config-loader@1.4.0-next.1
## 0.3.48-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/config-loader@1.4.0-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/config@1.0.8
- @backstage/types@1.1.0
## 0.3.48-next.0
### Patch Changes
+1 -10
View File
@@ -4,18 +4,9 @@
```ts
import { BackendFeature } from '@backstage/backend-plugin-api';
import express from 'express';
// @alpha
export const appPlugin: (options: AppPluginOptions) => BackendFeature;
// @alpha (undocumented)
export type AppPluginOptions = {
appPackageName?: string;
staticFallbackHandler?: express.Handler;
disableConfigInjection?: boolean;
disableStaticFallbackCache?: boolean;
};
export const appPlugin: () => BackendFeature;
// (No @packageDocumentation comment for this package)
```
+46
View File
@@ -0,0 +1,46 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export interface Config {
app?: {
/**
* The name of the app package (in most Backstage repositories, this is the
* "name" field in `packages/app/package.json`) that content should be served
* from. The same app package should be added as a dependency to the backend
* package in order for it to be accessible at runtime.
*
* In a typical setup with a single app package, this will default to 'app'.
*/
packageName?: string;
/**
* Disables the configuration injection. This can be useful if you're running in an environment
* with a read-only filesystem, or for some other reason don't want configuration to be injected.
*
* Note that this will cause the configuration used when building the app bundle to be used, unless
* a separate configuration loading strategy is set up.
*
* This also disables configuration injection though `APP_CONFIG_` environment variables.
*/
disableConfigInjection?: boolean;
/**
* By default the app backend plugin will cache previously deployed static assets in the database.
* If you disable this, it is recommended to set a `staticFallbackHandler` instead.
*/
disableStaticFallbackCache?: boolean;
};
}
+4 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-app-backend",
"description": "A Backstage backend plugin that serves the Backstage frontend app",
"version": "0.3.48-next.0",
"version": "0.3.48-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -49,6 +49,7 @@
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/config": "workspace:^",
"@backstage/config-loader": "workspace:^",
"@backstage/plugin-app-node": "workspace:^",
"@backstage/types": "workspace:^",
"@types/express": "^4.17.6",
"express": "^4.17.1",
@@ -73,8 +74,10 @@
"node-fetch": "^2.6.7",
"supertest": "^6.1.3"
},
"configSchema": "config.d.ts",
"files": [
"dist",
"config.d.ts",
"migrations/**/*.{js,d.ts}",
"static"
]
-1
View File
@@ -15,4 +15,3 @@
*/
export { appPlugin } from './service/appPlugin';
export type { AppPluginOptions } from './service/appPlugin';
@@ -17,7 +17,7 @@
import mockFs from 'mock-fs';
import { resolve as resolvePath } from 'path';
import fetch from 'node-fetch';
import { startTestBackend } from '@backstage/backend-test-utils';
import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
import { appPlugin } from './appPlugin';
describe('appPlugin', () => {
@@ -39,10 +39,14 @@ describe('appPlugin', () => {
it('boots', async () => {
const { server } = await startTestBackend({
features: [
appPlugin({
appPackageName: 'app',
disableStaticFallbackCache: true,
features: [appPlugin()],
services: [
mockServices.rootConfig.factory({
data: {
app: {
disableStaticFallbackCache: true,
},
},
}),
],
});
+21 -56
View File
@@ -21,84 +21,49 @@ import {
} from '@backstage/backend-plugin-api';
import { createRouter } from './router';
import { loggerToWinstonLogger } from '@backstage/backend-common';
/** @alpha */
export type AppPluginOptions = {
/**
* The name of the app package (in most Backstage repositories, this is the
* "name" field in `packages/app/package.json`) that content should be served
* from. The same app package should be added as a dependency to the backend
* package in order for it to be accessible at runtime.
*
* In a typical setup with a single app package, this will default to 'app'.
*/
appPackageName?: string;
/**
* A request handler to handle requests for static content that are not present in the app bundle.
*
* This can be used to avoid issues with clients on older deployment versions trying to access lazy
* loaded content that is no longer present. Typically the requests would fall back to a long-term
* object store where all recently deployed versions of the app are present.
*
* Another option is to provide a `database` that will take care of storing the static assets instead.
*
* If both `database` and `staticFallbackHandler` are provided, the `database` will attempt to serve
* static assets first, and if they are not found, the `staticFallbackHandler` will be called.
*/
staticFallbackHandler?: express.Handler;
/**
* Disables the configuration injection. This can be useful if you're running in an environment
* with a read-only filesystem, or for some other reason don't want configuration to be injected.
*
* Note that this will cause the configuration used when building the app bundle to be used, unless
* a separate configuration loading strategy is set up.
*
* This also disables configuration injection though `APP_CONFIG_` environment variables.
*/
disableConfigInjection?: boolean;
/**
* By default the app backend plugin will cache previously deployed static assets in the database.
* If you disable this, it is recommended to set a `staticFallbackHandler` instead.
*/
disableStaticFallbackCache?: boolean;
};
import { staticFallbackHandlerExtensionPoint } from '@backstage/plugin-app-node';
/**
* The App plugin is responsible for serving the frontend app bundle and static assets.
* @alpha
*/
export const appPlugin = createBackendPlugin((options: AppPluginOptions) => ({
export const appPlugin = createBackendPlugin({
pluginId: 'app',
register(env) {
let staticFallbackHandler: express.Handler | undefined;
env.registerExtensionPoint(staticFallbackHandlerExtensionPoint, {
setStaticFallbackHandler(handler) {
if (staticFallbackHandler) {
throw new Error(
'Attempted to install a static fallback handler for the app-backend twice',
);
}
staticFallbackHandler = handler;
},
});
env.registerInit({
deps: {
logger: coreServices.logger,
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
httpRouter: coreServices.httpRouter,
},
async init({ logger, config, database, httpRouter }) {
const {
appPackageName,
staticFallbackHandler,
disableConfigInjection,
disableStaticFallbackCache,
} = options;
const appPackageName =
config.getOptionalString('app.packageName') ?? 'app';
const winstonLogger = loggerToWinstonLogger(logger);
const router = await createRouter({
logger: winstonLogger,
config,
database: disableStaticFallbackCache ? undefined : database,
appPackageName: appPackageName ?? 'app',
database,
appPackageName,
staticFallbackHandler,
disableConfigInjection,
});
httpRouter.use(router);
},
});
},
}));
});
+9 -2
View File
@@ -92,6 +92,13 @@ export async function createRouter(
): Promise<express.Router> {
const { config, logger, appPackageName, staticFallbackHandler } = options;
const disableConfigInjection =
options.disableConfigInjection ??
config.getOptionalBoolean('app.disableConfigInjection');
const disableStaticFallbackCache = config.getOptionalBoolean(
'app.disableStaticFallbackCache',
);
const appDistDir = resolvePackagePath(appPackageName, 'dist');
const staticDir = resolvePath(appDistDir, 'static');
@@ -107,7 +114,7 @@ export async function createRouter(
logger.info(`Serving static app content from ${appDistDir}`);
if (!options.disableConfigInjection) {
if (!disableConfigInjection) {
const appConfigs = await readConfigs({
config,
appDistDir,
@@ -131,7 +138,7 @@ export async function createRouter(
}),
);
if (options.database) {
if (options.database && !disableStaticFallbackCache) {
const store = await StaticAssetsStore.create({
logger,
database: options.database,
+1
View File
@@ -0,0 +1 @@
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
+12
View File
@@ -0,0 +1,12 @@
# @backstage/plugin-app-node
## 0.1.0-next.0
### Minor Changes
- 9fbe95ef6503: Added the `app` plugin node library, initially providing an extension point that can be used to configure a static fallback handler.
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
+5
View File
@@ -0,0 +1,5 @@
# @backstage/plugin-app-node
Welcome to the Node.js library package for the app plugin!
_This plugin was created through the Backstage CLI_
+16
View File
@@ -0,0 +1,16 @@
## API Report File for "@backstage/plugin-app-node"
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
import { ExtensionPoint } from '@backstage/backend-plugin-api';
import { Handler } from 'express';
// @public
export interface StaticFallbackHandlerExtensionPoint {
setStaticFallbackHandler(handler: Handler): void;
}
// @public
export const staticFallbackHandlerExtensionPoint: ExtensionPoint<StaticFallbackHandlerExtensionPoint>;
```
+35
View File
@@ -0,0 +1,35 @@
{
"name": "@backstage/plugin-app-node",
"description": "Node.js library for the app plugin",
"version": "0.1.0-next.0",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts"
},
"backstage": {
"role": "node-library"
},
"scripts": {
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test",
"clean": "backstage-cli package clean",
"prepack": "backstage-cli package prepack",
"postpack": "backstage-cli package postpack"
},
"devDependencies": {
"@backstage/cli": "workspace:^"
},
"files": [
"dist"
],
"dependencies": {
"@backstage/backend-plugin-api": "workspace:^",
"@types/express": "^4.17.6",
"express": "^4.17.1"
}
}
+52
View File
@@ -0,0 +1,52 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { createExtensionPoint } from '@backstage/backend-plugin-api';
import { Handler } from 'express';
/**
* The interface for {@link staticFallbackHandlerExtensionPoint}.
*
* @public
*/
export interface StaticFallbackHandlerExtensionPoint {
/**
* Sets the static fallback handler. This can only be done once.
*/
setStaticFallbackHandler(handler: Handler): void;
}
/**
* An extension point the exposes the ability to configure a static fallback handler for the app backend.
*
* The static fallback handler is a request handler to handle requests for static content that is not
* present in the app bundle.
*
* This can be used to avoid issues with clients on older deployment versions trying to access lazy
* loaded content that is no longer present. Typically the requests would fall back to a long-term
* object store where all recently deployed versions of the app are present.
*
* Another option is to provide a `database` that will take care of storing the static assets instead.
*
* If both `database` and `staticFallbackHandler` are provided, the `database` will attempt to serve
* static assets first, and if they are not found, the `staticFallbackHandler` will be called.
*
* @public
*/
export const staticFallbackHandlerExtensionPoint =
createExtensionPoint<StaticFallbackHandlerExtensionPoint>({
id: 'app.staticFallbackHandler',
});
+26
View File
@@ -0,0 +1,26 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Node.js library for the app plugin.
*
* @packageDocumentation
*/
export {
staticFallbackHandlerExtensionPoint,
type StaticFallbackHandlerExtensionPoint,
} from './extensions';
+16
View File
@@ -0,0 +1,16 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export {};
+24
View File
@@ -1,5 +1,29 @@
# @backstage/plugin-auth-backend
## 0.18.6-next.2
### Patch Changes
- 16452cd007ae: Updated `frameHandler` to return `undefined` when using the redirect flow instead of returning `postMessageReponse` which was causing errors
- bb70a9c3886a: Add frontend visibility to provider objects in `auth` config.
- Updated dependencies
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-auth-node@0.2.17-next.2
## 0.18.6-next.1
### Patch Changes
- 9dad4b0e61bd: Updated config schema to match what was being used in code
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-auth-node@0.2.17-next.1
- @backstage/catalog-client@1.4.3
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
- @backstage/types@1.1.0
## 0.18.6-next.0
### Patch Changes
+14
View File
@@ -62,6 +62,7 @@ export interface Config {
* @additionalProperties true
*/
providers?: {
/** @visibility frontend */
google?: {
[authEnv: string]: {
clientId: string;
@@ -72,6 +73,7 @@ export interface Config {
callbackUrl?: string;
};
};
/** @visibility frontend */
github?: {
[authEnv: string]: {
clientId: string;
@@ -83,6 +85,7 @@ export interface Config {
enterpriseInstanceUrl?: string;
};
};
/** @visibility frontend */
gitlab?: {
[authEnv: string]: {
clientId: string;
@@ -94,6 +97,7 @@ export interface Config {
callbackUrl?: string;
};
};
/** @visibility frontend */
saml?: {
entryPoint: string;
logoutUrl?: string;
@@ -117,6 +121,7 @@ export interface Config {
digestAlgorithm?: string;
acceptedClockSkewMs?: number;
};
/** @visibility frontend */
okta?: {
[authEnv: string]: {
clientId: string;
@@ -130,6 +135,7 @@ export interface Config {
callbackUrl?: string;
};
};
/** @visibility frontend */
oauth2?: {
[authEnv: string]: {
clientId: string;
@@ -143,6 +149,7 @@ export interface Config {
disableRefresh?: boolean;
};
};
/** @visibility frontend */
oidc?: {
[authEnv: string]: {
clientId: string;
@@ -152,10 +159,13 @@ export interface Config {
clientSecret: string;
callbackUrl?: string;
metadataUrl: string;
tokenEndpointAuthMethod?: string;
tokenSignedResponseAlg?: string;
scope?: string;
prompt?: string;
};
};
/** @visibility frontend */
auth0?: {
[authEnv: string]: {
clientId: string;
@@ -170,6 +180,7 @@ export interface Config {
connectionScope?: string;
};
};
/** @visibility frontend */
microsoft?: {
[authEnv: string]: {
clientId: string;
@@ -181,6 +192,7 @@ export interface Config {
callbackUrl?: string;
};
};
/** @visibility frontend */
onelogin?: {
[authEnv: string]: {
clientId: string;
@@ -192,10 +204,12 @@ export interface Config {
callbackUrl?: string;
};
};
/** @visibility frontend */
awsalb?: {
iss?: string;
region: string;
};
/** @visibility frontend */
cfaccess?: {
teamName: string;
};
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-auth-backend",
"description": "A Backstage backend plugin that handles authentication",
"version": "0.18.6-next.0",
"version": "0.18.6-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -125,7 +125,7 @@ describe('oauth helpers', () => {
postMessageResponse(mockResponse, appOrigin, data);
expect(responseBody.match(/.postMessage\(/g)).toHaveLength(2);
expect(
responseBody.match(/.postMessage\([a-zA-z.()]*, \'\*\'\)/g),
responseBody.match(/.postMessage\([a-zA-Z.()]*, \'\*\'\)/g),
).toHaveLength(1);
const errData: WebMessageResponse = {
@@ -135,7 +135,7 @@ describe('oauth helpers', () => {
postMessageResponse(mockResponse, appOrigin, errData);
expect(responseBody.match(/.postMessage\(/g)).toHaveLength(2);
expect(
responseBody.match(/.postMessage\([a-zA-z.()]*, \'\*\'\)/g),
responseBody.match(/.postMessage\([a-zA-Z.()]*, \'\*\'\)/g),
).toHaveLength(1);
});
@@ -187,6 +187,7 @@ export class OAuthAdapter implements AuthProviderRouteHandlers {
);
}
res.redirect(state.redirectUrl);
return undefined;
}
// post message back to popup if successful
return postMessageResponse(res, appOrigin, responseObj);
+17
View File
@@ -1,5 +1,22 @@
# @backstage/plugin-auth-node
## 0.2.17-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.2
## 0.2.17-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
## 0.2.17-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-node",
"version": "0.2.17-next.0",
"version": "0.2.17-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "node-library"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/auth-node"
},
"scripts": {
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
+20
View File
@@ -1,5 +1,25 @@
# @backstage/plugin-azure-devops-backend
## 0.3.27-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
## 0.3.27-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/config@1.0.8
- @backstage/plugin-azure-devops-common@0.3.0
## 0.3.27-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-azure-devops-backend",
"version": "0.3.27-next.0",
"version": "0.3.27-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "backend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/azure-devops-backend"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
+1 -1
View File
@@ -31,7 +31,7 @@ export const azureDevOpsPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
reader: coreServices.urlReader,
httpRouter: coreServices.httpRouter,
+7
View File
@@ -1,5 +1,12 @@
# @backstage/plugin-azure-devops
## 0.3.3-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
## 0.3.3-next.0
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-azure-devops",
"version": "0.3.3-next.0",
"version": "0.3.3-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+16
View File
@@ -1,5 +1,21 @@
# @backstage/plugin-azure-sites-backend
## 0.1.10-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.2
## 0.1.10-next.1
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/config@1.0.8
- @backstage/plugin-azure-sites-common@0.1.0
## 0.1.10-next.0
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-azure-sites-backend",
"version": "0.1.10-next.0",
"version": "0.1.10-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+7
View File
@@ -1,5 +1,12 @@
# @backstage/plugin-azure-sites
## 0.1.10-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
## 0.1.10-next.0
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-azure-sites",
"version": "0.1.10-next.0",
"version": "0.1.10-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+23
View File
@@ -1,5 +1,28 @@
# @backstage/plugin-badges-backend
## 0.2.3-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-auth-node@0.2.17-next.2
## 0.2.3-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-auth-node@0.2.17-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/catalog-client@1.4.3
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
## 0.2.3-next.0
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-badges-backend",
"description": "A Backstage backend plugin that generates README badges for your entities",
"version": "0.2.3-next.0",
"version": "0.2.3-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+1 -1
View File
@@ -31,7 +31,7 @@ export const badgesPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
discovery: coreServices.discovery,
tokenManager: coreServices.tokenManager,
+7
View File
@@ -1,5 +1,12 @@
# @backstage/plugin-badges
## 0.2.45-next.1
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
## 0.2.45-next.0
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-badges",
"description": "A Backstage plugin that generates README badges for your entities",
"version": "0.2.45-next.0",
"version": "0.2.45-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
+22
View File
@@ -1,5 +1,27 @@
# @backstage/plugin-bazaar-backend
## 0.2.11-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-auth-node@0.2.17-next.2
## 0.2.11-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-auth-node@0.2.17-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
## 0.2.11-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-bazaar-backend",
"version": "0.2.11-next.0",
"version": "0.2.11-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -13,6 +13,12 @@
"backstage": {
"role": "backend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/bazaar-backend"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build --experimental-type-build",
+1 -1
View File
@@ -31,7 +31,7 @@ export const bazaarPlugin = createBackendPlugin({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
database: coreServices.database,
identity: coreServices.identity,
logger: coreServices.logger,
+25
View File
@@ -1,5 +1,30 @@
# @backstage/plugin-bazaar
## 0.2.12-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
- @backstage/plugin-catalog@1.12.1-next.2
- @backstage/cli@0.22.10-next.1
## 0.2.12-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/cli@0.22.10-next.1
- @backstage/plugin-catalog@1.12.1-next.1
- @backstage/catalog-client@1.4.3
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/errors@1.2.1
- @backstage/theme@0.4.1
- @backstage/plugin-catalog-react@1.8.1-next.0
## 0.2.12-next.0
### Patch Changes
+7 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-bazaar",
"version": "0.2.12-next.0",
"version": "0.2.12-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -12,6 +12,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/bazaar"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
@@ -1,5 +1,13 @@
# @backstage/plugin-bitbucket-cloud-common
## 0.2.9-next.0
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/integration@1.5.1
## 0.2.8
### Patch Changes
+7 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-bitbucket-cloud-common",
"description": "Common functionalities for bitbucket-cloud plugins",
"version": "0.2.8",
"version": "0.2.9-next.0",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -14,6 +14,12 @@
"backstage": {
"role": "common-library"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/bitbucket-cloud-common"
},
"scripts": {
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
+19
View File
@@ -1,5 +1,24 @@
# @backstage/plugin-bitrise
## 0.1.48-next.2
### Patch Changes
- Updated dependencies
- @backstage/plugin-catalog-react@1.8.1-next.1
## 0.1.48-next.1
### Patch Changes
- 12a8c94eda8d: Add package repository and homepage metadata
- Updated dependencies
- @backstage/catalog-model@1.4.1
- @backstage/core-components@0.13.4-next.0
- @backstage/core-plugin-api@1.5.3
- @backstage/theme@0.4.1
- @backstage/plugin-catalog-react@1.8.1-next.0
## 0.1.48-next.0
### Patch Changes
+7 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-bitrise",
"description": "A Backstage plugin that integrates towards Bitrise",
"version": "0.1.48-next.0",
"version": "0.1.48-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -13,6 +13,12 @@
"backstage": {
"role": "frontend-plugin"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/bitrise"
},
"scripts": {
"build": "backstage-cli package build",
"start": "backstage-cli package start",
@@ -1,5 +1,36 @@
# @backstage/plugin-catalog-backend-module-aws
## 0.2.3-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-tasks@0.5.5-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
## 0.2.3-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
- b4222908b0c3: Added option to configure AWS `accountId` in `AwsS3EntityProvider`
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/backend-tasks@0.5.5-next.1
- @backstage/integration@1.5.1
- @backstage/integration-aws-node@0.1.5
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
- @backstage/types@1.1.0
- @backstage/plugin-catalog-common@1.0.15
- @backstage/plugin-kubernetes-common@0.6.5
## 0.2.3-next.0
### Patch Changes
+16 -5
View File
@@ -54,14 +54,19 @@ export interface Config {
* @see https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-region.html
*/
region?: string;
/**
* (Optional) AWS Account id.
* If not set, main account is used.
* @see https://github.com/backstage/backstage/blob/master/packages/integration-aws-node/README.md
*/
accountId?: string;
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
}
| Record<
string,
{
| {
[name: string]: {
/**
* (Required) AWS S3 Bucket Name
*/
@@ -77,12 +82,18 @@ export interface Config {
* @see https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-region.html
*/
region?: string;
/**
* (Optional) AWS Account id.
* If not set, main account is used.
* @see https://github.com/backstage/backstage/blob/master/packages/integration-aws-node/README.md
*/
accountId?: string;
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
}
>;
};
};
};
};
}
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-catalog-backend-module-aws",
"description": "A Backstage catalog backend module that helps integrate towards AWS",
"version": "0.2.3-next.0",
"version": "0.2.3-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -62,7 +62,7 @@ describe('catalogModuleAwsS3EntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const catalogModuleAwsS3EntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -146,20 +146,22 @@ export class AwsS3EntityProvider implements EntityProvider {
/** {@inheritdoc @backstage/plugin-catalog-backend#EntityProvider.connect} */
async connect(connection: EntityProviderConnection): Promise<void> {
this.connection = connection;
const credProvider =
await this.awsCredentialsManager.getCredentialProvider();
const { accountId, region, bucketName } = this.config;
const credProvider = await this.awsCredentialsManager.getCredentialProvider(
accountId ? { accountId } : undefined,
);
this.s3 = new S3({
apiVersion: '2006-03-01',
credentialDefaultProvider: () => credProvider.sdkCredentialProvider,
endpoint: this.integration.config.endpoint,
region: this.config.region,
region,
forcePathStyle: this.integration.config.s3ForcePathStyle,
});
// https://github.com/aws/aws-sdk-js-v3/issues/4122#issuecomment-1298968804
const endpoint = await getEndpointFromInstructions(
{
Bucket: this.config.bucketName,
Bucket: bucketName,
},
ListObjectsV2Command,
this.s3.config as unknown as Record<string, unknown>,
@@ -46,6 +46,7 @@ function readAwsS3Config(id: string, config: Config): AwsS3Config {
const bucketName = config.getString('bucketName');
const region = config.getOptionalString('region');
const prefix = config.getOptionalString('prefix');
const accountId = config.getOptionalString('accountId');
const schedule = config.has('schedule')
? readTaskScheduleDefinitionFromConfig(config.getConfig('schedule'))
@@ -57,5 +58,6 @@ function readAwsS3Config(id: string, config: Config): AwsS3Config {
region,
prefix,
schedule,
accountId,
};
}
@@ -22,4 +22,5 @@ export type AwsS3Config = {
prefix?: string;
region?: string;
schedule?: TaskScheduleDefinition;
accountId?: string;
};
@@ -1,5 +1,33 @@
# @backstage/plugin-catalog-backend-module-azure
## 0.1.19-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-tasks@0.5.5-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
## 0.1.19-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/backend-tasks@0.5.5-next.1
- @backstage/integration@1.5.1
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
- @backstage/types@1.1.0
- @backstage/plugin-catalog-common@1.0.15
## 0.1.19-next.0
### Patch Changes
+30 -30
View File
@@ -16,35 +16,6 @@
import { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
interface AzureDevOpsConfig {
/**
* (Optional) The DevOps host; leave empty for `dev.azure.com`, otherwise set to your self-hosted instance host.
*/
host: string;
/**
* (Required) Your organization slug.
*/
organization: string;
/**
* (Required) Your project slug.
*/
project: string;
/**
* (Optional) The repository name. Wildcards are supported as show on the examples above.
* If not set, all repositories will be searched.
*/
repository?: string;
/**
* (Optional) Where to find catalog-info.yaml files. Wildcards are supported.
* If not set, defaults to /catalog-info.yaml.
*/
path?: string;
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
}
export interface Config {
catalog?: {
/**
@@ -54,7 +25,36 @@ export interface Config {
/**
* AzureDevopsEntityProvider configuration
*/
azureDevOps?: Record<string, AzureDevOpsConfig>;
azureDevOps?: {
[name: string]: {
/**
* (Optional) The DevOps host; leave empty for `dev.azure.com`, otherwise set to your self-hosted instance host.
*/
host: string;
/**
* (Required) Your organization slug.
*/
organization: string;
/**
* (Required) Your project slug.
*/
project: string;
/**
* (Optional) The repository name. Wildcards are supported as show on the examples above.
* If not set, all repositories will be searched.
*/
repository?: string;
/**
* (Optional) Where to find catalog-info.yaml files. Wildcards are supported.
* If not set, defaults to /catalog-info.yaml.
*/
path?: string;
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
};
};
};
};
}
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-catalog-backend-module-azure",
"description": "A Backstage catalog backend module that helps integrate towards Azure",
"version": "0.1.19-next.0",
"version": "0.1.19-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -65,7 +65,7 @@ describe('catalogModuleAzureDevOpsEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -33,7 +33,7 @@ export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
register(env) {
env.registerInit({
deps: {
config: coreServices.config,
config: coreServices.rootConfig,
catalog: catalogProcessingExtensionPoint,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
@@ -1,5 +1,35 @@
# @backstage/plugin-catalog-backend-module-bitbucket-cloud
## 0.1.15-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-tasks@0.5.5-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
- @backstage/plugin-events-node@0.2.9-next.2
## 0.1.15-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-bitbucket-cloud-common@0.2.9-next.0
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/plugin-events-node@0.2.9-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/backend-tasks@0.5.5-next.1
- @backstage/integration@1.5.1
- @backstage/catalog-client@1.4.3
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/plugin-catalog-common@1.0.15
## 0.1.15-next.0
### Patch Changes
+12 -13
View File
@@ -45,24 +45,23 @@ export interface Config {
*/
filters?: {
/**
* (Optional) Filter for the repository slug.
* (Optional) Regular expression filter for the repository slug.
* @visibility frontend
*/
repoSlug?: RegExp;
repoSlug?: string;
/**
* (Optional) Filter for the project key.
* (Optional) Regular expression filter for the project key.
* @visibility frontend
*/
projectKey?: RegExp;
projectKey?: string;
};
/**
* (Optional) TaskScheduleDefinition for the discovery.
*/
schedule?: TaskScheduleDefinitionConfig;
}
| Record<
string,
{
| {
[name: string]: {
/**
* (Optional) Path to the catalog file. Default to "/catalog-info.yaml".
* @visibility frontend
@@ -79,22 +78,22 @@ export interface Config {
*/
filters?: {
/**
* (Optional) Filter for the repository slug.
* (Optional) Regular expression filter for the repository slug.
* @visibility frontend
*/
repoSlug?: RegExp;
repoSlug?: string;
/**
* (Optional) Filter for the project key.
* (Optional) Regular expression filter for the project key.
* @visibility frontend
*/
projectKey?: RegExp;
projectKey?: string;
};
/**
* (Optional) TaskScheduleDefinition for the discovery.
*/
schedule?: TaskScheduleDefinitionConfig;
}
>;
};
};
};
};
}
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
"description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
"version": "0.1.15-next.0",
"version": "0.1.15-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -56,7 +56,7 @@ describe('catalogModuleBitbucketCloudEntityProvider', () => {
[eventsExtensionPoint, eventsExtensionPointImpl],
],
services: [
mockServices.config.factory({
mockServices.rootConfig.factory({
data: {
catalog: {
providers: {
@@ -37,7 +37,7 @@ export const catalogModuleBitbucketCloudEntityProvider = createBackendModule({
deps: {
catalog: catalogProcessingExtensionPoint,
catalogApi: catalogServiceRef,
config: coreServices.config,
config: coreServices.rootConfig,
// TODO(pjungermann): How to make this optional for those which only want the provider without event support?
// Do we even want to support this?
events: eventsExtensionPoint,
@@ -1,5 +1,31 @@
# @backstage/plugin-catalog-backend-module-bitbucket-server
## 0.1.13-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-tasks@0.5.5-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
## 0.1.13-next.1
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- 4b82382ed8c2: Fixed invalid configuration schema. The configuration schema may be more strict as a result.
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/backend-tasks@0.5.5-next.1
- @backstage/integration@1.5.1
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
## 0.1.13-next.0
### Patch Changes
+12 -13
View File
@@ -37,24 +37,23 @@ export interface Config {
*/
filters?: {
/**
* (Optional) Filter for the repository slug.
* (Optional) Regular expression filter for the repository slug.
* @visibility frontend
*/
repoSlug?: RegExp;
repoSlug?: string;
/**
* (Optional) Filter for the project key.
* (Optional) Regular expression filter for the project key.
* @visibility frontend
*/
projectKey?: RegExp;
projectKey?: string;
};
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
}
| Record<
string,
{
| {
[name: string]: {
/**
* (Optional) Path to the catalog file. Default to "/catalog-info.yaml".
* @visibility frontend
@@ -66,22 +65,22 @@ export interface Config {
*/
filters?: {
/**
* (Optional) Filter for the repository slug.
* (Optional) Regular expression filter for the repository slug.
* @visibility frontend
*/
repoSlug?: RegExp;
repoSlug?: string;
/**
* (Optional) Filter for the project key.
* (Optional) Regular expression filter for the project key.
* @visibility frontend
*/
projectKey?: RegExp;
projectKey?: string;
};
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule?: TaskScheduleDefinitionConfig;
}
>;
};
};
};
};
}
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-bitbucket-server",
"version": "0.1.13-next.0",
"version": "0.1.13-next.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
@@ -69,7 +69,7 @@ describe('catalogModuleBitbucketServerEntityProvider', () => {
await startTestBackend({
extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
services: [
[coreServices.config, config],
[coreServices.rootConfig, config],
[coreServices.logger, getVoidLogger()],
[coreServices.scheduler, scheduler],
],
@@ -32,7 +32,7 @@ export const catalogModuleBitbucketServerEntityProvider = createBackendModule({
env.registerInit({
deps: {
catalog: catalogProcessingExtensionPoint,
config: coreServices.config,
config: coreServices.rootConfig,
logger: coreServices.logger,
scheduler: coreServices.scheduler,
},
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-bitbucket
## 0.2.15-next.2
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
## 0.2.15-next.1
### Patch Changes
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-bitbucket-cloud-common@0.2.9-next.0
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/integration@1.5.1
- @backstage/catalog-model@1.4.1
- @backstage/config@1.0.8
- @backstage/errors@1.2.1
- @backstage/types@1.1.0
## 0.2.15-next.0
### Patch Changes
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-catalog-backend-module-bitbucket",
"description": "A Backstage catalog backend module that helps integrate towards Bitbucket",
"version": "0.2.15-next.0",
"version": "0.2.15-next.2",
"deprecated": true,
"main": "src/index.ts",
"types": "src/index.ts",
@@ -0,0 +1 @@
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
@@ -0,0 +1,28 @@
# @backstage/plugin-catalog-backend-module-gcp
## 0.1.0-next.1
### Patch Changes
- Updated dependencies
- @backstage/backend-plugin-api@0.6.0-next.2
- @backstage/backend-tasks@0.5.5-next.2
- @backstage/backend-common@0.19.2-next.2
- @backstage/plugin-catalog-node@1.4.1-next.2
## 0.1.0-next.0
### Minor Changes
- 290eff6692aa: Added GCP catalog plugin with GKE provider
### Patch Changes
- 629cbd194a87: Use `coreServices.rootConfig` instead of `coreService.config`
- Updated dependencies
- @backstage/backend-common@0.19.2-next.1
- @backstage/plugin-catalog-node@1.4.1-next.1
- @backstage/backend-plugin-api@0.6.0-next.1
- @backstage/backend-tasks@0.5.5-next.1
- @backstage/config@1.0.8
- @backstage/plugin-kubernetes-common@0.6.5
@@ -0,0 +1,41 @@
# Catalog Backend Module for GCP
This is an extension module to the plugin-catalog-backend plugin, containing catalog processors and providers to ingest GCP resources as `Resource` kind entities.
## installation
Register the plugin in `catalog.ts``
```typescript
import { GkeEntityProvider } from '@backstage/plugin-catalog-backend-module-gcp';
...
builder.addEntityProvider(
GkeEntityProvider.fromConfig({
logger: env.logger,
scheduler: env.scheduler,
config: env.config
})
);
```
Update `app-config.yaml` as follows:
```yaml
catalog:
providers:
gcp:
gke:
parents:
# consult https://cloud.google.com/kubernetes-engine/docs/ for valid values
# list all clusters in the project
- 'projects/some-project/locations/-'
# list all clusters in the region, in the project
- 'projects/some-other-project/locations/some-region'
schedule: # optional; same options as in TaskScheduleDefinition
# supports cron, ISO duration, "human duration" as used in code
frequency: { minutes: 30 }
# supports ISO duration, "human duration" as used in code
timeout: { minutes: 3 }
```
@@ -0,0 +1,7 @@
## API Report File for "@backstage/plugin-catalog-backend-module-gcp"
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
```
@@ -0,0 +1,48 @@
## API Report File for "@backstage/plugin-catalog-backend-module-gcp"
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
import { BackendFeature } from '@backstage/backend-plugin-api';
import { Config } from '@backstage/config';
import * as container from '@google-cloud/container';
import { EntityProvider } from '@backstage/plugin-catalog-node';
import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
import { Logger } from 'winston';
import { SchedulerService } from '@backstage/backend-plugin-api';
// @public
export const catalogModuleGcpGkeEntityProvider: () => BackendFeature;
// @public
export class GkeEntityProvider implements EntityProvider {
// (undocumented)
connect(connection: EntityProviderConnection): Promise<void>;
// (undocumented)
static fromConfig({
logger,
scheduler,
config,
}: {
logger: Logger;
scheduler: SchedulerService;
config: Config;
}): GkeEntityProvider;
// (undocumented)
static fromConfigWithClient({
logger,
scheduler,
config,
clusterManagerClient,
}: {
logger: Logger;
scheduler: SchedulerService;
config: Config;
clusterManagerClient: container.v1.ClusterManagerClient;
}): GkeEntityProvider;
// (undocumented)
getProviderName(): string;
// (undocumented)
refresh(): Promise<void>;
}
```
+45
View File
@@ -0,0 +1,45 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
export interface Config {
catalog?: {
/**
* List of provider-specific options and attributes
*/
providers?: {
/**
* GCPCatalogModuleConfig configuration
*/
gcp?: {
/**
* Config for GKE clusters
*/
gke?: {
/**
* Locations to list clusters from
*/
parents: string[];
/**
* (Optional) TaskScheduleDefinition for the refresh.
*/
schedule: TaskScheduleDefinitionConfig;
};
};
};
};
}
@@ -0,0 +1,66 @@
{
"name": "@backstage/plugin-catalog-backend-module-gcp",
"description": "A Backstage catalog backend module that helps integrate towards GCP",
"version": "0.1.0-next.1",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
"publishConfig": {
"access": "public"
},
"exports": {
".": "./src/index.ts",
"./alpha": "./src/alpha.ts",
"./package.json": "./package.json"
},
"typesVersions": {
"*": {
"alpha": [
"src/alpha.ts"
],
"package.json": [
"package.json"
]
}
},
"backstage": {
"role": "backend-plugin-module"
},
"homepage": "https://backstage.io",
"repository": {
"type": "git",
"url": "https://github.com/backstage/backstage",
"directory": "plugins/catalog-backend-module-gcp"
},
"keywords": [
"backstage"
],
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test",
"prepack": "backstage-cli package prepack",
"postpack": "backstage-cli package postpack",
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "workspace:^",
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/backend-tasks": "workspace:^",
"@backstage/config": "workspace:^",
"@backstage/plugin-catalog-node": "workspace:^",
"@backstage/plugin-kubernetes-common": "workspace:^",
"@google-cloud/container": "^4.15.0",
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^"
},
"files": [
"config.d.ts",
"dist"
],
"configSchema": "config.d.ts"
}
@@ -0,0 +1,23 @@
/*
* Copyright 2023 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* A Backstage catalog backend module that helps integrate towards GCP
*
* @packageDocumentation
*/
export {};

Some files were not shown because too many files have changed in this diff Show More