@microagi/alchemy-gcp 0.5.1 → 0.6.0

package/src/ManagedLustre/Instance.ts

@@ -229,6 +229,7 @@ export const ManagedLustreInstanceProvider = () =>
     ManagedLustreInstance,
     Effect.gen(function* () {
       const getInstance = yield* lustre.getProjectsLocationsInstances;
+      const listInstances = yield* lustre.listProjectsLocationsInstances;
       const createInstance = yield* lustre.createProjectsLocationsInstances;
       const patchInstance = yield* lustre.patchProjectsLocationsInstances;
       const deleteInstance = yield* lustre.deleteProjectsLocationsInstances;
@@ -403,12 +404,40 @@ export const ManagedLustreInstanceProvider = () =>
           const location = output?.location ?? olds?.location;
           const network = output?.network ?? olds?.network;
           if (!project || !location || !network) return undefined;
-          const instanceId =
-            output?.instanceId ??
-            olds?.instanceId ??
-            (yield* createPhysicalName({ id, maxLength: 63 })).toLowerCase();
-          const observed = yield* observe(project, location, instanceId);
-          if (!observed) return undefined;
+          const persistedId = output?.instanceId ?? olds?.instanceId;
+          let observed: lustre.Instance | undefined;
+          if (persistedId) {
+            observed = yield* observe(project, location, persistedId);
+          } else {
+            // Cold recovery (lost state): the instance id carries a
+            // random per-instance suffix that lived only in state, so a
+            // probe against a freshly-generated id can never hit. Scan
+            // the location's instances for our alchemy labels instead.
+            const page = yield* listInstances({
+              parent: `projects/${project}/locations/${location}`,
+            }).pipe(
+              Effect.catchTag("NotFound", () =>
+                Effect.succeed(
+                  undefined as lustre.ListInstancesResponse | undefined,
+                ),
+              ),
+              Effect.catchTag("Forbidden", () =>
+                Effect.succeed(
+                  undefined as lustre.ListInstancesResponse | undefined,
+                ),
+              ),
+            );
+            for (const candidate of page?.instances ?? []) {
+              if (yield* hasAlchemyLabels(id, candidate.labels)) {
+                observed = candidate;
+                break;
+              }
+            }
+          }
+          if (!observed?.name) return undefined;
+          // `name` is the full resource path; the instance id is its
+          // last segment.
+          const instanceId = observed.name.split("/").pop()!;
           const attrs = toAttributes(observed, {
             project,
             location,

package/src/Providers.ts

@@ -7,6 +7,12 @@ import {
 import { GCPAuth } from "./Auth/AuthProvider.ts";
 import { fromAuthProvider } from "./Auth/Credentials.ts";
 import { Project, ProjectProvider } from "./CloudResourceManager/Project.ts";
+import { Address, AddressProvider } from "./Compute/Address.ts";
+import { Firewall, FirewallProvider } from "./Compute/Firewall.ts";
+import {
+  ForwardingRule,
+  ForwardingRuleProvider,
+} from "./Compute/ForwardingRule.ts";
 import { GlobalAddress, GlobalAddressProvider } from "./Compute/GlobalAddress.ts";
 import { Network, NetworkProvider } from "./Compute/Network.ts";
 import { SharedVpcHost, SharedVpcHostProvider } from "./Compute/SharedVpcHost.ts";
@@ -17,6 +23,10 @@ import {
 import { Subnetwork, SubnetworkProvider } from "./Compute/Subnetwork.ts";
 import { Cluster, ClusterProvider } from "./Container/Cluster.ts";
 import { NodePool, NodePoolProvider } from "./Container/NodePool.ts";
+import {
+  KubernetesSecret,
+  KubernetesSecretProvider,
+} from "./Kubernetes/Secret.ts";
 import {
   ManagedLustreInstance,
   ManagedLustreInstanceProvider,
@@ -61,6 +71,9 @@ export const providers = () =>
       ApiEnable,
       Network,
       Subnetwork,
+      Firewall,
+      Address,
+      ForwardingRule,
       GlobalAddress,
       SharedVpcHost,
       SharedVpcServiceProject,
@@ -72,6 +85,7 @@ export const providers = () =>
       SqlDatabase,
       SqlUser,
       ArtifactRegistryRepository,
+      KubernetesSecret,
     ]),
   ).pipe(
     Layer.provide(
@@ -82,6 +96,9 @@ export const providers = () =>
         ApiEnableProvider(),
         NetworkProvider(),
         SubnetworkProvider(),
+        FirewallProvider(),
+        AddressProvider(),
+        ForwardingRuleProvider(),
         GlobalAddressProvider(),
         SharedVpcHostProvider(),
         SharedVpcServiceProjectProvider(),
@@ -93,6 +110,7 @@ export const providers = () =>
         SqlDatabaseProvider(),
         SqlUserProvider(),
         ArtifactRegistryRepositoryProvider(),
+        KubernetesSecretProvider(),
       ),
     ),
     Layer.provideMerge(fromAuthProvider()),

package/src/Sqladmin/Instance.ts

@@ -355,6 +355,7 @@ export const SqlInstanceProvider = () =>
     SqlInstance,
     Effect.gen(function* () {
       const getInstances = yield* sql.getInstances;
+      const listInstances = yield* sql.listInstances;
       const insertInstances = yield* sql.insertInstances;
       const patchInstances = yield* sql.patchInstances;
       const deleteInstances = yield* sql.deleteInstances;
@@ -604,13 +605,41 @@ export const SqlInstanceProvider = () =>
           const project = output?.project ?? olds?.project;
           const region = output?.region ?? olds?.region;
           if (!project || !region) return undefined;
-          const name =
-            output?.name ??
-            olds?.name ??
-            (yield* createPhysicalName({ id, maxLength: 98 })).toLowerCase();
-          const observed = yield* observe(project, name);
-          if (!observed) return undefined;
-          const attrs = toAttributes(observed, { project, region, name });
+          const name = output?.name ?? olds?.name;
+          let observed: sql.DatabaseInstance | undefined;
+          if (name) {
+            observed = yield* observe(project, name);
+          } else {
+            // Cold recovery (lost state): the physical name carries a
+            // random per-instance suffix that lived only in state, so a
+            // probe against a freshly-generated name can never hit. Scan
+            // the project's instances for our alchemy labels instead.
+            const page = yield* listInstances({
+              project,
+              maxResults: 500,
+            }).pipe(
+              Effect.catchTag("NotFound", () =>
+                Effect.succeed(undefined as sql.InstancesListResponse | undefined),
+              ),
+              Effect.catchTag("Forbidden", () =>
+                Effect.succeed(undefined as sql.InstancesListResponse | undefined),
+              ),
+            );
+            for (const candidate of page?.items ?? []) {
+              if (
+                yield* hasAlchemyLabels(id, candidate.settings?.userLabels)
+              ) {
+                observed = candidate;
+                break;
+              }
+            }
+          }
+          if (!observed?.name) return undefined;
+          const attrs = toAttributes(observed, {
+            project,
+            region,
+            name: observed.name,
+          });
           return (yield* hasAlchemyLabels(id, observed.settings?.userLabels))
             ? attrs
             : Unowned(attrs);

package/src/index.ts

@@ -11,6 +11,7 @@ export * from "./ArtifactRegistry/index.ts";
 export * from "./CloudResourceManager/index.ts";
 export * from "./Compute/index.ts";
 export * from "./Container/index.ts";
+export * from "./Kubernetes/index.ts";
 export * from "./ManagedLustre/index.ts";
 export * from "./Run/index.ts";
 export * from "./ServiceNetworking/index.ts";