@microagi/alchemy-gcp 0.1.4 → 0.2.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/lib/CloudResourceManager/Project.d.ts +16 -1
- package/lib/CloudResourceManager/Project.d.ts.map +1 -1
- package/lib/CloudResourceManager/Project.js +59 -1
- package/lib/CloudResourceManager/Project.js.map +1 -1
- package/lib/CloudResourceManager/ProjectIamMember.d.ts +25 -0
- package/lib/CloudResourceManager/ProjectIamMember.d.ts.map +1 -0
- package/lib/CloudResourceManager/ProjectIamMember.js +22 -0
- package/lib/CloudResourceManager/ProjectIamMember.js.map +1 -0
- package/lib/CloudResourceManager/index.d.ts +1 -0
- package/lib/CloudResourceManager/index.d.ts.map +1 -1
- package/lib/CloudResourceManager/index.js +1 -0
- package/lib/CloudResourceManager/index.js.map +1 -1
- package/lib/Compute/Network.d.ts +39 -2
- package/lib/Compute/Network.d.ts.map +1 -1
- package/lib/Compute/Network.js +12 -0
- package/lib/Compute/Network.js.map +1 -1
- package/lib/Compute/SharedVpcServiceProject.d.ts.map +1 -1
- package/lib/Compute/SharedVpcServiceProject.js +7 -1
- package/lib/Compute/SharedVpcServiceProject.js.map +1 -1
- package/lib/Compute/Subnetwork.d.ts +16 -1
- package/lib/Compute/Subnetwork.d.ts.map +1 -1
- package/lib/Compute/Subnetwork.js +74 -1
- package/lib/Compute/Subnetwork.js.map +1 -1
- package/lib/Compute/SubnetworkIamMember.d.ts +45 -0
- package/lib/Compute/SubnetworkIamMember.d.ts.map +1 -0
- package/lib/Compute/SubnetworkIamMember.js +46 -0
- package/lib/Compute/SubnetworkIamMember.js.map +1 -0
- package/lib/Compute/index.d.ts +1 -0
- package/lib/Compute/index.d.ts.map +1 -1
- package/lib/Compute/index.js +1 -0
- package/lib/Compute/index.js.map +1 -1
- package/lib/ManagedLustre/Instance.d.ts +173 -0
- package/lib/ManagedLustre/Instance.d.ts.map +1 -0
- package/lib/{Parallelstore → ManagedLustre}/Instance.js +39 -35
- package/lib/ManagedLustre/Instance.js.map +1 -0
- package/lib/ManagedLustre/index.d.ts.map +1 -0
- package/lib/ManagedLustre/index.js.map +1 -0
- package/lib/Providers.js +3 -3
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/package.json +4 -4
- package/src/CloudResourceManager/Project.ts +90 -2
- package/src/CloudResourceManager/ProjectIamMember.ts +29 -0
- package/src/CloudResourceManager/index.ts +1 -0
- package/src/Compute/Network.ts +58 -5
- package/src/Compute/SharedVpcServiceProject.ts +6 -1
- package/src/Compute/Subnetwork.ts +105 -2
- package/src/Compute/SubnetworkIamMember.ts +52 -0
- package/src/Compute/index.ts +1 -0
- package/src/{Parallelstore → ManagedLustre}/Instance.ts +163 -110
- package/src/Providers.ts +5 -5
- package/src/index.ts +1 -1
- package/lib/Parallelstore/Instance.d.ts +0 -119
- package/lib/Parallelstore/Instance.d.ts.map +0 -1
- package/lib/Parallelstore/Instance.js.map +0 -1
- package/lib/Parallelstore/index.d.ts.map +0 -1
- package/lib/Parallelstore/index.js.map +0 -1
- /package/lib/{Parallelstore → ManagedLustre}/index.d.ts +0 -0
- /package/lib/{Parallelstore → ManagedLustre}/index.js +0 -0
- /package/src/{Parallelstore → ManagedLustre}/index.ts +0 -0
|
@@ -11,6 +11,21 @@ export type ProjectParent = {
|
|
|
11
11
|
type: "organization";
|
|
12
12
|
id: string;
|
|
13
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* Single (role, members) entry on a Project's IAM policy. Targets
|
|
16
|
+
* declare this contract so capabilities can `.bind` IAM grants onto
|
|
17
|
+
* the project — the provider's `reconcile` merges all bound entries
|
|
18
|
+
* by role into a single `setIamPolicy` call.
|
|
19
|
+
*/
|
|
20
|
+
export type ProjectIamBinding = {
|
|
21
|
+
/** IAM role, e.g. `"roles/container.hostServiceAgentUser"`. */
|
|
22
|
+
role: string;
|
|
23
|
+
/** Principals, e.g. `["serviceAccount:foo@bar.iam.gserviceaccount.com"]`. */
|
|
24
|
+
members: ReadonlyArray<string>;
|
|
25
|
+
};
|
|
26
|
+
export type ProjectBindingContract = {
|
|
27
|
+
iamBindings: ReadonlyArray<ProjectIamBinding>;
|
|
28
|
+
};
|
|
14
29
|
export type ProjectProps = {
|
|
15
30
|
/**
|
|
16
31
|
* Globally-unique project ID. 6-30 lowercase letters/digits/hyphens,
|
|
@@ -137,7 +152,7 @@ export type Project = Resource<"GCP.Project", ProjectProps, {
|
|
|
137
152
|
* paid services can be enabled.
|
|
138
153
|
*/
|
|
139
154
|
billingEnabled: boolean;
|
|
140
|
-
},
|
|
155
|
+
}, ProjectBindingContract, GCP.Providers>;
|
|
141
156
|
export declare const Project: import("alchemy").ResourceClass<Project>;
|
|
142
157
|
export declare const ProjectProvider: () => import("effect/Layer").Layer<Provider.Provider<Project>, never, import("effect/unstable/http/HttpClient").HttpClient | import("alchemy").Stage | import("alchemy").Stack | import("@distilled.cloud/gcp").Credentials>;
|
|
143
158
|
//# sourceMappingURL=Project.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.d.ts","sourceRoot":"","sources":["../../src/CloudResourceManager/Project.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAM7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG;IACzB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,MAAM,EAAE,aAAa,CAAC;IACtB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,MAAM,EAAE,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,MAAM,OAAO,GAAG,QAAQ,CAC5B,aAAa,EACb,YAAY,EACZ;IACE,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC;IAC3B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,cAAc,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC/C;;;;;OAKG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB,EACD,
|
|
1
|
+
{"version":3,"file":"Project.d.ts","sourceRoot":"","sources":["../../src/CloudResourceManager/Project.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAM7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,+DAA+D;IAC/D,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,MAAM,EAAE,aAAa,CAAC;IACtB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,MAAM,EAAE,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,MAAM,OAAO,GAAG,QAAQ,CAC5B,aAAa,EACb,YAAY,EACZ;IACE,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC;IAC3B,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,cAAc,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC/C;;;;;OAKG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB,EACD,sBAAsB,EACtB,GAAG,CAAC,SAAS,CACd,CAAC;AAEF,eAAO,MAAM,OAAO,0CAAmC,CAAC;AAwCxD,eAAO,MAAM,eAAe,8NAoYzB,CAAC"}
|
|
@@ -49,6 +49,8 @@ export const ProjectProvider = () => Provider.effect(Project, Effect.gen(functio
|
|
|
49
49
|
const patchProjects = yield* crm.patchProjects;
|
|
50
50
|
const deleteProjects = yield* crm.deleteProjects;
|
|
51
51
|
const getOperations = yield* crm.getOperations;
|
|
52
|
+
const getIamPolicy = yield* crm.getIamPolicyProjects;
|
|
53
|
+
const setIamPolicy = yield* crm.setIamPolicyProjects;
|
|
52
54
|
const getBillingInfo = yield* billing.getBillingInfoProjects;
|
|
53
55
|
const updateBillingInfo = yield* billing.updateBillingInfoProjects;
|
|
54
56
|
const awaitOperation = Effect.fn(function* (operationName, session) {
|
|
@@ -173,6 +175,55 @@ export const ProjectProvider = () => Provider.effect(Project, Effect.gen(functio
|
|
|
173
175
|
yield* awaitOperation(op.name, session);
|
|
174
176
|
return yield* requireProject(observed.projectId, "disappeared after patch");
|
|
175
177
|
});
|
|
178
|
+
// Apply merged IAM bindings as a single setIamPolicy. Bindings
|
|
179
|
+
// are unioned per role (multiple `.bind` callers sharing a role
|
|
180
|
+
// get their members combined). Foreign bindings on the policy
|
|
181
|
+
// (non-alchemy roles, or members we don't manage on the same
|
|
182
|
+
// role) are preserved verbatim. Etag round-trip handles
|
|
183
|
+
// concurrent edits; Conflict triggers a re-read + retry.
|
|
184
|
+
const syncIam = (args) => Effect.gen(function* () {
|
|
185
|
+
const desiredByRole = new Map();
|
|
186
|
+
for (const b of args.bindings) {
|
|
187
|
+
for (const ib of b.data.iamBindings) {
|
|
188
|
+
const set = desiredByRole.get(ib.role) ?? new Set();
|
|
189
|
+
for (const m of ib.members)
|
|
190
|
+
set.add(m);
|
|
191
|
+
desiredByRole.set(ib.role, set);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
if (desiredByRole.size === 0)
|
|
195
|
+
return;
|
|
196
|
+
const current = yield* getIamPolicy({
|
|
197
|
+
resource: `projects/${args.projectId}`,
|
|
198
|
+
body: { options: { requestedPolicyVersion: 3 } },
|
|
199
|
+
});
|
|
200
|
+
const existingBindings = (current.bindings ?? []).map((b) => ({
|
|
201
|
+
...b,
|
|
202
|
+
members: [...(b.members ?? [])],
|
|
203
|
+
}));
|
|
204
|
+
let mutated = false;
|
|
205
|
+
for (const [role, members] of desiredByRole) {
|
|
206
|
+
let existing = existingBindings.find((b) => b.role === role && !b.condition);
|
|
207
|
+
if (!existing) {
|
|
208
|
+
existing = { role, members: [] };
|
|
209
|
+
existingBindings.push(existing);
|
|
210
|
+
}
|
|
211
|
+
const merged = new Set([...(existing.members ?? []), ...members]);
|
|
212
|
+
if (merged.size !== (existing.members?.length ?? 0))
|
|
213
|
+
mutated = true;
|
|
214
|
+
existing.members = [...merged];
|
|
215
|
+
}
|
|
216
|
+
if (!mutated)
|
|
217
|
+
return;
|
|
218
|
+
yield* setIamPolicy({
|
|
219
|
+
resource: `projects/${args.projectId}`,
|
|
220
|
+
body: {
|
|
221
|
+
policy: { ...current, bindings: existingBindings, version: 3 },
|
|
222
|
+
},
|
|
223
|
+
});
|
|
224
|
+
}).pipe(Effect.retry({
|
|
225
|
+
schedule: Schedule.exponential(Duration.seconds(2)).pipe(Schedule.both(Schedule.recurs(8))),
|
|
226
|
+
}));
|
|
176
227
|
return {
|
|
177
228
|
stables: ["projectId", "projectNumber", "name"],
|
|
178
229
|
diff: Effect.fn(function* ({ id, news, olds = {}, output }) {
|
|
@@ -188,7 +239,7 @@ export const ProjectProvider = () => Provider.effect(Project, Effect.gen(functio
|
|
|
188
239
|
return { action: "replace" };
|
|
189
240
|
}
|
|
190
241
|
}),
|
|
191
|
-
reconcile: Effect.fn(function* ({ id, news, session }) {
|
|
242
|
+
reconcile: Effect.fn(function* ({ id, news, session, bindings }) {
|
|
192
243
|
const projectId = yield* createProjectId(id, news.projectId);
|
|
193
244
|
const parent = parentToString(news.parent);
|
|
194
245
|
const internalLabels = yield* gcpInternalLabels(id);
|
|
@@ -232,6 +283,13 @@ export const ProjectProvider = () => Provider.effect(Project, Effect.gen(functio
|
|
|
232
283
|
// update is synchronous).
|
|
233
284
|
const observedBilling = yield* observeBilling(synced.projectId);
|
|
234
285
|
const finalBilling = yield* syncBilling(synced.projectId, observedBilling, news.billingAccount);
|
|
286
|
+
// 5. Sync IAM bindings (host-side IAM grants etc). Single
|
|
287
|
+
// setIamPolicy with merged bindings; foreign roles
|
|
288
|
+
// preserved. Etag-retried internally.
|
|
289
|
+
yield* syncIam({
|
|
290
|
+
projectId: synced.projectId,
|
|
291
|
+
bindings,
|
|
292
|
+
});
|
|
235
293
|
return toAttributes(synced, finalBilling);
|
|
236
294
|
}),
|
|
237
295
|
delete: Effect.fn(function* ({ output, session }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/CloudResourceManager/Project.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/CloudResourceManager/Project.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import type { Project } from "./Project.ts";
|
|
3
|
+
/**
|
|
4
|
+
* Bind a single `(role, member)` IAM grant onto a {@link Project}.
|
|
5
|
+
*
|
|
6
|
+
* Target-side binding — see
|
|
7
|
+
* {@link import("../Compute/SubnetworkIamMember.ts").subnetworkIamMember}
|
|
8
|
+
* for the pattern, the SID-collision pitfall, and why `key` exists.
|
|
9
|
+
* Project's `reconcile` merges all bindings into a single
|
|
10
|
+
* `setIamPolicy` against the project, preserving foreign roles +
|
|
11
|
+
* members.
|
|
12
|
+
*
|
|
13
|
+
* @example Granting GKE service agent host-service-agent-user on a Shared VPC host
|
|
14
|
+
* ```typescript
|
|
15
|
+
* yield* GCP.projectIamMember(hostProject, "ClusterA-HostSvcAgent", {
|
|
16
|
+
* role: "roles/container.hostServiceAgentUser",
|
|
17
|
+
* member: gkeAgentMember,
|
|
18
|
+
* });
|
|
19
|
+
* ```
|
|
20
|
+
*/
|
|
21
|
+
export declare const projectIamMember: (project: Project, key: string, args: {
|
|
22
|
+
role: string;
|
|
23
|
+
member: string;
|
|
24
|
+
}) => Effect.Effect<void>;
|
|
25
|
+
//# sourceMappingURL=ProjectIamMember.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ProjectIamMember.d.ts","sourceRoot":"","sources":["../../src/CloudResourceManager/ProjectIamMember.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,gBAAgB,GAC3B,SAAS,OAAO,EAChB,KAAK,MAAM,EACX,MAAM;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KACrC,MAAM,CAAC,MAAM,CAAC,IAAI,CAGiB,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bind a single `(role, member)` IAM grant onto a {@link Project}.
|
|
3
|
+
*
|
|
4
|
+
* Target-side binding — see
|
|
5
|
+
* {@link import("../Compute/SubnetworkIamMember.ts").subnetworkIamMember}
|
|
6
|
+
* for the pattern, the SID-collision pitfall, and why `key` exists.
|
|
7
|
+
* Project's `reconcile` merges all bindings into a single
|
|
8
|
+
* `setIamPolicy` against the project, preserving foreign roles +
|
|
9
|
+
* members.
|
|
10
|
+
*
|
|
11
|
+
* @example Granting GKE service agent host-service-agent-user on a Shared VPC host
|
|
12
|
+
* ```typescript
|
|
13
|
+
* yield* GCP.projectIamMember(hostProject, "ClusterA-HostSvcAgent", {
|
|
14
|
+
* role: "roles/container.hostServiceAgentUser",
|
|
15
|
+
* member: gkeAgentMember,
|
|
16
|
+
* });
|
|
17
|
+
* ```
|
|
18
|
+
*/
|
|
19
|
+
export const projectIamMember = (project, key, args) => project.bind `IamMember(${project}, ${key})`({
|
|
20
|
+
iamBindings: [{ role: args.role, members: [args.member] }],
|
|
21
|
+
});
|
|
22
|
+
//# sourceMappingURL=ProjectIamMember.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ProjectIamMember.js","sourceRoot":"","sources":["../../src/CloudResourceManager/ProjectIamMember.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,OAAgB,EAChB,GAAW,EACX,IAAsC,EACjB,EAAE,CACvB,OAAO,CAAC,IAAI,CAAA,aAAa,OAAO,KAAK,GAAG,GAAG,CAAC;IAC1C,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;CAC3D,CAAmC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/CloudResourceManager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACxD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/CloudResourceManager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACxD,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAChE,cAAc,uBAAuB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/CloudResourceManager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/CloudResourceManager/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAExD,cAAc,uBAAuB,CAAC"}
|
package/lib/Compute/Network.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { Resource } from "alchemy";
|
|
|
2
2
|
import * as Output from "alchemy/Output";
|
|
3
3
|
import * as Provider from "alchemy/Provider";
|
|
4
4
|
import type * as GCP from "../Providers.ts";
|
|
5
|
+
declare const _networkRefByNumberBrand: unique symbol;
|
|
6
|
+
declare const _networkRefByIdBrand: unique symbol;
|
|
5
7
|
/**
|
|
6
8
|
* Fully-qualified VPC reference in **project-number** form:
|
|
7
9
|
* `projects/{projectNumber}/global/networks/{name}`.
|
|
@@ -20,9 +22,31 @@ import type * as GCP from "../Providers.ts";
|
|
|
20
22
|
*
|
|
21
23
|
* `Project.projectNumber` is typed as `` `${number}` `` precisely so
|
|
22
24
|
* this template literal type composes without a runtime coercion at
|
|
23
|
-
* the call site.
|
|
25
|
+
* the call site. The nominal brand prevents a `NetworkRefById` from
|
|
26
|
+
* being passed where this is expected and vice versa — see
|
|
27
|
+
* {@link NetworkRefById}.
|
|
24
28
|
*/
|
|
25
|
-
export type NetworkRef = `projects/${number}/global/networks/${string}
|
|
29
|
+
export type NetworkRef = `projects/${number}/global/networks/${string}` & {
|
|
30
|
+
readonly [_networkRefByNumberBrand]: true;
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* Fully-qualified VPC reference in **project-ID** form:
|
|
34
|
+
* `projects/{projectId}/global/networks/{name}`.
|
|
35
|
+
*
|
|
36
|
+
* Required by Managed Lustre's `instances.create` (and any future GCP
|
|
37
|
+
* API that explicitly rejects the project-number form). Build with
|
|
38
|
+
* {@link networkRefById}.
|
|
39
|
+
*
|
|
40
|
+
* Note: project-ID form is in some places interchangeable with
|
|
41
|
+
* project-number form (the SDK accepts either for compute / GKE), but
|
|
42
|
+
* Managed Lustre's API validates the path segment shape and refuses
|
|
43
|
+
* numeric ids — without this distinct branded type, a stack would
|
|
44
|
+
* compile fine and only fail at deploy time with `BadRequest: Valid
|
|
45
|
+
* format: projects/{project_id}/global/networks/{network_id}`.
|
|
46
|
+
*/
|
|
47
|
+
export type NetworkRefById = `projects/${string}/global/networks/${string}` & {
|
|
48
|
+
readonly [_networkRefByIdBrand]: true;
|
|
49
|
+
};
|
|
26
50
|
/**
|
|
27
51
|
* Build a project-number-form `NetworkRef`. Lifted through `Output`
|
|
28
52
|
* so it composes with `Project.projectNumber` (an `Output<\`${number}\`>`)
|
|
@@ -36,6 +60,18 @@ export type NetworkRef = `projects/${number}/global/networks/${string}`;
|
|
|
36
60
|
* time.
|
|
37
61
|
*/
|
|
38
62
|
export declare const networkRef: (projectNumber: `${number}` | Output.Output<`${number}`>, networkName: string | Output.Output<string>) => Output.Output<NetworkRef>;
|
|
63
|
+
/**
|
|
64
|
+
* Build a project-ID-form `NetworkRefById`. Use for APIs that require
|
|
65
|
+
* the project-ID path segment — Managed Lustre is the current example.
|
|
66
|
+
*
|
|
67
|
+
* Pass `Project.projectId` (an `Output<string>`) plus `Network.name`.
|
|
68
|
+
* Plain literal arguments work too: `networkRefById("research-shared",
|
|
69
|
+
* "main")`. The branded return type prevents the value from being
|
|
70
|
+
* confused with a project-number-form {@link NetworkRef} at any call
|
|
71
|
+
* site downstream — even though their string shapes happen to coincide
|
|
72
|
+
* for numeric ids.
|
|
73
|
+
*/
|
|
74
|
+
export declare const networkRefById: (projectId: string | Output.Output<string>, networkName: string | Output.Output<string>) => Output.Output<NetworkRefById>;
|
|
39
75
|
/**
|
|
40
76
|
* A VPC Network in custom-mode (`autoCreateSubnetworks=false`). Auto-mode
|
|
41
77
|
* networks are intentionally not exposed — every cluster/parallelstore
|
|
@@ -111,4 +147,5 @@ export type NetworkAttributes = {
|
|
|
111
147
|
export type Network = Resource<"GCP.Network", NetworkProps, NetworkAttributes, never, GCP.Providers>;
|
|
112
148
|
export declare const Network: import("alchemy").ResourceClass<Network>;
|
|
113
149
|
export declare const NetworkProvider: () => import("effect/Layer").Layer<Provider.Provider<Network>, never, import("effect/unstable/http/HttpClient").HttpClient | import("alchemy").Stage | import("alchemy").Stack | import("@distilled.cloud/gcp").Credentials>;
|
|
150
|
+
export {};
|
|
114
151
|
//# sourceMappingURL=Network.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Network.d.ts","sourceRoot":"","sources":["../../src/Compute/Network.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAO7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Network.d.ts","sourceRoot":"","sources":["../../src/Compute/Network.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAO7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAS5C,OAAO,CAAC,MAAM,wBAAwB,EAAE,OAAO,MAAM,CAAC;AACtD,OAAO,CAAC,MAAM,oBAAoB,EAAE,OAAO,MAAM,CAAC;AAElD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,MAAM,UAAU,GAAG,YAAY,MAAM,oBAAoB,MAAM,EAAE,GAAG;IACxE,QAAQ,CAAC,CAAC,wBAAwB,CAAC,EAAE,IAAI,CAAC;CAC3C,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,cAAc,GAAG,YAAY,MAAM,oBAAoB,MAAM,EAAE,GAAG;IAC5E,QAAQ,CAAC,CAAC,oBAAoB,CAAC,EAAE,IAAI,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GACrB,eAAe,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,EACvD,aAAa,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAC1C,MAAM,CAAC,MAAM,CAAC,UAAU,CAQgB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GACzB,WAAW,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACzC,aAAa,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAC1C,MAAM,CAAC,MAAM,CAAC,cAAc,CAMgB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACpC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,mEAAmE;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,uEAAuE;IACvE,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iDAAiD;IACjD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,2BAA2B;IAC3B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,2BAA2B;IAC3B,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,QAAQ,CAC5B,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,KAAK,EACL,GAAG,CAAC,SAAS,CACd,CAAC;AACF,eAAO,MAAM,OAAO,0CAAmC,CAAC;AAgBxD,eAAO,MAAM,eAAe,8NA+IzB,CAAC"}
|
package/lib/Compute/Network.js
CHANGED
|
@@ -21,6 +21,18 @@ import { makeAwaitGlobalOperation } from "./Operations.js";
|
|
|
21
21
|
* time.
|
|
22
22
|
*/
|
|
23
23
|
export const networkRef = (projectNumber, networkName) => Output.all(Output.asOutput(projectNumber), Output.asOutput(networkName)).pipe(Output.map(([num, name]) => `projects/${num}/global/networks/${name}`));
|
|
24
|
+
/**
|
|
25
|
+
* Build a project-ID-form `NetworkRefById`. Use for APIs that require
|
|
26
|
+
* the project-ID path segment — Managed Lustre is the current example.
|
|
27
|
+
*
|
|
28
|
+
* Pass `Project.projectId` (an `Output<string>`) plus `Network.name`.
|
|
29
|
+
* Plain literal arguments work too: `networkRefById("research-shared",
|
|
30
|
+
* "main")`. The branded return type prevents the value from being
|
|
31
|
+
* confused with a project-number-form {@link NetworkRef} at any call
|
|
32
|
+
* site downstream — even though their string shapes happen to coincide
|
|
33
|
+
* for numeric ids.
|
|
34
|
+
*/
|
|
35
|
+
export const networkRefById = (projectId, networkName) => Output.all(Output.asOutput(projectId), Output.asOutput(networkName)).pipe(Output.map(([id, name]) => `projects/${id}/global/networks/${name}`));
|
|
24
36
|
export const Network = Resource("GCP.Network");
|
|
25
37
|
const toNetworkAttributes = (n, parent) => ({
|
|
26
38
|
name: n.name ?? "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Network.js","sourceRoot":"","sources":["../../src/Compute/Network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Network.js","sourceRoot":"","sources":["../../src/Compute/Network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SharedVpcServiceProject.d.ts","sourceRoot":"","sources":["../../src/Compute/SharedVpcServiceProject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,uBAAuB;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAC5C,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,EACjC,KAAK,EACL,GAAG,CAAC,SAAS,CACd,CAAC;AACF,eAAO,MAAM,uBAAuB,0DAEnC,CAAC;AAEF,eAAO,MAAM,+BAA+B,
|
|
1
|
+
{"version":3,"file":"SharedVpcServiceProject.d.ts","sourceRoot":"","sources":["../../src/Compute/SharedVpcServiceProject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,uDAAuD;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,uBAAuB;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,QAAQ,CAC5C,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,EACjC,KAAK,EACL,GAAG,CAAC,SAAS,CACd,CAAC;AACF,eAAO,MAAM,uBAAuB,0DAEnC,CAAC;AAEF,eAAO,MAAM,+BAA+B,0LAgIzC,CAAC"}
|
|
@@ -16,7 +16,13 @@ export const SharedVpcServiceProjectProvider = () => Provider.effect(SharedVpcSe
|
|
|
16
16
|
// if the service project isn't attached anywhere. GCP returns
|
|
17
17
|
// 404 in that case; some SDK paths return a `Project` with
|
|
18
18
|
// empty fields instead, so we coalesce both.
|
|
19
|
-
const observeHost = (serviceProject) => getXpnHostProjects({ project: serviceProject }).pipe(
|
|
19
|
+
const observeHost = (serviceProject) => getXpnHostProjects({ project: serviceProject }).pipe(
|
|
20
|
+
// Three "not attached" shapes observed:
|
|
21
|
+
// - 404 NotFound (catchTag below)
|
|
22
|
+
// - 200 with a `Project` whose name/id are empty
|
|
23
|
+
// - 200 with an undefined body (no Project payload at all)
|
|
24
|
+
// Coalesce all three to `undefined`.
|
|
25
|
+
Effect.map((p) => p?.name ?? p?.id ?? undefined), Effect.catchTag("NotFound", () => Effect.succeed(undefined)), Effect.catchTag("Forbidden", () => Effect.succeed(undefined)));
|
|
20
26
|
const isAttached = Effect.fn(function* (hostProject, serviceProject) {
|
|
21
27
|
const observed = yield* observeHost(serviceProject);
|
|
22
28
|
if (!observed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SharedVpcServiceProject.js","sourceRoot":"","sources":["../../src/Compute/SharedVpcServiceProject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAkD3D,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAC7C,6BAA6B,CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,EAAE,CAClD,QAAQ,CAAC,MAAM,CACb,uBAAuB,EACvB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;IAC7D,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAAC;IACnE,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC;IACrE,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAC/D,MAAM,OAAO,GAAG,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;IAE9D,2DAA2D;IAC3D,+DAA+D;IAC/D,8DAA8D;IAC9D,2DAA2D;IAC3D,6CAA6C;IAC7C,MAAM,WAAW,GAAG,CAAC,cAAsB,EAAE,EAAE,CAC7C,kBAAkB,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"SharedVpcServiceProject.js","sourceRoot":"","sources":["../../src/Compute/SharedVpcServiceProject.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,7 +102,22 @@ export type SubnetworkAttributes = {
|
|
|
102
102
|
/** Default IPv4 gateway in the primary range. */
|
|
103
103
|
gatewayAddress: string | undefined;
|
|
104
104
|
};
|
|
105
|
-
|
|
105
|
+
/**
|
|
106
|
+
* Single (role, members) entry on a Subnetwork's IAM policy. Targets
|
|
107
|
+
* declare this contract so capabilities can `.bind` IAM grants onto
|
|
108
|
+
* the subnet — the provider's `reconcile` merges all bound entries
|
|
109
|
+
* by role into a single `setIamPolicy` call.
|
|
110
|
+
*/
|
|
111
|
+
export type SubnetworkIamBinding = {
|
|
112
|
+
/** IAM role, e.g. `"roles/compute.networkUser"`. */
|
|
113
|
+
role: string;
|
|
114
|
+
/** Principals, e.g. `["serviceAccount:foo@bar.iam.gserviceaccount.com"]`. */
|
|
115
|
+
members: ReadonlyArray<string>;
|
|
116
|
+
};
|
|
117
|
+
export type SubnetworkBindingContract = {
|
|
118
|
+
iamBindings: ReadonlyArray<SubnetworkIamBinding>;
|
|
119
|
+
};
|
|
120
|
+
export type Subnetwork = Resource<"GCP.Subnetwork", SubnetworkProps, SubnetworkAttributes, SubnetworkBindingContract, GCP.Providers>;
|
|
106
121
|
export declare const Subnetwork: import("alchemy").ResourceClass<Subnetwork>;
|
|
107
122
|
export declare const SubnetworkProvider: () => import("effect/Layer").Layer<Provider.Provider<Subnetwork>, never, import("effect/unstable/http/HttpClient").HttpClient | import("alchemy").Stage | import("alchemy").Stack | import("@distilled.cloud/gcp").Credentials>;
|
|
108
123
|
//# sourceMappingURL=Subnetwork.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Subnetwork.d.ts","sourceRoot":"","sources":["../../src/Compute/Subnetwork.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"Subnetwork.d.ts","sourceRoot":"","sources":["../../src/Compute/Subnetwork.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAU7C,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAC;AAG5C,MAAM,MAAM,wBAAwB,GAAG;IACrC,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,aAAa,CAAC,wBAAwB,CAAC,CAAC;IAC5D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,SAAS,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,mEAAmE;IACnE,OAAO,EAAE,MAAM,CAAC;IAChB,+DAA+D;IAC/D,MAAM,EAAE,MAAM,CAAC;IACf,0BAA0B;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,kCAAkC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,6BAA6B;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,oBAAoB;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,iBAAiB,EAAE,aAAa,CAAC,wBAAwB,CAAC,CAAC;IAC3D,qCAAqC;IACrC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB;IAClB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,uBAAuB;IACvB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,iDAAiD;IACjD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,yBAAyB,EACzB,GAAG,CAAC,SAAS,CACd,CAAC;AACF,eAAO,MAAM,UAAU,6CAAyC,CAAC;AA6BjE,eAAO,MAAM,kBAAkB,iOA6S5B,CAAC"}
|
|
@@ -4,7 +4,9 @@ import { Unowned } from "alchemy/AdoptPolicy";
|
|
|
4
4
|
import { deepEqual, isResolved, somePropsAreDifferent } from "alchemy/Diff";
|
|
5
5
|
import { createPhysicalName } from "alchemy/PhysicalName";
|
|
6
6
|
import * as Provider from "alchemy/Provider";
|
|
7
|
+
import * as Duration from "effect/Duration";
|
|
7
8
|
import * as Effect from "effect/Effect";
|
|
9
|
+
import * as Schedule from "effect/Schedule";
|
|
8
10
|
import { descriptionHasAlchemyMarker, gcpAlchemyDescription, stripAlchemyMarker, } from "../Tags.js";
|
|
9
11
|
import { makeAwaitRegionOperation } from "./Operations.js";
|
|
10
12
|
export const Subnetwork = Resource("GCP.Subnetwork");
|
|
@@ -34,7 +36,70 @@ export const SubnetworkProvider = () => Provider.effect(Subnetwork, Effect.gen(f
|
|
|
34
36
|
const deleteSubnetworks = yield* compute.deleteSubnetworks;
|
|
35
37
|
const expandIpCidrRange = yield* compute.expandIpCidrRangeSubnetworks;
|
|
36
38
|
const getRegionOperations = yield* compute.getRegionOperations;
|
|
39
|
+
const getIamPolicy = yield* compute.getIamPolicySubnetworks;
|
|
40
|
+
const setIamPolicy = yield* compute.setIamPolicySubnetworks;
|
|
37
41
|
const awaitOp = makeAwaitRegionOperation(getRegionOperations);
|
|
42
|
+
// Apply merged IAM bindings as a single setIamPolicy. Bindings
|
|
43
|
+
// are unioned per role (multiple `.bind` callers sharing a role
|
|
44
|
+
// get their members combined). Foreign bindings on the policy
|
|
45
|
+
// (non-alchemy roles, or members we don't manage in this role)
|
|
46
|
+
// are preserved verbatim. Etag round-trip handles concurrent
|
|
47
|
+
// edits; Conflict triggers a re-read + retry.
|
|
48
|
+
const syncIam = (args) => Effect.gen(function* () {
|
|
49
|
+
// Union all incoming binds by role.
|
|
50
|
+
const desiredByRole = new Map();
|
|
51
|
+
for (const b of args.bindings) {
|
|
52
|
+
for (const ib of b.data.iamBindings) {
|
|
53
|
+
const set = desiredByRole.get(ib.role) ?? new Set();
|
|
54
|
+
for (const m of ib.members)
|
|
55
|
+
set.add(m);
|
|
56
|
+
desiredByRole.set(ib.role, set);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
if (desiredByRole.size === 0)
|
|
60
|
+
return;
|
|
61
|
+
const current = yield* getIamPolicy({
|
|
62
|
+
project: args.project,
|
|
63
|
+
region: args.region,
|
|
64
|
+
resource: args.name,
|
|
65
|
+
optionsRequestedPolicyVersion: 3,
|
|
66
|
+
});
|
|
67
|
+
// Take the current policy verbatim, then for each role we
|
|
68
|
+
// manage, union desired members into the existing binding (or
|
|
69
|
+
// create one). This preserves foreign roles and any extra
|
|
70
|
+
// members on the same role that we don't know about.
|
|
71
|
+
const bindings = (current.bindings ?? []).map((b) => ({
|
|
72
|
+
...b,
|
|
73
|
+
members: [...(b.members ?? [])],
|
|
74
|
+
}));
|
|
75
|
+
let mutated = false;
|
|
76
|
+
for (const [role, members] of desiredByRole) {
|
|
77
|
+
let existing = bindings.find((b) => b.role === role && !b.condition);
|
|
78
|
+
if (!existing) {
|
|
79
|
+
existing = { role, members: [] };
|
|
80
|
+
bindings.push(existing);
|
|
81
|
+
}
|
|
82
|
+
const merged = new Set([...(existing.members ?? []), ...members]);
|
|
83
|
+
if (merged.size !== (existing.members?.length ?? 0))
|
|
84
|
+
mutated = true;
|
|
85
|
+
existing.members = [...merged];
|
|
86
|
+
}
|
|
87
|
+
if (!mutated)
|
|
88
|
+
return;
|
|
89
|
+
yield* setIamPolicy({
|
|
90
|
+
project: args.project,
|
|
91
|
+
region: args.region,
|
|
92
|
+
resource: args.name,
|
|
93
|
+
body: { policy: { ...current, bindings, version: 3 } },
|
|
94
|
+
});
|
|
95
|
+
}).pipe(
|
|
96
|
+
// setIamPolicy returns Conflict on etag race. Re-read + retry.
|
|
97
|
+
// With multiple subnets/projects in a stack each receiving
|
|
98
|
+
// multiple bindings in parallel, races are common. Cap at
|
|
99
|
+
// ~1.5 min total to surface real failures.
|
|
100
|
+
Effect.retry({
|
|
101
|
+
schedule: Schedule.exponential(Duration.seconds(2)).pipe(Schedule.both(Schedule.recurs(8))),
|
|
102
|
+
}));
|
|
38
103
|
const observe = (project, region, name) => getSubnetworks({ project, region, subnetwork: name }).pipe(Effect.catchTag("NotFound", () => Effect.succeed(undefined)), Effect.catchTag("Forbidden", () => Effect.succeed(undefined)));
|
|
39
104
|
// patchSubnetworks requires an up-to-date `fingerprint` for
|
|
40
105
|
// optimistic concurrency control. Re-read just before patching to
|
|
@@ -106,7 +171,7 @@ export const SubnetworkProvider = () => Provider.effect(Subnetwork, Effect.gen(f
|
|
|
106
171
|
}
|
|
107
172
|
return undefined;
|
|
108
173
|
}),
|
|
109
|
-
reconcile: Effect.fn(function* ({ id, news, session }) {
|
|
174
|
+
reconcile: Effect.fn(function* ({ id, news, session, bindings }) {
|
|
110
175
|
const desiredName = news.name ??
|
|
111
176
|
(yield* createPhysicalName({ id, maxLength: 63 })).toLowerCase();
|
|
112
177
|
const desiredDescription = yield* gcpAlchemyDescription(id, news.description);
|
|
@@ -161,6 +226,14 @@ export const SubnetworkProvider = () => Provider.effect(Subnetwork, Effect.gen(f
|
|
|
161
226
|
desired: news.ipCidrRange,
|
|
162
227
|
session,
|
|
163
228
|
});
|
|
229
|
+
// Apply IAM bindings AFTER the subnet exists. Single
|
|
230
|
+
// setIamPolicy call covers all bindings for this subnet.
|
|
231
|
+
yield* syncIam({
|
|
232
|
+
project: news.project,
|
|
233
|
+
region: news.region,
|
|
234
|
+
name: desiredName,
|
|
235
|
+
bindings,
|
|
236
|
+
});
|
|
164
237
|
const final = yield* getSubnetworks({
|
|
165
238
|
project: news.project,
|
|
166
239
|
region: news.region,
|