@terreno/api 57.4.0 → 57.6.1
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/README.md +5 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/api.js +617 -852
- package/dist/audit/auditApp.js +48 -89
- package/dist/audit/auditEventModel.js +15 -16
- package/dist/audit/cloudTasksEnqueue.js +56 -149
- package/dist/audit/diff.js +70 -160
- package/dist/audit/processQueue.js +25 -70
- package/dist/audit/rbacSink.js +25 -66
- package/dist/audit/record.js +129 -251
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.js +32 -47
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +2 -0
- package/dist/index.js +7 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.js +56 -150
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +2 -42
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
- package/dist/migrations/generate.js +107 -229
- package/dist/migrations/load.js +75 -201
- package/dist/migrations/lock.js +54 -126
- package/dist/migrations/runner.js +192 -446
- package/dist/migrations/schemaCatalog.js +122 -263
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.js +6 -6
- package/dist/models/notificationPreference.js +6 -6
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.js +133 -273
- package/dist/notifications/notificationsApp.js +85 -179
- package/dist/notifications/notificationsBeforeSend.js +19 -64
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.js +107 -122
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.js +177 -286
- package/dist/orgs/orgContext.js +87 -157
- package/dist/orgs/orgPermissions.js +29 -68
- package/dist/orgs/orgPlugin.js +9 -27
- package/dist/orgs/organizationModel.js +65 -166
- package/dist/orgs/organizationSettings.js +29 -36
- package/dist/orgs/orgsApp.js +346 -608
- package/dist/permissions.js +88 -181
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.js +48 -99
- package/dist/rateLimit/mongoStore.js +54 -112
- package/dist/rateLimit/policies.js +41 -75
- package/dist/rateLimit/redisStore.js +39 -133
- package/dist/rbac/access.js +119 -267
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.js +28 -99
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.js +130 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +148 -342
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.js +44 -171
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.js +23 -91
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.js +489 -800
- package/dist/realtime/deprecation.js +8 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.js +247 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +179 -274
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.js +58 -170
- package/dist/sync/adminWindowAccess.js +15 -86
- package/dist/sync/adminWindowMutation.js +110 -181
- package/dist/sync/executors.js +425 -629
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.js +533 -801
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +29 -49
- package/dist/sync/routes.js +484 -817
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.js +253 -478
- package/dist/sync/streams.js +49 -117
- package/dist/sync/syncApp.js +12 -15
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.js +166 -276
- package/dist/tests/createTestData.js +146 -256
- package/dist/tests/models.js +14 -54
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.js +31 -93
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.js +9 -9
- package/dist/webhooks/rawBody.js +1 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +6 -6
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/api.arrayOperations.test.ts +44 -0
- package/src/api.ts +64 -39
- package/src/audit/auditApp.test.ts +5 -5
- package/src/audit/auditEventModel.ts +7 -3
- package/src/audit/auditRouter.test.ts +5 -5
- package/src/audit/rbacSink.test.ts +2 -2
- package/src/audit/record.test.ts +2 -2
- package/src/audit/record.ts +3 -2
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/configurationPlugin.test.ts +1 -11
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +7 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/migrations/cli.test.ts +0 -23
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +3 -2
- package/src/models/notificationPreference.ts +1 -1
- package/src/notifications/notificationsApp.test.ts +24 -1
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/orgs/orgPlugin.ts +1 -1
- package/src/orgs/organizationModel.ts +11 -6
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/realtime/realtimeApp.ts +1 -1
- package/src/sync/integration.test.ts +2 -2
- package/src/terrenoApp.ts +3 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +2 -0
package/dist/secretProviders.js
CHANGED
|
@@ -1,105 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
45
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
46
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
47
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
48
|
-
function step(op) {
|
|
49
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
50
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
51
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
52
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
53
|
-
switch (op[0]) {
|
|
54
|
-
case 0: case 1: t = op; break;
|
|
55
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
56
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
57
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
58
|
-
default:
|
|
59
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
60
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
61
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
62
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
63
|
-
if (t[2]) _.ops.pop();
|
|
64
|
-
_.trys.pop(); continue;
|
|
65
|
-
}
|
|
66
|
-
op = body.call(thisArg, _);
|
|
67
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
68
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
72
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
73
|
-
if (!m) return o;
|
|
74
|
-
var i = m.call(o), r, ar = [], e;
|
|
75
|
-
try {
|
|
76
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
77
|
-
}
|
|
78
|
-
catch (error) { e = { error: error }; }
|
|
79
|
-
finally {
|
|
80
|
-
try {
|
|
81
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
82
|
-
}
|
|
83
|
-
finally { if (e) throw e.error; }
|
|
84
|
-
}
|
|
85
|
-
return ar;
|
|
86
|
-
};
|
|
87
|
-
var __values = (this && this.__values) || function(o) {
|
|
88
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
89
|
-
if (m) return m.call(o);
|
|
90
|
-
if (o && typeof o.length === "number") return {
|
|
91
|
-
next: function () {
|
|
92
|
-
if (o && i >= o.length) o = void 0;
|
|
93
|
-
return { value: o && o[i++], done: !o };
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
97
|
-
};
|
|
98
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
99
3
|
exports.CachingSecretProvider = exports.CompositeSecretProvider = exports.GcpSecretProvider = exports.EnvSecretProvider = void 0;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
4
|
+
const luxon_1 = require("luxon");
|
|
5
|
+
const errors_1 = require("./errors");
|
|
6
|
+
const logger_1 = require("./logger");
|
|
103
7
|
/**
|
|
104
8
|
* Secret provider that reads secrets from environment variables.
|
|
105
9
|
* Useful for local development and testing.
|
|
@@ -114,30 +18,22 @@ var logger_1 = require("./logger");
|
|
|
114
18
|
* const key = await provider.getSecret("openai-api-key");
|
|
115
19
|
* ```
|
|
116
20
|
*/
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
this.name = "env";
|
|
120
|
-
}
|
|
21
|
+
class EnvSecretProvider {
|
|
22
|
+
name = "env";
|
|
121
23
|
/**
|
|
122
24
|
* Resolve a secret from an environment variable. Environment variables have no
|
|
123
25
|
* versions, so the optional `version` parameter is ignored.
|
|
124
26
|
*/
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
return [2 /*return*/, value];
|
|
136
|
-
});
|
|
137
|
-
});
|
|
138
|
-
};
|
|
139
|
-
return EnvSecretProvider;
|
|
140
|
-
}());
|
|
27
|
+
async getSecret(secretName, _version) {
|
|
28
|
+
// Convert secret name to env var format: "openai-api-key" → "OPENAI_API_KEY"
|
|
29
|
+
const envKey = secretName.replace(/[-.]/g, "_").toUpperCase();
|
|
30
|
+
const value = process.env[envKey] ?? null;
|
|
31
|
+
if (value === null) {
|
|
32
|
+
logger_1.logger.debug(`EnvSecretProvider: no env var found for ${secretName} (tried ${envKey})`);
|
|
33
|
+
}
|
|
34
|
+
return value;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
141
37
|
exports.EnvSecretProvider = EnvSecretProvider;
|
|
142
38
|
/**
|
|
143
39
|
* Secret provider that reads secrets from Google Cloud Secret Manager.
|
|
@@ -152,56 +48,44 @@ exports.EnvSecretProvider = EnvSecretProvider;
|
|
|
152
48
|
* const key = await provider.getSecret("openai-api-key");
|
|
153
49
|
* ```
|
|
154
50
|
*/
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
51
|
+
class GcpSecretProvider {
|
|
52
|
+
name = "gcp";
|
|
53
|
+
projectId;
|
|
54
|
+
client = null;
|
|
55
|
+
loadModule;
|
|
56
|
+
constructor(options) {
|
|
160
57
|
this.projectId = options.projectId;
|
|
161
58
|
this.loadModule =
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
59
|
+
options.loadModule ??
|
|
60
|
+
(() => {
|
|
61
|
+
// Dynamic import — @google-cloud/secret-manager is an optional peer dependency
|
|
62
|
+
const moduleName = "@google-cloud/secret-manager";
|
|
63
|
+
return import(/* webpackIgnore: true */ moduleName);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
async getClient() {
|
|
67
|
+
if (!this.client) {
|
|
68
|
+
let mod;
|
|
69
|
+
try {
|
|
70
|
+
mod = await this.loadModule();
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
throw new errors_1.APIError({
|
|
74
|
+
status: 500,
|
|
75
|
+
title: "GcpSecretProvider requires @google-cloud/secret-manager. Install it with: bun add @google-cloud/secret-manager",
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
const SecretManagerServiceClient = mod.SecretManagerServiceClient ?? mod.default?.SecretManagerServiceClient;
|
|
79
|
+
if (!SecretManagerServiceClient) {
|
|
80
|
+
throw new errors_1.APIError({
|
|
81
|
+
status: 500,
|
|
82
|
+
title: "SecretManagerServiceClient not found in @google-cloud/secret-manager module",
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
this.client = new SecretManagerServiceClient();
|
|
86
|
+
}
|
|
87
|
+
return this.client;
|
|
167
88
|
}
|
|
168
|
-
GcpSecretProvider.prototype.getClient = function () {
|
|
169
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
170
|
-
var mod, _a, SecretManagerServiceClient;
|
|
171
|
-
var _b, _c;
|
|
172
|
-
return __generator(this, function (_d) {
|
|
173
|
-
switch (_d.label) {
|
|
174
|
-
case 0:
|
|
175
|
-
if (!!this.client) return [3 /*break*/, 5];
|
|
176
|
-
mod = void 0;
|
|
177
|
-
_d.label = 1;
|
|
178
|
-
case 1:
|
|
179
|
-
_d.trys.push([1, 3, , 4]);
|
|
180
|
-
return [4 /*yield*/, this.loadModule()];
|
|
181
|
-
case 2:
|
|
182
|
-
mod = _d.sent();
|
|
183
|
-
return [3 /*break*/, 4];
|
|
184
|
-
case 3:
|
|
185
|
-
_a = _d.sent();
|
|
186
|
-
throw new errors_1.APIError({
|
|
187
|
-
status: 500,
|
|
188
|
-
title: "GcpSecretProvider requires @google-cloud/secret-manager. Install it with: bun add @google-cloud/secret-manager",
|
|
189
|
-
});
|
|
190
|
-
case 4:
|
|
191
|
-
SecretManagerServiceClient = (_b = mod.SecretManagerServiceClient) !== null && _b !== void 0 ? _b : (_c = mod.default) === null || _c === void 0 ? void 0 : _c.SecretManagerServiceClient;
|
|
192
|
-
if (!SecretManagerServiceClient) {
|
|
193
|
-
throw new errors_1.APIError({
|
|
194
|
-
status: 500,
|
|
195
|
-
title: "SecretManagerServiceClient not found in @google-cloud/secret-manager module",
|
|
196
|
-
});
|
|
197
|
-
}
|
|
198
|
-
this.client = new SecretManagerServiceClient();
|
|
199
|
-
_d.label = 5;
|
|
200
|
-
case 5: return [2 /*return*/, this.client];
|
|
201
|
-
}
|
|
202
|
-
});
|
|
203
|
-
});
|
|
204
|
-
};
|
|
205
89
|
/**
|
|
206
90
|
* Resolve a secret from Google Cloud Secret Manager.
|
|
207
91
|
*
|
|
@@ -212,52 +96,38 @@ var GcpSecretProvider = /** @class */ (function () {
|
|
|
212
96
|
* (e.g. "3"). Defaults to "latest". Ignored when `secretName` already
|
|
213
97
|
* contains an explicit `/versions/...` suffix.
|
|
214
98
|
*/
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
error_1 = _c.sent();
|
|
248
|
-
if (error_1 instanceof Error && "code" in error_1 && error_1.code === 5) {
|
|
249
|
-
// NOT_FOUND
|
|
250
|
-
logger_1.logger.warn("GcpSecretProvider: secret ".concat(secretName, " not found"));
|
|
251
|
-
return [2 /*return*/, null];
|
|
252
|
-
}
|
|
253
|
-
throw error_1;
|
|
254
|
-
case 5: return [2 /*return*/];
|
|
255
|
-
}
|
|
256
|
-
});
|
|
257
|
-
});
|
|
258
|
-
};
|
|
259
|
-
return GcpSecretProvider;
|
|
260
|
-
}());
|
|
99
|
+
async getSecret(secretName, version) {
|
|
100
|
+
const client = await this.getClient();
|
|
101
|
+
const resolvedVersion = version ?? "latest";
|
|
102
|
+
let resourceName;
|
|
103
|
+
if (secretName.startsWith("projects/")) {
|
|
104
|
+
// Honor a full resource path. Only append a version when one is not present.
|
|
105
|
+
resourceName = secretName.includes("/versions/")
|
|
106
|
+
? secretName
|
|
107
|
+
: `${secretName}/versions/${resolvedVersion}`;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
resourceName = `projects/${this.projectId}/secrets/${secretName}/versions/${resolvedVersion}`;
|
|
111
|
+
}
|
|
112
|
+
try {
|
|
113
|
+
const [version] = await client.accessSecretVersion({ name: resourceName });
|
|
114
|
+
const payload = version.payload?.data;
|
|
115
|
+
if (!payload) {
|
|
116
|
+
logger_1.logger.warn(`GcpSecretProvider: secret ${secretName} has no payload`);
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
return typeof payload === "string" ? payload : new TextDecoder().decode(payload);
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
if (error instanceof Error && "code" in error && error.code === 5) {
|
|
123
|
+
// NOT_FOUND
|
|
124
|
+
logger_1.logger.warn(`GcpSecretProvider: secret ${secretName} not found`);
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
throw error;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
261
131
|
exports.GcpSecretProvider = GcpSecretProvider;
|
|
262
132
|
/**
|
|
263
133
|
* Secret provider that delegates to an ordered list of providers, returning the
|
|
@@ -277,8 +147,10 @@ exports.GcpSecretProvider = GcpSecretProvider;
|
|
|
277
147
|
* const key = await provider.getSecret("openai-api-key");
|
|
278
148
|
* ```
|
|
279
149
|
*/
|
|
280
|
-
|
|
281
|
-
|
|
150
|
+
class CompositeSecretProvider {
|
|
151
|
+
name;
|
|
152
|
+
providers;
|
|
153
|
+
constructor(providers) {
|
|
282
154
|
if (!providers || providers.length === 0) {
|
|
283
155
|
throw new errors_1.APIError({
|
|
284
156
|
status: 500,
|
|
@@ -286,57 +158,25 @@ var CompositeSecretProvider = /** @class */ (function () {
|
|
|
286
158
|
});
|
|
287
159
|
}
|
|
288
160
|
this.providers = providers;
|
|
289
|
-
this.name =
|
|
161
|
+
this.name = `composite(${providers.map((p) => p.name).join(",")})`;
|
|
290
162
|
}
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
case 0:
|
|
298
|
-
_d.trys.push([0, 7, 8, 9]);
|
|
299
|
-
_a = __values(this.providers), _b = _a.next();
|
|
300
|
-
_d.label = 1;
|
|
301
|
-
case 1:
|
|
302
|
-
if (!!_b.done) return [3 /*break*/, 6];
|
|
303
|
-
provider = _b.value;
|
|
304
|
-
_d.label = 2;
|
|
305
|
-
case 2:
|
|
306
|
-
_d.trys.push([2, 4, , 5]);
|
|
307
|
-
return [4 /*yield*/, provider.getSecret(secretName, version)];
|
|
308
|
-
case 3:
|
|
309
|
-
value = _d.sent();
|
|
310
|
-
if (value !== null) {
|
|
311
|
-
return [2 /*return*/, value];
|
|
312
|
-
}
|
|
313
|
-
return [3 /*break*/, 5];
|
|
314
|
-
case 4:
|
|
315
|
-
error_2 = _d.sent();
|
|
316
|
-
message = error_2 instanceof Error ? error_2.message : String(error_2);
|
|
317
|
-
logger_1.logger.warn("CompositeSecretProvider: provider ".concat(provider.name, " failed for secret ").concat(secretName, ": ").concat(message));
|
|
318
|
-
return [3 /*break*/, 5];
|
|
319
|
-
case 5:
|
|
320
|
-
_b = _a.next();
|
|
321
|
-
return [3 /*break*/, 1];
|
|
322
|
-
case 6: return [3 /*break*/, 9];
|
|
323
|
-
case 7:
|
|
324
|
-
e_1_1 = _d.sent();
|
|
325
|
-
e_1 = { error: e_1_1 };
|
|
326
|
-
return [3 /*break*/, 9];
|
|
327
|
-
case 8:
|
|
328
|
-
try {
|
|
329
|
-
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
330
|
-
}
|
|
331
|
-
finally { if (e_1) throw e_1.error; }
|
|
332
|
-
return [7 /*endfinally*/];
|
|
333
|
-
case 9: return [2 /*return*/, null];
|
|
163
|
+
async getSecret(secretName, version) {
|
|
164
|
+
for (const provider of this.providers) {
|
|
165
|
+
try {
|
|
166
|
+
const value = await provider.getSecret(secretName, version);
|
|
167
|
+
if (value !== null) {
|
|
168
|
+
return value;
|
|
334
169
|
}
|
|
335
|
-
}
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
}
|
|
170
|
+
}
|
|
171
|
+
catch (error) {
|
|
172
|
+
// Never log the secret value — only the name and which provider failed.
|
|
173
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
174
|
+
logger_1.logger.warn(`CompositeSecretProvider: provider ${provider.name} failed for secret ${secretName}: ${message}`);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
return null;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
340
180
|
exports.CompositeSecretProvider = CompositeSecretProvider;
|
|
341
181
|
/**
|
|
342
182
|
* Secret provider that wraps any provider with an in-memory TTL cache.
|
|
@@ -357,46 +197,37 @@ exports.CompositeSecretProvider = CompositeSecretProvider;
|
|
|
357
197
|
* );
|
|
358
198
|
* ```
|
|
359
199
|
*/
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
200
|
+
class CachingSecretProvider {
|
|
201
|
+
name;
|
|
202
|
+
provider;
|
|
203
|
+
ttlMs;
|
|
204
|
+
cache = new Map();
|
|
205
|
+
constructor(provider, options) {
|
|
364
206
|
this.provider = provider;
|
|
365
|
-
this.ttlMs =
|
|
366
|
-
this.name =
|
|
207
|
+
this.ttlMs = options?.ttlMs ?? 60_000;
|
|
208
|
+
this.name = `caching(${provider.name})`;
|
|
209
|
+
}
|
|
210
|
+
cacheKey(secretName, version) {
|
|
211
|
+
return `${secretName}@${version ?? "latest"}`;
|
|
212
|
+
}
|
|
213
|
+
async getSecret(secretName, version) {
|
|
214
|
+
const key = this.cacheKey(secretName, version);
|
|
215
|
+
const now = luxon_1.DateTime.now().toMillis();
|
|
216
|
+
const cached = this.cache.get(key);
|
|
217
|
+
if (cached && cached.expiresAt > now) {
|
|
218
|
+
return cached.value;
|
|
219
|
+
}
|
|
220
|
+
const value = await this.provider.getSecret(secretName, version);
|
|
221
|
+
this.cache.set(key, { expiresAt: now + this.ttlMs, value });
|
|
222
|
+
return value;
|
|
367
223
|
}
|
|
368
|
-
CachingSecretProvider.prototype.cacheKey = function (secretName, version) {
|
|
369
|
-
return "".concat(secretName, "@").concat(version !== null && version !== void 0 ? version : "latest");
|
|
370
|
-
};
|
|
371
|
-
CachingSecretProvider.prototype.getSecret = function (secretName, version) {
|
|
372
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
373
|
-
var key, now, cached, value;
|
|
374
|
-
return __generator(this, function (_a) {
|
|
375
|
-
switch (_a.label) {
|
|
376
|
-
case 0:
|
|
377
|
-
key = this.cacheKey(secretName, version);
|
|
378
|
-
now = luxon_1.DateTime.now().toMillis();
|
|
379
|
-
cached = this.cache.get(key);
|
|
380
|
-
if (cached && cached.expiresAt > now) {
|
|
381
|
-
return [2 /*return*/, cached.value];
|
|
382
|
-
}
|
|
383
|
-
return [4 /*yield*/, this.provider.getSecret(secretName, version)];
|
|
384
|
-
case 1:
|
|
385
|
-
value = _a.sent();
|
|
386
|
-
this.cache.set(key, { expiresAt: now + this.ttlMs, value: value });
|
|
387
|
-
return [2 /*return*/, value];
|
|
388
|
-
}
|
|
389
|
-
});
|
|
390
|
-
});
|
|
391
|
-
};
|
|
392
224
|
/** Clears the entire cache. Useful on secret rotation and in tests. */
|
|
393
|
-
|
|
225
|
+
clear() {
|
|
394
226
|
this.cache.clear();
|
|
395
|
-
}
|
|
227
|
+
}
|
|
396
228
|
/** Invalidates a single cached secret by name (and optional version). */
|
|
397
|
-
|
|
229
|
+
clearKey(secretName, version) {
|
|
398
230
|
this.cache.delete(this.cacheKey(secretName, version));
|
|
399
|
-
}
|
|
400
|
-
|
|
401
|
-
}());
|
|
231
|
+
}
|
|
232
|
+
}
|
|
402
233
|
exports.CachingSecretProvider = CachingSecretProvider;
|