@backstage-community/plugin-nomad-backend 0.1.25 → 0.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/index.d.ts +8 -2
- package/dist/service/router.cjs.js +2 -3
- package/dist/service/router.cjs.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @backstage-community/plugin-nomad-backend
|
|
2
2
|
|
|
3
|
+
## 0.1.26
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 75644d9: Removed usages and references of `@backstage/backend-common`
|
|
8
|
+
|
|
9
|
+
Deprecated `createRouter` and its router options in favour of the new backend system.
|
|
10
|
+
|
|
3
11
|
## 0.1.25
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -3,12 +3,18 @@ import express from 'express';
|
|
|
3
3
|
import * as _backstage_backend_plugin_api from '@backstage/backend-plugin-api';
|
|
4
4
|
import { LoggerService } from '@backstage/backend-plugin-api';
|
|
5
5
|
|
|
6
|
-
/**
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated Please migrate to the new backend system as this will be removed in the future.
|
|
8
|
+
*
|
|
9
|
+
* @public */
|
|
7
10
|
interface RouterOptions {
|
|
8
11
|
logger: LoggerService;
|
|
9
12
|
config: Config;
|
|
10
13
|
}
|
|
11
|
-
/**
|
|
14
|
+
/**
|
|
15
|
+
* @deprecated Please migrate to the new backend system as this will be removed in the future.
|
|
16
|
+
*
|
|
17
|
+
* @public */
|
|
12
18
|
declare function createRouter(options: RouterOptions): Promise<express.Router>;
|
|
13
19
|
|
|
14
20
|
/**
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var fetch = require('node-fetch');
|
|
4
|
-
var backendCommon = require('@backstage/backend-common');
|
|
5
4
|
var errors = require('@backstage/errors');
|
|
6
5
|
var express = require('express');
|
|
7
6
|
var Router = require('express-promise-router');
|
|
7
|
+
var rootHttpRouter = require('@backstage/backend-defaults/rootHttpRouter');
|
|
8
8
|
|
|
9
9
|
function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
|
|
10
10
|
|
|
@@ -76,8 +76,7 @@ async function createRouter(options) {
|
|
|
76
76
|
logger.debug(`/v1/job/:job_id/versions response: ${versionsBody}`);
|
|
77
77
|
resp.json(versionsBody);
|
|
78
78
|
});
|
|
79
|
-
router.use(
|
|
80
|
-
router.use(backendCommon.errorHandler());
|
|
79
|
+
router.use(rootHttpRouter.MiddlewareFactory.create({ config, logger }).error());
|
|
81
80
|
return router;
|
|
82
81
|
}
|
|
83
82
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.cjs.js","sources":["../../src/service/router.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport fetch from 'node-fetch';\nimport {
|
|
1
|
+
{"version":3,"file":"router.cjs.js","sources":["../../src/service/router.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport fetch from 'node-fetch';\nimport { Config } from '@backstage/config';\nimport { InputError } from '@backstage/errors';\nimport express from 'express';\nimport Router from 'express-promise-router';\nimport { LoggerService } from '@backstage/backend-plugin-api';\nimport { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';\n\n/**\n * @deprecated Please migrate to the new backend system as this will be removed in the future.\n *\n * @public */\nexport interface RouterOptions {\n logger: LoggerService;\n config: Config;\n}\n\n/**\n * @deprecated Please migrate to the new backend system as this will be removed in the future.\n *\n * @public */\nexport async function createRouter(\n options: RouterOptions,\n): Promise<express.Router> {\n const { config, logger } = options;\n\n // Get Nomad addr and token from config\n const addr = config.getString('nomad.addr');\n const token = config.getOptionalString('nomad.token');\n\n const router = Router();\n router.use(express.json());\n\n router.get('/health', (_, resp) => {\n resp.json({ status: 'ok' });\n });\n\n router.get('/v1/allocations', async (req, res) => {\n // Check namespace argument\n const namespace = (req.query.namespace as string) ?? '';\n if (!namespace || namespace === '') {\n throw new InputError(`Missing \"namespace\" query parameter`);\n }\n\n // Check filter argument\n const filter = (req.query.filter as string) ?? '';\n logger.debug(`request headers: namespace=${namespace} filter=${filter}`);\n\n // Issue the request\n const endpoint = `${addr}/v1/allocations?namespace=${encodeURIComponent(\n namespace,\n )}&filter=${encodeURIComponent(filter)}`;\n const allocationsResp = await fetch(endpoint, {\n method: 'GET',\n headers: {\n Accept: 'application/json',\n 'X-Nomad-Token': token || '',\n },\n });\n\n // Check response\n if (allocationsResp.status !== 200) {\n const body = await allocationsResp.text();\n logger.error(`failed to call /v1/allocations endpoint: ${body}`);\n res.status(allocationsResp.status).json({ message: body });\n return;\n }\n\n // Deserialize and return\n const allocationsBody = await allocationsResp.json();\n logger.debug(`/v1/allocations response: ${allocationsBody}`);\n res.json(allocationsBody);\n });\n\n router.get('/v1/job/:job_id/versions', async (req, resp) => {\n // Check namespace argument\n const namespace = (req.query.namespace as string) ?? '';\n if (!namespace || namespace === '') {\n throw new InputError(`Missing \"namespace\" query parameter`);\n }\n\n // Get job ID\n const jobID = (req.params.job_id as string) ?? '';\n\n // Issue the request\n const apiResp = await fetch(\n `${addr}/v1/job/${jobID}/versions?namespace=${encodeURIComponent(\n namespace,\n )}`,\n {\n method: 'GET',\n headers: {\n Accept: 'application/json',\n 'X-Nomad-Token': token || '',\n },\n },\n );\n\n // Check response\n if (apiResp.status !== 200) {\n const body = await apiResp.text();\n logger.error(`failed to call /v1/job/:job_id/versions endpoint: ${body}`);\n resp.status(apiResp.status).json({ message: body });\n return;\n }\n\n // Deserialize and return\n const versionsBody = await apiResp.json();\n logger.debug(`/v1/job/:job_id/versions response: ${versionsBody}`);\n resp.json(versionsBody);\n });\n\n router.use(MiddlewareFactory.create({ config, logger }).error());\n return router;\n}\n"],"names":["Router","express","InputError","fetch","MiddlewareFactory"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backstage-community/plugin-nomad-backend",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.26",
|
|
4
4
|
"backstage": {
|
|
5
5
|
"role": "backend-plugin",
|
|
6
6
|
"pluginId": "nomad",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"test": "backstage-cli package test"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@backstage/backend-
|
|
39
|
+
"@backstage/backend-defaults": "^0.5.2",
|
|
40
40
|
"@backstage/backend-plugin-api": "^1.0.1",
|
|
41
41
|
"@backstage/config": "^1.2.0",
|
|
42
42
|
"@backstage/errors": "^1.2.4",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"yn": "^4.0.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@backstage/backend-
|
|
50
|
+
"@backstage/backend-test-utils": "1.0.2",
|
|
51
51
|
"@backstage/cli": "^0.28.0",
|
|
52
52
|
"@backstage/plugin-auth-backend": "^0.23.1",
|
|
53
53
|
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.1",
|