@geek-fun/serverlessinsight 0.9.2 → 0.9.3
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/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +1 -1
- package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +2 -2
- package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +4 -8
- package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +3 -8
- package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +4 -4
- package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
- package/.serverlessinsight/state-insight-poc-timer-app-insight-poc-timer.json.backup +28 -5
- package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
- package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +3 -3
- package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +20 -5
- package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
- package/AGENTS.md +10 -0
- package/CHANGELOG.md +34 -0
- package/README.md +29 -15
- package/README.zh-CN.md +7 -14
- package/dist/package.json +1 -1
- package/dist/src/commands/index.js +19 -3
- package/dist/src/commands/local.js +16 -3
- package/dist/src/commands/plan.js +10 -3
- package/dist/src/common/aliyunClient/apigwOperations.js +17 -1
- package/dist/src/common/aliyunClient/fc3Operations.js +7 -1
- package/dist/src/common/aliyunClient/ossOperations.js +214 -221
- package/dist/src/common/bucketPolicy.js +63 -0
- package/dist/src/common/domainUtils.js +4 -1
- package/dist/src/common/functionDefinition.js +25 -0
- package/dist/src/common/index.js +4 -0
- package/dist/src/common/jsonOutput.js +6 -1
- package/dist/src/common/nameBuilder.js +3 -1
- package/dist/src/common/planCapabilities.js +119 -0
- package/dist/src/common/planCompare.js +119 -66
- package/dist/src/common/planFormatter.js +22 -14
- package/dist/src/common/planRedaction.js +26 -0
- package/dist/src/common/refreshPlanner.js +66 -21
- package/dist/src/common/tencentClient/cosOperations.js +326 -322
- package/dist/src/common/tencentClient/scfOperations.js +9 -2
- package/dist/src/common/tencentClient/tdsqlcOperations.js +6 -11
- package/dist/src/common/triggerMapper.js +16 -1
- package/dist/src/common/volcengineClient/apigwOperations.js +82 -0
- package/dist/src/common/volcengineClient/iamOperations.js +27 -3
- package/dist/src/common/volcengineClient/tosOperations.js +62 -56
- package/dist/src/lang/en.js +28 -4
- package/dist/src/lang/zh-CN.js +28 -4
- package/dist/src/parser/eventParser.js +1 -0
- package/dist/src/parser/functionParser.js +1 -1
- package/dist/src/stack/aliyunStack/apigwExecutor.js +1 -1
- package/dist/src/stack/aliyunStack/apigwPlanner.js +103 -23
- package/dist/src/stack/aliyunStack/apigwResource.js +4 -3
- package/dist/src/stack/aliyunStack/apigwTypes.js +3 -7
- package/dist/src/stack/aliyunStack/deployer.js +2 -0
- package/dist/src/stack/aliyunStack/esServerlessTypes.js +8 -4
- package/dist/src/stack/aliyunStack/fc3Executor.js +7 -3
- package/dist/src/stack/aliyunStack/fc3Planner.js +124 -155
- package/dist/src/stack/aliyunStack/fc3Resource.js +48 -52
- package/dist/src/stack/aliyunStack/fc3Types.js +30 -16
- package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
- package/dist/src/stack/aliyunStack/ossResource.js +113 -102
- package/dist/src/stack/aliyunStack/ossTypes.js +20 -20
- package/dist/src/stack/localStack/aliyunFc.js +1 -6
- package/dist/src/stack/localStack/event.js +31 -60
- package/dist/src/stack/localStack/function.js +24 -65
- package/dist/src/stack/localStack/functionRunner.js +10 -2
- package/dist/src/stack/localStack/httpAdapter.js +54 -0
- package/dist/src/stack/localStack/httpError.js +5 -0
- package/dist/src/stack/localStack/legacyLambda.js +26 -0
- package/dist/src/stack/localStack/localContext.js +29 -0
- package/dist/src/stack/localStack/localRoute.js +12 -0
- package/dist/src/stack/localStack/localRuntimes.js +22 -0
- package/dist/src/stack/localStack/localServer.js +8 -3
- package/dist/src/stack/localStack/requestBody.js +24 -0
- package/dist/src/stack/localStack/requestId.js +18 -0
- package/dist/src/stack/localStack/tencent.js +147 -0
- package/dist/src/stack/localStack/timer.js +23 -2
- package/dist/src/stack/localStack/volcengine.js +68 -0
- package/dist/src/stack/scfStack/cosPlanner.js +9 -14
- package/dist/src/stack/scfStack/cosResource.js +42 -50
- package/dist/src/stack/scfStack/cosTypes.js +19 -14
- package/dist/src/stack/scfStack/deployer.js +2 -0
- package/dist/src/stack/scfStack/scfExecutor.js +7 -3
- package/dist/src/stack/scfStack/scfHttpTrigger.js +106 -0
- package/dist/src/stack/scfStack/scfPlanner.js +67 -16
- package/dist/src/stack/scfStack/scfResource.js +170 -321
- package/dist/src/stack/scfStack/scfTypes.js +4 -3
- package/dist/src/stack/scfStack/tdsqlcPlanner.js +10 -13
- package/dist/src/stack/volcengineStack/apigwDomains.js +64 -0
- package/dist/src/stack/volcengineStack/apigwPlanner.js +71 -15
- package/dist/src/stack/volcengineStack/apigwResource.js +60 -24
- package/dist/src/stack/volcengineStack/apigwTypes.js +5 -1
- package/dist/src/stack/volcengineStack/deployer.js +6 -0
- package/dist/src/stack/volcengineStack/tosPlanner.js +8 -13
- package/dist/src/stack/volcengineStack/tosResource.js +22 -35
- package/dist/src/stack/volcengineStack/tosTypes.js +5 -8
- package/dist/src/stack/volcengineStack/vefaasPlanner.js +142 -49
- package/dist/src/stack/volcengineStack/vefaasResource.js +17 -12
- package/dist/src/stack/volcengineStack/vefaasTypes.js +6 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/release-notes.md +79 -0
- package/samples/tencent-local/index.js +13 -0
- package/samples/tencent-local/serverlessinsight.yml +23 -0
- package/samples/volcengine-local/index.js +13 -0
- package/samples/volcengine-local/serverlessinsight.yml +28 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cloudScfToDefinition = exports.extractFunctionDomainDefinition = exports.extractScfDefinition = exports.functionToScfConfig = void 0;
|
|
4
|
+
const functionDefinition_1 = require("../../common/functionDefinition");
|
|
4
5
|
const common_1 = require("../../common");
|
|
5
6
|
const functionToScfConfig = (fn, role) => {
|
|
6
7
|
const config = {
|
|
@@ -47,7 +48,7 @@ const functionToScfConfig = (fn, role) => {
|
|
|
47
48
|
return config;
|
|
48
49
|
};
|
|
49
50
|
exports.functionToScfConfig = functionToScfConfig;
|
|
50
|
-
const extractScfDefinition = (config, codeHash, iam) => {
|
|
51
|
+
const extractScfDefinition = (config, codeHash, iam, fn) => {
|
|
51
52
|
const envMap = config.Environment?.Variables?.reduce((acc, v) => ({ ...acc, [v.Key]: v.Value }), {}) ?? {};
|
|
52
53
|
// The CLS destination is diffed by stable names (not raw ids) so planner
|
|
53
54
|
// drift detection survives logset/topic id churn across re-deploys.
|
|
@@ -69,12 +70,12 @@ const extractScfDefinition = (config, codeHash, iam) => {
|
|
|
69
70
|
imageConfig: config.ImageConfig ?? null,
|
|
70
71
|
...(logConfig ? { logConfig } : {}),
|
|
71
72
|
};
|
|
72
|
-
return iam ? { ...baseDefinition, iam } : baseDefinition;
|
|
73
|
+
return (0, functionDefinition_1.withFunctionLifecycle)(iam ? { ...baseDefinition, iam } : baseDefinition, fn);
|
|
73
74
|
};
|
|
74
75
|
exports.extractScfDefinition = extractScfDefinition;
|
|
75
76
|
const extractFunctionDomainDefinition = (fn, codeHash) => {
|
|
76
77
|
const config = (0, exports.functionToScfConfig)(fn);
|
|
77
|
-
return (0, exports.extractScfDefinition)(config, codeHash, fn.iam);
|
|
78
|
+
return (0, exports.extractScfDefinition)(config, codeHash, fn.iam, fn);
|
|
78
79
|
};
|
|
79
80
|
exports.extractFunctionDomainDefinition = extractFunctionDomainDefinition;
|
|
80
81
|
// issue #234 phase 2: cloud-side counterpart of extractScfDefinition. Mirrors
|
|
@@ -56,20 +56,17 @@ const generateDatabasePlan = async (context, state, databases) => {
|
|
|
56
56
|
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
57
57
|
})),
|
|
58
58
|
cloudToDefinition: tdsqlcTypes_1.cloudTdsqlcToDefinition,
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
// DescribeServerlessStrategy does. Unreadable strategy is not drift.
|
|
63
|
-
const desiredAutoPause = desiredDefinition.autoPause;
|
|
64
|
-
if (typeof desiredAutoPause !== 'boolean' || !clusterId) {
|
|
65
|
-
return { update: false, drifted: false };
|
|
66
|
-
}
|
|
59
|
+
enrichRemoteAttributes: async (_remote, attributes) => {
|
|
60
|
+
if (!clusterId)
|
|
61
|
+
return attributes;
|
|
67
62
|
const strategy = await (0, refreshCache_1.cachedRefreshRead)(context, `tdsqlc.getServerlessStrategy:${clusterId}`, () => client.tdsqlc.getServerlessStrategy(clusterId));
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
63
|
+
return {
|
|
64
|
+
...attributes,
|
|
65
|
+
...(strategy?.autoPause !== undefined ? { autoPause: strategy.autoPause } : {}),
|
|
66
|
+
...(strategy?.autoPauseDelay !== undefined
|
|
67
|
+
? { autoPauseDelay: strategy.autoPauseDelay }
|
|
68
|
+
: {}),
|
|
69
|
+
};
|
|
73
70
|
},
|
|
74
71
|
refresh: context.refresh,
|
|
75
72
|
});
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.reconcileGatewayDomains = exports.desiredGatewayDomains = void 0;
|
|
4
|
+
const sidUtils_1 = require("../../common/sidUtils");
|
|
5
|
+
const domainUtils_1 = require("../../common/domainUtils");
|
|
6
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
7
|
+
const desiredGatewayDomains = (event, serviceId) => {
|
|
8
|
+
if (!event.domain)
|
|
9
|
+
return [];
|
|
10
|
+
const name = String(event.domain.domain_name);
|
|
11
|
+
const www = event.domain.www_bind_apex === true ? (0, domainUtils_1.deriveWwwDomain)(name) : null;
|
|
12
|
+
return [name, ...(www ? [www] : [])].map((domainName) => ({
|
|
13
|
+
serviceId,
|
|
14
|
+
domainName,
|
|
15
|
+
certificateId: String(event.domain.certificate_id ?? ''),
|
|
16
|
+
protocol: Array.isArray(event.domain.protocol)
|
|
17
|
+
? event.domain.protocol.map(String)
|
|
18
|
+
: [String(event.domain.protocol ?? 'HTTP')],
|
|
19
|
+
sslRedirect: event.domain.protocol === 'HTTPS',
|
|
20
|
+
}));
|
|
21
|
+
};
|
|
22
|
+
exports.desiredGatewayDomains = desiredGatewayDomains;
|
|
23
|
+
const reconcileGatewayDomains = async (context, event, serviceId, existing, client, onRecord) => {
|
|
24
|
+
const desired = (0, exports.desiredGatewayDomains)(event, serviceId);
|
|
25
|
+
const owned = existing.filter((instance) => instance.type === 'VOLCENGINE_APIGW_DOMAIN');
|
|
26
|
+
const remove = async (id) => {
|
|
27
|
+
try {
|
|
28
|
+
await client.apigw.deleteCustomDomain(id);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
if (!['NotFound', 'DomainNotFound'].includes(error.code))
|
|
32
|
+
throw error;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const reads = await Promise.all(desired.map(async (config) => {
|
|
36
|
+
const recorded = owned.find((instance) => instance.domainName === config.domainName);
|
|
37
|
+
return {
|
|
38
|
+
config,
|
|
39
|
+
recorded,
|
|
40
|
+
live: recorded ? await client.apigw.getCustomDomain(recorded.id) : null,
|
|
41
|
+
};
|
|
42
|
+
}));
|
|
43
|
+
const retained = await reads.reduce(async (pending, { config, recorded, live }) => {
|
|
44
|
+
const previous = await pending;
|
|
45
|
+
const id = live ? recorded.id : await client.apigw.createCustomDomain(config);
|
|
46
|
+
if (live &&
|
|
47
|
+
(0, planCompare_1.remoteDiffersFromDesired)({ ...live, certificateId: live.certificateId ?? '' }, config)) {
|
|
48
|
+
await client.apigw.updateCustomDomain(id, config);
|
|
49
|
+
}
|
|
50
|
+
const instance = {
|
|
51
|
+
type: 'VOLCENGINE_APIGW_DOMAIN',
|
|
52
|
+
id,
|
|
53
|
+
sid: (0, sidUtils_1.buildSid)('volcengine', 'apigw', context.stage, id),
|
|
54
|
+
...config,
|
|
55
|
+
};
|
|
56
|
+
onRecord?.(instance);
|
|
57
|
+
return [...previous, instance];
|
|
58
|
+
}, Promise.resolve([]));
|
|
59
|
+
await Promise.all(owned
|
|
60
|
+
.filter((instance) => !desired.some((config) => config.domainName === instance.domainName))
|
|
61
|
+
.map((instance) => remove(instance.id)));
|
|
62
|
+
return retained;
|
|
63
|
+
};
|
|
64
|
+
exports.reconcileGatewayDomains = reconcileGatewayDomains;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateApigwPlan = void 0;
|
|
4
|
+
const apigwDomains_1 = require("./apigwDomains");
|
|
5
|
+
const apigwResource_1 = require("./apigwResource");
|
|
6
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
7
|
+
const planCapabilities_1 = require("../../common/planCapabilities");
|
|
8
|
+
const planCompare_2 = require("../../common/planCompare");
|
|
4
9
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
5
10
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
6
11
|
const concurrency_1 = require("../../common/concurrency");
|
|
7
12
|
const apigwTypes_1 = require("./apigwTypes");
|
|
8
13
|
const stateManager_1 = require("../../common/stateManager");
|
|
9
|
-
const hashUtils_1 = require("../../common/hashUtils");
|
|
10
14
|
const common_1 = require("../../common");
|
|
11
15
|
const lang_1 = require("../../lang");
|
|
12
16
|
const ownershipTag_1 = require("../ownershipTag");
|
|
@@ -34,6 +38,8 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
34
38
|
const storedTlsTopic = currentState?.instances?.find((i) => i.type === 'VOLCENGINE_TLS_TOPIC');
|
|
35
39
|
const storedTopicName = storedTlsTopic?.id?.split('/')[1];
|
|
36
40
|
const desiredDefinition = (0, apigwTypes_1.buildEventResourceDefinition)(event, storedTopicName);
|
|
41
|
+
if (currentState)
|
|
42
|
+
(0, planCapabilities_1.assertPlanIdentity)(logicalId, 'VOLCENGINE_APIGW', currentState.definition || {}, desiredDefinition);
|
|
37
43
|
if (!currentState || currentState.status === 'tainted') {
|
|
38
44
|
// No usable local state: probe the provider before planning create.
|
|
39
45
|
// If a same-named gateway already exists WITHOUT our ownership tag it
|
|
@@ -62,7 +68,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
62
68
|
if (refreshEnabled && serviceInstance) {
|
|
63
69
|
// Keep the not-found swallow OUTSIDE the cached read: a cached rejection
|
|
64
70
|
// evicts its key so the next plan pass retries against the provider.
|
|
65
|
-
cloudService = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getService:${serviceInstance.id}`, () => client.apigw.getService(serviceInstance.id))
|
|
71
|
+
cloudService = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getService:${serviceInstance.id}`, () => client.apigw.getService(serviceInstance.id));
|
|
66
72
|
if (!cloudService) {
|
|
67
73
|
return {
|
|
68
74
|
logicalId,
|
|
@@ -74,14 +80,15 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
74
80
|
}
|
|
75
81
|
}
|
|
76
82
|
const currentDefinition = currentState.definition || {};
|
|
77
|
-
const definitionChanged =
|
|
83
|
+
const definitionChanged = (0, planCompare_2.definitionsDiffer)(currentDefinition, desiredDefinition);
|
|
78
84
|
// Issue #234 phase 2: live trigger drift. The service record alone can be
|
|
79
85
|
// untouched while console edits reroute a trigger (method/path/upstream).
|
|
80
86
|
// Routes and upstreams are matched by the derived names the executor
|
|
81
87
|
// writes; a probe failure stays noop (best-effort detection) instead of
|
|
82
88
|
// fabricating drift from a transient read error.
|
|
83
89
|
let triggersDiffer = false;
|
|
84
|
-
|
|
90
|
+
let upstreamDiffers = false;
|
|
91
|
+
if (refreshEnabled && serviceInstance && event.triggers.length > 0) {
|
|
85
92
|
try {
|
|
86
93
|
const desiredTriggers = (0, apigwTypes_1.buildDesiredTriggerMap)(event, context.stage);
|
|
87
94
|
const cloudRoutes = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.listRoutesByService:${serviceInstance.id}`, () => client.apigw.listRoutesByService(serviceInstance.id));
|
|
@@ -92,33 +99,82 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
|
|
|
92
99
|
if (upstreamId && !upstreamNameById.has(upstreamId)) {
|
|
93
100
|
const upstream = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getUpstream:${upstreamId}`, () => client.apigw.getUpstream(upstreamId));
|
|
94
101
|
upstreamNameById.set(upstreamId, upstream?.upstreamName);
|
|
102
|
+
const trigger = event.triggers.find((entry) => (0, apigwTypes_1.buildDesiredTriggerMap)({ ...event, triggers: [entry] }, context.stage).has(route.routeName));
|
|
103
|
+
if (upstream && trigger) {
|
|
104
|
+
const expected = {
|
|
105
|
+
sourceType: 'VeFaas',
|
|
106
|
+
protocol: 'HTTP',
|
|
107
|
+
...(upstream.functionId !== undefined
|
|
108
|
+
? {
|
|
109
|
+
functionId: await (0, apigwResource_1.resolveFunctionIdFromState)(state, String(trigger.backend), client, context),
|
|
110
|
+
}
|
|
111
|
+
: {}),
|
|
112
|
+
};
|
|
113
|
+
upstreamDiffers ||= (0, planCompare_1.remoteDiffersFromDesired)(upstream, expected);
|
|
114
|
+
}
|
|
95
115
|
}
|
|
96
116
|
}
|
|
97
|
-
triggersDiffer =
|
|
117
|
+
triggersDiffer =
|
|
118
|
+
upstreamDiffers ||
|
|
119
|
+
(0, apigwTypes_1.cloudTriggerDiffers)(matched, upstreamNameById, desiredTriggers) ||
|
|
120
|
+
matched.some((route) => route.enable === false ||
|
|
121
|
+
(route.priority !== undefined && route.priority !== 0) ||
|
|
122
|
+
(route.upstreamIds !== undefined && route.upstreamIds.length !== 1));
|
|
98
123
|
}
|
|
99
124
|
catch (error) {
|
|
100
125
|
common_1.logger.warn(lang_1.lang.__('PLAN_EVENT_TRIGGER_PROBE_FAILED', {
|
|
101
126
|
eventName: event.name,
|
|
102
127
|
error: String(error),
|
|
103
128
|
}));
|
|
129
|
+
throw error;
|
|
104
130
|
}
|
|
105
131
|
}
|
|
106
|
-
// Issue #234 phase 3: declared custom-domain drift — the service read
|
|
107
|
-
// already carries customDomains, so this costs no extra API call.
|
|
108
|
-
const desiredDomainName = desiredDefinition.domain
|
|
109
|
-
?.domainName;
|
|
110
132
|
let domainDiffers = false;
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
133
|
+
const domainsRemoved = !event.domain &&
|
|
134
|
+
currentState.instances.some((instance) => instance.type === 'VOLCENGINE_APIGW_DOMAIN');
|
|
135
|
+
if (refreshEnabled && serviceInstance && event.domain) {
|
|
136
|
+
for (const desired of (0, apigwDomains_1.desiredGatewayDomains)(event, serviceInstance.id)) {
|
|
137
|
+
const summary = cloudService?.customDomains?.find((domain) => domain.domain === desired.domainName);
|
|
138
|
+
if (!summary) {
|
|
139
|
+
domainDiffers = true;
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
if (summary.id) {
|
|
143
|
+
const live = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getCustomDomain:${summary.id}`, () => client.apigw.getCustomDomain(summary.id));
|
|
144
|
+
domainDiffers ||=
|
|
145
|
+
!live ||
|
|
146
|
+
(0, planCompare_1.remoteDiffersFromDesired)({ ...live, certificateId: live.certificateId ?? '' }, desired);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
let logDiffers = false;
|
|
151
|
+
const gateway = currentState.instances.find((instance) => instance.type === 'VOLCENGINE_APIGW_GATEWAY');
|
|
152
|
+
const topic = currentState.instances.find((instance) => instance.type === 'VOLCENGINE_TLS_TOPIC');
|
|
153
|
+
if (refreshEnabled && event.log && gateway) {
|
|
154
|
+
const live = await (0, refreshCache_1.cachedRefreshRead)(context, `apigw.getGateway:${gateway.id}`, () => client.apigw.getGateway(gateway.id));
|
|
155
|
+
logDiffers =
|
|
156
|
+
!live ||
|
|
157
|
+
(0, planCompare_1.remoteDiffersFromDesired)({ log: live.logSpec ?? null }, {
|
|
158
|
+
log: {
|
|
159
|
+
enable: true,
|
|
160
|
+
...(topic?.projectId ? { projectId: topic.projectId } : {}),
|
|
161
|
+
...(topic?.topicId ? { topicId: topic.topicId } : {}),
|
|
162
|
+
},
|
|
163
|
+
});
|
|
114
164
|
}
|
|
115
|
-
if (definitionChanged || triggersDiffer || domainDiffers) {
|
|
165
|
+
if (definitionChanged || triggersDiffer || domainDiffers || logDiffers || domainsRemoved) {
|
|
116
166
|
return {
|
|
117
167
|
logicalId,
|
|
118
168
|
action: 'update',
|
|
119
169
|
resourceType: 'VOLCENGINE_APIGW',
|
|
120
|
-
changes: {
|
|
121
|
-
|
|
170
|
+
changes: {
|
|
171
|
+
before: {
|
|
172
|
+
...(0, planCompare_2.managedDefinition)(currentDefinition, desiredDefinition),
|
|
173
|
+
...(domainsRemoved ? { domain: currentDefinition.domain } : {}),
|
|
174
|
+
},
|
|
175
|
+
after: (0, planCompare_2.managedDefinition)(desiredDefinition),
|
|
176
|
+
},
|
|
177
|
+
...(triggersDiffer || domainDiffers || logDiffers ? { drifted: true } : {}),
|
|
122
178
|
};
|
|
123
179
|
}
|
|
124
180
|
return { logicalId, action: 'noop', resourceType: 'VOLCENGINE_APIGW' };
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deleteApigwResource = exports.updateApigwResource = exports.createApigwResource = void 0;
|
|
3
|
+
exports.deleteApigwResource = exports.updateApigwResource = exports.createApigwResource = exports.resolveFunctionIdFromState = void 0;
|
|
4
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
5
|
+
const apigwDomains_1 = require("./apigwDomains");
|
|
4
6
|
const types_1 = require("../../types");
|
|
5
7
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
6
8
|
const common_1 = require("../../common");
|
|
@@ -135,8 +137,7 @@ const buildRouteInstance = (routeId, routeName, serviceId, stage, info) => ({
|
|
|
135
137
|
* template function is an EXTERNAL deployed function: its Id is resolved
|
|
136
138
|
* from the provider by name (same account/region, function must exist).
|
|
137
139
|
*/
|
|
138
|
-
const resolveFunctionIdFromState = async (state, backendRef, client) => {
|
|
139
|
-
const context = (0, common_1.getContext)();
|
|
140
|
+
const resolveFunctionIdFromState = async (state, backendRef, client, context = (0, common_1.getContext)()) => {
|
|
140
141
|
const refMatch = /^\$\{functions\.([\w.]+)\}$/.exec(String(backendRef ?? ''));
|
|
141
142
|
const templateKey = refMatch?.[1];
|
|
142
143
|
const fnKey = templateKey ?? context.iac?.functions?.find((f) => f.name === String(backendRef))?.key;
|
|
@@ -160,6 +161,7 @@ const resolveFunctionIdFromState = async (state, backendRef, client) => {
|
|
|
160
161
|
}
|
|
161
162
|
return externalId;
|
|
162
163
|
};
|
|
164
|
+
exports.resolveFunctionIdFromState = resolveFunctionIdFromState;
|
|
163
165
|
const createApigwResource = async (context, event, serviceName, state) => {
|
|
164
166
|
const logicalId = `events.${event.key}`;
|
|
165
167
|
const client = (0, volcengineClient_1.createVolcengineClient)(context);
|
|
@@ -245,7 +247,7 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
245
247
|
status: 'tainted',
|
|
246
248
|
lastUpdated: new Date().toISOString(),
|
|
247
249
|
};
|
|
248
|
-
|
|
250
|
+
let stateAfterDependents = (0, stateManager_1.setResource)(state, logicalId, partialResourceState);
|
|
249
251
|
try {
|
|
250
252
|
// One upstream per backend function (triggers sharing a function reuse it).
|
|
251
253
|
const upstreamByFunction = new Map();
|
|
@@ -254,7 +256,7 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
254
256
|
const fnKey = (0, apigwTypes_1.resolveFunctionKey)(backendRef);
|
|
255
257
|
let upstreamId = upstreamByFunction.get(fnKey);
|
|
256
258
|
if (!upstreamId) {
|
|
257
|
-
const functionId = await resolveFunctionIdFromState(state, backendRef, client);
|
|
259
|
+
const functionId = await (0, exports.resolveFunctionIdFromState)(state, backendRef, client);
|
|
258
260
|
const upstreamName = (0, apigwTypes_1.buildUpstreamName)(event, backendRef, context.stage);
|
|
259
261
|
const existingUpstream = await client.apigw.findUpstreamByName(gatewayId, upstreamName);
|
|
260
262
|
if (existingUpstream?.upstreamId) {
|
|
@@ -285,21 +287,13 @@ const createApigwResource = async (context, event, serviceName, state) => {
|
|
|
285
287
|
};
|
|
286
288
|
instances.push(buildRouteInstance(routeId, routeConfig.routeName, serviceId, context.stage, routeInfo));
|
|
287
289
|
}
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
certificateId: event.domain.certificate_id,
|
|
294
|
-
});
|
|
295
|
-
instances.push({
|
|
296
|
-
type: 'VOLCENGINE_APIGW_DOMAIN',
|
|
297
|
-
sid: (0, common_2.buildSid)('volcengine', 'apigw', context.stage, domainId || domainName),
|
|
298
|
-
id: domainId || domainName,
|
|
299
|
-
domainName,
|
|
300
|
-
serviceId,
|
|
290
|
+
await (0, apigwDomains_1.reconcileGatewayDomains)(context, event, serviceId, [], client, (instance) => {
|
|
291
|
+
instances.push(instance);
|
|
292
|
+
stateAfterDependents = (0, stateManager_1.setResource)(stateAfterDependents, logicalId, {
|
|
293
|
+
...partialResourceState,
|
|
294
|
+
instances: [...instances],
|
|
301
295
|
});
|
|
302
|
-
}
|
|
296
|
+
});
|
|
303
297
|
}
|
|
304
298
|
catch (error) {
|
|
305
299
|
if (error instanceof types_1.PartialResourceError) {
|
|
@@ -332,9 +326,7 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
332
326
|
const existingRoutes = existingState.instances.filter((i) => i.type === 'VOLCENGINE_APIGW_ROUTE');
|
|
333
327
|
const existingUpstreams = existingState.instances.filter((i) => i.type === 'VOLCENGINE_APIGW_UPSTREAM');
|
|
334
328
|
const neededRouteIds = new Set();
|
|
335
|
-
const instances = existingState.instances.filter((i) => i.type === 'VOLCENGINE_APIGW_GATEWAY' ||
|
|
336
|
-
i.type === 'VOLCENGINE_APIGW_SERVICE' ||
|
|
337
|
-
i.type === 'VOLCENGINE_APIGW_UPSTREAM');
|
|
329
|
+
const instances = existingState.instances.filter((i) => i.type === 'VOLCENGINE_APIGW_GATEWAY' || i.type === 'VOLCENGINE_APIGW_SERVICE');
|
|
338
330
|
try {
|
|
339
331
|
if (event.log) {
|
|
340
332
|
const logResources = await ensureApigwLogResources(context, existingState.instances, state, `events.${event.key}`, event.key);
|
|
@@ -367,6 +359,7 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
367
359
|
}
|
|
368
360
|
}
|
|
369
361
|
const upstreamByFunction = new Map();
|
|
362
|
+
const createdUpstreams = new Set();
|
|
370
363
|
for (const upstream of existingUpstreams) {
|
|
371
364
|
const fnKey = upstream.functionId
|
|
372
365
|
? String(upstream.functionId)
|
|
@@ -376,7 +369,7 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
376
369
|
}
|
|
377
370
|
for (const trigger of event.triggers) {
|
|
378
371
|
const backendRef = String(trigger.backend);
|
|
379
|
-
const functionId = await resolveFunctionIdFromState(state, backendRef, client);
|
|
372
|
+
const functionId = await (0, exports.resolveFunctionIdFromState)(state, backendRef, client);
|
|
380
373
|
let upstreamId = upstreamByFunction.get(functionId);
|
|
381
374
|
if (!upstreamId) {
|
|
382
375
|
const upstreamName = (0, apigwTypes_1.buildUpstreamName)(event, backendRef, context.stage);
|
|
@@ -387,9 +380,24 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
387
380
|
else {
|
|
388
381
|
const upstreamConfig = (0, apigwTypes_1.triggerToApigwUpstreamConfig)(event, trigger, serviceName, context.stage, serviceInstance.gatewayId, functionId);
|
|
389
382
|
upstreamId = await client.apigw.createUpstream(upstreamConfig);
|
|
383
|
+
createdUpstreams.add(upstreamId);
|
|
390
384
|
}
|
|
391
385
|
upstreamByFunction.set(functionId, upstreamId);
|
|
392
386
|
}
|
|
387
|
+
const upstreamConfig = (0, apigwTypes_1.triggerToApigwUpstreamConfig)(event, trigger, serviceName, context.stage, serviceInstance.gatewayId, functionId);
|
|
388
|
+
const upstreamInfo = createdUpstreams.has(upstreamId)
|
|
389
|
+
? null
|
|
390
|
+
: await client.apigw.getUpstream(upstreamId);
|
|
391
|
+
if (!upstreamInfo && !createdUpstreams.has(upstreamId)) {
|
|
392
|
+
upstreamId = await client.apigw.createUpstream(upstreamConfig);
|
|
393
|
+
createdUpstreams.add(upstreamId);
|
|
394
|
+
upstreamByFunction.set(functionId, upstreamId);
|
|
395
|
+
}
|
|
396
|
+
if (upstreamInfo && (0, planCompare_1.remoteDiffersFromDesired)(upstreamInfo, upstreamConfig)) {
|
|
397
|
+
await client.apigw.updateUpstream(upstreamId, upstreamConfig);
|
|
398
|
+
}
|
|
399
|
+
if (!instances.some((instance) => instance.id === upstreamId))
|
|
400
|
+
instances.push(buildUpstreamInstance(upstreamId, upstreamConfig.upstreamName, upstreamConfig.gatewayId, functionId, context.stage));
|
|
393
401
|
const routeConfig = (0, apigwTypes_1.triggerToApigwRouteConfig)(event, trigger, serviceId, upstreamId);
|
|
394
402
|
// Routes are not idempotent on the provider: CreateRoute with an
|
|
395
403
|
// existing Name fails with DuplicatedResource.Route. Mirror the upstream
|
|
@@ -397,8 +405,18 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
397
405
|
// so re-running a deploy (or resuming after a partial failure) converges.
|
|
398
406
|
const existing = await client.apigw.findRouteByName(serviceId, routeConfig.routeName);
|
|
399
407
|
const routeId = existing?.routeId ?? (await client.apigw.createRoute(routeConfig));
|
|
408
|
+
if (existing?.routeId &&
|
|
409
|
+
(existing.method !== routeConfig.method ||
|
|
410
|
+
existing.path !== routeConfig.path ||
|
|
411
|
+
existing.upstreamIds?.length !== 1 ||
|
|
412
|
+
existing.upstreamIds[0] !== upstreamId ||
|
|
413
|
+
existing.enable === false ||
|
|
414
|
+
(existing.priority !== undefined && existing.priority !== 0))) {
|
|
415
|
+
await client.apigw.updateRoute(routeId, routeConfig);
|
|
416
|
+
}
|
|
400
417
|
neededRouteIds.add(routeId);
|
|
401
|
-
const routeInfo =
|
|
418
|
+
const routeInfo = {
|
|
419
|
+
...existing,
|
|
402
420
|
routeId,
|
|
403
421
|
routeName: routeConfig.routeName,
|
|
404
422
|
serviceId,
|
|
@@ -408,12 +426,30 @@ const updateApigwResource = async (context, event, serviceName, state) => {
|
|
|
408
426
|
};
|
|
409
427
|
instances.push(buildRouteInstance(routeId, routeConfig.routeName, serviceId, context.stage, routeInfo));
|
|
410
428
|
}
|
|
429
|
+
await (0, apigwDomains_1.reconcileGatewayDomains)(context, event, serviceId, existingState.instances, client, (instance) => {
|
|
430
|
+
instances.push(instance);
|
|
431
|
+
const snapshot = (0, stateManager_1.getResource)(state, `events.${event.key}`) ?? existingState;
|
|
432
|
+
state = (0, stateManager_1.setResource)(state, `events.${event.key}`, {
|
|
433
|
+
...snapshot,
|
|
434
|
+
instances: [
|
|
435
|
+
...snapshot.instances.filter((previous) => previous.type !== instance.type || previous.domainName !== instance.domainName),
|
|
436
|
+
instance,
|
|
437
|
+
],
|
|
438
|
+
lastUpdated: new Date().toISOString(),
|
|
439
|
+
});
|
|
440
|
+
});
|
|
441
|
+
const desiredUpstreamIds = new Set(instances
|
|
442
|
+
.filter((instance) => instance.type === 'VOLCENGINE_APIGW_UPSTREAM')
|
|
443
|
+
.map((instance) => instance.id));
|
|
411
444
|
// Remove routes no longer in the desired set.
|
|
412
445
|
for (const existingRoute of existingRoutes) {
|
|
413
446
|
if (!neededRouteIds.has(existingRoute.id)) {
|
|
414
447
|
await client.apigw.deleteRoute(existingRoute.id);
|
|
415
448
|
}
|
|
416
449
|
}
|
|
450
|
+
for (const upstream of existingUpstreams.filter((instance) => !desiredUpstreamIds.has(instance.id))) {
|
|
451
|
+
await client.apigw.deleteUpstream(upstream.id);
|
|
452
|
+
}
|
|
417
453
|
}
|
|
418
454
|
catch (error) {
|
|
419
455
|
throw new types_1.PartialResourceError(state, error instanceof Error ? error : new Error(String(error)));
|
|
@@ -100,7 +100,7 @@ const extractEventDomainDefinition = (event, logTopicOverride) => {
|
|
|
100
100
|
...(event.network && {
|
|
101
101
|
network: { vpcId: event.network.vpc_id, subnetIds: event.network.subnet_ids },
|
|
102
102
|
}),
|
|
103
|
-
logEnabled: event.log === true || event.log === 'true',
|
|
103
|
+
...(event.log !== undefined ? { logEnabled: event.log === true || event.log === 'true' } : {}),
|
|
104
104
|
...(event.log && context
|
|
105
105
|
? {
|
|
106
106
|
logConfig: {
|
|
@@ -119,6 +119,10 @@ const extractEventDomainDefinition = (event, logTopicOverride) => {
|
|
|
119
119
|
? {
|
|
120
120
|
domainName: event.domain.domain_name,
|
|
121
121
|
certificateId: event.domain.certificate_id,
|
|
122
|
+
protocol: Array.isArray(event.domain.protocol)
|
|
123
|
+
? event.domain.protocol.map(String)
|
|
124
|
+
: [String(event.domain.protocol ?? 'HTTP')],
|
|
125
|
+
wwwBindApex: event.domain.www_bind_apex === true,
|
|
122
126
|
}
|
|
123
127
|
: undefined,
|
|
124
128
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deployVolcengineStack = void 0;
|
|
4
|
+
const refreshPlanner_1 = require("../../common/refreshPlanner");
|
|
4
5
|
const common_1 = require("../../common");
|
|
5
6
|
const lang_1 = require("../../lang");
|
|
6
7
|
const vefaasPlanner_1 = require("./vefaasPlanner");
|
|
@@ -55,6 +56,11 @@ const deployVolcengineStack = async (iac, backend, approvedPlan) => {
|
|
|
55
56
|
const apigwPlan = approvedPlan
|
|
56
57
|
? partitionPlan(approvedPlan, ['VOLCENGINE_APIGW'])
|
|
57
58
|
: await (0, apigwPlanner_1.generateApigwPlan)(context, state, iac.events, iac.service);
|
|
59
|
+
state = (0, refreshPlanner_1.applyPlanStateUpdates)(state, [
|
|
60
|
+
...functionPlan.items,
|
|
61
|
+
...bucketPlan.items,
|
|
62
|
+
...apigwPlan.items,
|
|
63
|
+
]);
|
|
58
64
|
const bucketResult = await (0, tosExecutor_1.executeBucketPlan)(context, bucketPlan, iac.buckets, state, onStateChange);
|
|
59
65
|
if (bucketResult.partialFailure) {
|
|
60
66
|
const error = bucketResult.partialFailure.error;
|
|
@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.generateBucketPlan = void 0;
|
|
7
|
+
const bucketPolicy_1 = require("../../common/bucketPolicy");
|
|
7
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
9
|
const lang_1 = require("../../lang");
|
|
9
10
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
10
11
|
const refreshCache_1 = require("../../common/refreshCache");
|
|
11
12
|
const concurrency_1 = require("../../common/concurrency");
|
|
12
13
|
const refreshPlanner_1 = require("../../common/refreshPlanner");
|
|
13
|
-
const planCompare_1 = require("../../common/planCompare");
|
|
14
14
|
const tosTypes_1 = require("./tosTypes");
|
|
15
15
|
const stateManager_1 = require("../../common/stateManager");
|
|
16
16
|
const common_1 = require("../../common");
|
|
@@ -58,19 +58,14 @@ const generateBucketPlan = async (context, state, buckets) => {
|
|
|
58
58
|
resourceName: bucket.name,
|
|
59
59
|
tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
|
|
60
60
|
})),
|
|
61
|
+
normalizeForDisplay: (definition) => (0, bucketPolicy_1.normalizeBucketPolicyDefinition)(definition, 'volcengine'),
|
|
61
62
|
cloudToDefinition: tosTypes_1.cloudTosToDefinition,
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
const cloudPolicy = await (0, refreshCache_1.cachedRefreshRead)(context, `tos.getBucketPolicy:${bucket.name}`, () => client.tos.getBucketPolicy(bucket.name));
|
|
70
|
-
return {
|
|
71
|
-
update: (0, planCompare_1.jsonDocumentDiffers)(desiredPolicy, cloudPolicy),
|
|
72
|
-
drifted: true,
|
|
73
|
-
};
|
|
63
|
+
removedDependents: (0, bucketPolicy_1.removedBucketPolicy)(tosTypes_1.TOS_BUCKET_POLICY_INSTANCE_TYPE, currentState, desiredDefinition),
|
|
64
|
+
enrichRemoteAttributes: async (_remote, attributes) => {
|
|
65
|
+
if (desiredDefinition.policy === null)
|
|
66
|
+
return attributes;
|
|
67
|
+
const policy = await (0, refreshCache_1.cachedRefreshRead)(context, `tos.getBucketPolicy:${bucket.name}`, () => client.tos.getBucketPolicy(bucket.name));
|
|
68
|
+
return { ...attributes, policy };
|
|
74
69
|
},
|
|
75
70
|
refresh: context.refresh,
|
|
76
71
|
});
|
|
@@ -4,6 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.deleteResource = exports.updateResource = exports.readResource = exports.createResource = void 0;
|
|
7
|
+
const planCompare_1 = require("../../common/planCompare");
|
|
8
|
+
const bucketPolicy_1 = require("../../common/bucketPolicy");
|
|
9
|
+
const functionDefinition_1 = require("../../common/functionDefinition");
|
|
7
10
|
const volcengineClient_1 = require("../../common/volcengineClient");
|
|
8
11
|
const common_1 = require("../../common");
|
|
9
12
|
const types_1 = require("../../types");
|
|
@@ -13,31 +16,18 @@ const lang_1 = require("../../lang");
|
|
|
13
16
|
const node_path_1 = __importDefault(require("node:path"));
|
|
14
17
|
const ownershipTag_1 = require("../ownershipTag");
|
|
15
18
|
const alreadyExists_1 = require("../alreadyExists");
|
|
16
|
-
const buildTosBucketPolicyJson = (iam) =>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
Principal: stmt.principal,
|
|
24
|
-
Action: stmt.action,
|
|
25
|
-
Resource: stmt.resource,
|
|
26
|
-
};
|
|
27
|
-
if (stmt.condition) {
|
|
28
|
-
s.Condition = stmt.condition;
|
|
29
|
-
}
|
|
30
|
-
return s;
|
|
31
|
-
}),
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
const applyBucketPolicy = async (client, bucket) => {
|
|
35
|
-
if (!bucket.iam)
|
|
36
|
-
return;
|
|
19
|
+
const buildTosBucketPolicyJson = (iam) => (0, bucketPolicy_1.buildBucketPolicy)(iam, 'volcengine');
|
|
20
|
+
const buildTosPolicyInstance = (context, bucketName) => ({
|
|
21
|
+
sid: (0, common_1.buildSid)('volcengine', 'tos-policy', context.stage, bucketName),
|
|
22
|
+
type: tosTypes_1.TOS_BUCKET_POLICY_INSTANCE_TYPE,
|
|
23
|
+
id: bucketName,
|
|
24
|
+
});
|
|
25
|
+
const applyBucketPolicy = async (client, bucket, owned = false) => {
|
|
37
26
|
const policy = buildTosBucketPolicyJson(bucket.iam);
|
|
38
27
|
if (!policy) {
|
|
39
|
-
|
|
40
|
-
|
|
28
|
+
if (owned || bucket.iam?.resource?.statements !== undefined) {
|
|
29
|
+
await deleteBucketPolicy(client, bucket.name);
|
|
30
|
+
}
|
|
41
31
|
return;
|
|
42
32
|
}
|
|
43
33
|
logger_1.logger.info(lang_1.lang.__('BUCKET_POLICY_APPLYING', { bucketName: bucket.name }));
|
|
@@ -135,6 +125,9 @@ const createResource = async (context, bucket, state) => {
|
|
|
135
125
|
}
|
|
136
126
|
// Apply IAM bucket policy if configured
|
|
137
127
|
await applyBucketPolicy(client, bucket);
|
|
128
|
+
if (buildTosBucketPolicyJson(bucket.iam)) {
|
|
129
|
+
instances.push(buildTosPolicyInstance(context, bucket.name));
|
|
130
|
+
}
|
|
138
131
|
const resourceState = {
|
|
139
132
|
mode: 'managed',
|
|
140
133
|
region: context.region,
|
|
@@ -178,22 +171,16 @@ const updateResource = async (context, bucket, state) => {
|
|
|
178
171
|
? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
|
|
179
172
|
: undefined;
|
|
180
173
|
const instances = [(0, tosTypes_1.buildTosInstanceFromProvider)(bucketInfo, sid)];
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
if (newPolicyJson !== (oldPolicyJson ?? null)) {
|
|
186
|
-
if (newPolicyJson) {
|
|
187
|
-
await applyBucketPolicy(client, bucket);
|
|
188
|
-
}
|
|
189
|
-
else {
|
|
190
|
-
await deleteBucketPolicy(client, bucket.name);
|
|
191
|
-
}
|
|
174
|
+
const policyOwned = (0, bucketPolicy_1.isOwnedBucketPolicy)(tosTypes_1.TOS_BUCKET_POLICY_INSTANCE_TYPE, state.resources[logicalId]?.instances, state.resources[logicalId]?.definition);
|
|
175
|
+
await applyBucketPolicy(client, bucket, policyOwned);
|
|
176
|
+
if (buildTosBucketPolicyJson(bucket.iam)) {
|
|
177
|
+
instances.push(buildTosPolicyInstance(context, bucket.name));
|
|
192
178
|
}
|
|
179
|
+
const tosDefinition = (0, tosTypes_1.extractTosBucketDefinition)(config, websiteCodeHash);
|
|
193
180
|
const resourceState = {
|
|
194
181
|
mode: 'managed',
|
|
195
182
|
region: context.region,
|
|
196
|
-
definition: (0,
|
|
183
|
+
definition: (0, functionDefinition_1.withLifecycleIntent)((0, planCompare_1.mergeManagedIntent)(state.resources[logicalId]?.definition ?? {}, tosDefinition), tosDefinition, ['policy']),
|
|
197
184
|
instances,
|
|
198
185
|
lastUpdated: new Date().toISOString(),
|
|
199
186
|
};
|