@backstage/plugin-kubernetes-node 0.3.1-next.1 → 0.3.2-next.0
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 +20 -0
- package/dist/auth/PinnipedHelper.cjs.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @backstage/plugin-kubernetes-node
|
|
2
2
|
|
|
3
|
+
## 0.3.2-next.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 3507fcd: Just some more circular dep cleanup
|
|
8
|
+
- Updated dependencies
|
|
9
|
+
- @backstage/catalog-model@1.7.5-next.0
|
|
10
|
+
- @backstage/backend-plugin-api@1.4.1-next.0
|
|
11
|
+
- @backstage/plugin-kubernetes-common@0.9.6-next.0
|
|
12
|
+
|
|
13
|
+
## 0.3.1
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- Updated dependencies
|
|
18
|
+
- @backstage/backend-plugin-api@1.4.0
|
|
19
|
+
- @backstage/catalog-model@1.7.4
|
|
20
|
+
- @backstage/types@1.2.1
|
|
21
|
+
- @backstage/plugin-kubernetes-common@0.9.5
|
|
22
|
+
|
|
3
23
|
## 0.3.1-next.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PinnipedHelper.cjs.js","sources":["../../src/auth/PinnipedHelper.ts"],"sourcesContent":["/*\n * Copyright 2024 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 { LoggerService } from '@backstage/backend-plugin-api';\nimport
|
|
1
|
+
{"version":3,"file":"PinnipedHelper.cjs.js","sources":["../../src/auth/PinnipedHelper.ts"],"sourcesContent":["/*\n * Copyright 2024 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 { LoggerService } from '@backstage/backend-plugin-api';\nimport * as https from 'https';\nimport fetch, { RequestInit } from 'node-fetch';\nimport { ClusterDetails } from '../types/types';\n\n/**\n *\n * @public\n */\nexport type PinnipedClientCerts = {\n key: string;\n cert: string;\n expirationTimestamp: string;\n};\n\n/**\n *\n * @public\n */\nexport type PinnipedParameters = {\n clusterScopedIdToken: string;\n authenticator: {\n apiGroup: string;\n kind: string;\n name: string;\n };\n tokenCredentialRequest?: {\n apiGroup?: string;\n };\n};\n\n/**\n *\n * @public\n */\nexport class PinnipedHelper {\n constructor(private readonly logger: LoggerService) {}\n\n public async tokenCredentialRequest(\n clusterDetails: ClusterDetails,\n pinnipedParams: PinnipedParameters,\n ): Promise<PinnipedClientCerts> {\n this.logger.debug('Pinniped: Requesting client Certs to Concierge');\n return await this.exchangeClusterTokentoClientCerts(\n clusterDetails,\n pinnipedParams,\n );\n }\n\n private async exchangeClusterTokentoClientCerts(\n clusterDetails: ClusterDetails,\n pinnipedParams: PinnipedParameters,\n ): Promise<PinnipedClientCerts> {\n const url: URL = new URL(clusterDetails.url);\n const apiGroup =\n pinnipedParams.tokenCredentialRequest?.apiGroup ??\n 'login.concierge.pinniped.dev/v1alpha1';\n\n url.pathname = `/apis/${apiGroup}/tokencredentialrequests`;\n\n const requestInit = await this.buildRequestForPinniped(\n url,\n clusterDetails,\n pinnipedParams,\n );\n\n this.logger.info(\n 'Fetching client certs for mTLS authentication on Pinniped',\n );\n let response;\n try {\n response = await fetch(url, requestInit);\n } catch (error) {\n this.logger.error('Pinniped request error', error);\n throw error;\n }\n\n const data: any = await response.json();\n\n if (data.status.credential) {\n const result = {\n key: data.status.credential.clientKeyData,\n cert: data.status.credential.clientCertificateData,\n expirationTimestamp: data.status.credential.expirationTimestamp,\n };\n return Promise.resolve(result);\n }\n\n this.logger.error('Unable to fetch client certs,', data.status);\n return Promise.reject(data.status.message);\n }\n\n private async buildRequestForPinniped(\n url: URL,\n clusterDetails: ClusterDetails,\n pinnipedParams: PinnipedParameters,\n ): Promise<fetch.RequestInit> {\n const { bufferFromFileOrString } = await import('@kubernetes/client-node');\n\n const body = {\n apiVersion:\n pinnipedParams.tokenCredentialRequest?.apiGroup ??\n 'login.concierge.pinniped.dev/v1alpha1',\n kind: 'TokenCredentialRequest',\n spec: {\n authenticator: pinnipedParams.authenticator,\n token: pinnipedParams.clusterScopedIdToken,\n },\n };\n const requestInit: RequestInit = {\n method: 'POST',\n headers: {\n Accept: 'application/json',\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(body),\n };\n\n if (url.protocol === 'https:') {\n requestInit.agent = new https.Agent({\n ca:\n bufferFromFileOrString(\n clusterDetails.caFile,\n clusterDetails.caData,\n ) ?? undefined,\n rejectUnauthorized: !clusterDetails.skipTLSVerify,\n });\n }\n\n return requestInit;\n }\n}\n"],"names":["fetch","https"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDO,MAAM,cAAe,CAAA;AAAA,EAC1B,YAA6B,MAAuB,EAAA;AAAvB,IAAA,IAAA,CAAA,MAAA,GAAA,MAAA;AAAA;AAAwB,EAErD,MAAa,sBACX,CAAA,cAAA,EACA,cAC8B,EAAA;AAC9B,IAAK,IAAA,CAAA,MAAA,CAAO,MAAM,gDAAgD,CAAA;AAClE,IAAA,OAAO,MAAM,IAAK,CAAA,iCAAA;AAAA,MAChB,cAAA;AAAA,MACA;AAAA,KACF;AAAA;AACF,EAEA,MAAc,iCACZ,CAAA,cAAA,EACA,cAC8B,EAAA;AAC9B,IAAA,MAAM,GAAW,GAAA,IAAI,GAAI,CAAA,cAAA,CAAe,GAAG,CAAA;AAC3C,IAAM,MAAA,QAAA,GACJ,cAAe,CAAA,sBAAA,EAAwB,QACvC,IAAA,uCAAA;AAEF,IAAI,GAAA,CAAA,QAAA,GAAW,SAAS,QAAQ,CAAA,wBAAA,CAAA;AAEhC,IAAM,MAAA,WAAA,GAAc,MAAM,IAAK,CAAA,uBAAA;AAAA,MAC7B,GAAA;AAAA,MACA,cAAA;AAAA,MACA;AAAA,KACF;AAEA,IAAA,IAAA,CAAK,MAAO,CAAA,IAAA;AAAA,MACV;AAAA,KACF;AACA,IAAI,IAAA,QAAA;AACJ,IAAI,IAAA;AACF,MAAW,QAAA,GAAA,MAAMA,sBAAM,CAAA,GAAA,EAAK,WAAW,CAAA;AAAA,aAChC,KAAO,EAAA;AACd,MAAK,IAAA,CAAA,MAAA,CAAO,KAAM,CAAA,wBAAA,EAA0B,KAAK,CAAA;AACjD,MAAM,MAAA,KAAA;AAAA;AAGR,IAAM,MAAA,IAAA,GAAY,MAAM,QAAA,CAAS,IAAK,EAAA;AAEtC,IAAI,IAAA,IAAA,CAAK,OAAO,UAAY,EAAA;AAC1B,MAAA,MAAM,MAAS,GAAA;AAAA,QACb,GAAA,EAAK,IAAK,CAAA,MAAA,CAAO,UAAW,CAAA,aAAA;AAAA,QAC5B,IAAA,EAAM,IAAK,CAAA,MAAA,CAAO,UAAW,CAAA,qBAAA;AAAA,QAC7B,mBAAA,EAAqB,IAAK,CAAA,MAAA,CAAO,UAAW,CAAA;AAAA,OAC9C;AACA,MAAO,OAAA,OAAA,CAAQ,QAAQ,MAAM,CAAA;AAAA;AAG/B,IAAA,IAAA,CAAK,MAAO,CAAA,KAAA,CAAM,+BAAiC,EAAA,IAAA,CAAK,MAAM,CAAA;AAC9D,IAAA,OAAO,OAAQ,CAAA,MAAA,CAAO,IAAK,CAAA,MAAA,CAAO,OAAO,CAAA;AAAA;AAC3C,EAEA,MAAc,uBAAA,CACZ,GACA,EAAA,cAAA,EACA,cAC4B,EAAA;AAC5B,IAAA,MAAM,EAAE,sBAAA,EAA2B,GAAA,MAAM,OAAO,yBAAyB,CAAA;AAEzE,IAAA,MAAM,IAAO,GAAA;AAAA,MACX,UAAA,EACE,cAAe,CAAA,sBAAA,EAAwB,QACvC,IAAA,uCAAA;AAAA,MACF,IAAM,EAAA,wBAAA;AAAA,MACN,IAAM,EAAA;AAAA,QACJ,eAAe,cAAe,CAAA,aAAA;AAAA,QAC9B,OAAO,cAAe,CAAA;AAAA;AACxB,KACF;AACA,IAAA,MAAM,WAA2B,GAAA;AAAA,MAC/B,MAAQ,EAAA,MAAA;AAAA,MACR,OAAS,EAAA;AAAA,QACP,MAAQ,EAAA,kBAAA;AAAA,QACR,cAAgB,EAAA;AAAA,OAClB;AAAA,MACA,IAAA,EAAM,IAAK,CAAA,SAAA,CAAU,IAAI;AAAA,KAC3B;AAEA,IAAI,IAAA,GAAA,CAAI,aAAa,QAAU,EAAA;AAC7B,MAAY,WAAA,CAAA,KAAA,GAAQ,IAAIC,gBAAA,CAAM,KAAM,CAAA;AAAA,QAClC,EACE,EAAA,sBAAA;AAAA,UACE,cAAe,CAAA,MAAA;AAAA,UACf,cAAe,CAAA;AAAA,SACZ,IAAA,KAAA,CAAA;AAAA,QACP,kBAAA,EAAoB,CAAC,cAAe,CAAA;AAAA,OACrC,CAAA;AAAA;AAGH,IAAO,OAAA,WAAA;AAAA;AAEX;;;;"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as _backstage_backend_plugin_api from '@backstage/backend-plugin-api';
|
|
2
2
|
import { BackstageCredentials, LoggerService } from '@backstage/backend-plugin-api';
|
|
3
|
-
import { KubernetesObjectsProvider as KubernetesObjectsProvider$1, KubernetesClustersSupplier as KubernetesClustersSupplier$1, AuthenticationStrategy as AuthenticationStrategy$1, KubernetesFetcher as KubernetesFetcher$1, KubernetesServiceLocator as KubernetesServiceLocator$1
|
|
3
|
+
import { KubernetesObjectsProvider as KubernetesObjectsProvider$1, KubernetesClustersSupplier as KubernetesClustersSupplier$1, AuthenticationStrategy as AuthenticationStrategy$1, KubernetesFetcher as KubernetesFetcher$1, KubernetesServiceLocator as KubernetesServiceLocator$1 } from '@backstage/plugin-kubernetes-node';
|
|
4
4
|
import { Entity } from '@backstage/catalog-model';
|
|
5
5
|
import { ObjectsByEntityResponse, KubernetesRequestAuth, CustomResourceMatcher, KubernetesFetchError, FetchResponse } from '@backstage/plugin-kubernetes-common';
|
|
6
6
|
import { JsonObject } from '@backstage/types';
|
|
@@ -308,7 +308,7 @@ type PinnipedParameters = {
|
|
|
308
308
|
declare class PinnipedHelper {
|
|
309
309
|
private readonly logger;
|
|
310
310
|
constructor(logger: LoggerService);
|
|
311
|
-
tokenCredentialRequest(clusterDetails: ClusterDetails
|
|
311
|
+
tokenCredentialRequest(clusterDetails: ClusterDetails, pinnipedParams: PinnipedParameters): Promise<PinnipedClientCerts>;
|
|
312
312
|
private exchangeClusterTokentoClientCerts;
|
|
313
313
|
private buildRequestForPinniped;
|
|
314
314
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backstage/plugin-kubernetes-node",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.2-next.0",
|
|
4
4
|
"description": "Node.js library for the kubernetes plugin",
|
|
5
5
|
"backstage": {
|
|
6
6
|
"role": "node-library",
|
|
@@ -38,20 +38,20 @@
|
|
|
38
38
|
"test": "backstage-cli package test"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@backstage/backend-plugin-api": "1.4.
|
|
42
|
-
"@backstage/catalog-model": "1.7.
|
|
43
|
-
"@backstage/plugin-kubernetes-common": "0.9.
|
|
41
|
+
"@backstage/backend-plugin-api": "1.4.1-next.0",
|
|
42
|
+
"@backstage/catalog-model": "1.7.5-next.0",
|
|
43
|
+
"@backstage/plugin-kubernetes-common": "0.9.6-next.0",
|
|
44
44
|
"@backstage/types": "1.2.1",
|
|
45
45
|
"@kubernetes/client-node": "1.1.2",
|
|
46
46
|
"node-fetch": "^2.7.0",
|
|
47
47
|
"winston": "^3.2.1"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@backstage/backend-app-api": "1.2.
|
|
51
|
-
"@backstage/backend-defaults": "0.
|
|
52
|
-
"@backstage/backend-test-utils": "1.
|
|
53
|
-
"@backstage/cli": "0.
|
|
54
|
-
"@backstage/plugin-kubernetes-backend": "0.19.
|
|
50
|
+
"@backstage/backend-app-api": "1.2.5-next.0",
|
|
51
|
+
"@backstage/backend-defaults": "0.11.1-next.1",
|
|
52
|
+
"@backstage/backend-test-utils": "1.7.0-next.1",
|
|
53
|
+
"@backstage/cli": "0.33.1-next.1",
|
|
54
|
+
"@backstage/plugin-kubernetes-backend": "0.19.8-next.0",
|
|
55
55
|
"msw": "^1.3.1",
|
|
56
56
|
"supertest": "^7.0.0"
|
|
57
57
|
},
|