@microagi/alchemy-gcp 0.11.6 → 0.11.8

package/src/ServiceNetworking/PsaConnection.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "@distilled.cloud/gcp";
-import * as sn from "@distilled.cloud/gcp/servicenetworking-v1";
+import * as sn from "@distilled.cloud/gcp/servicenetworking_v1";
 import { Resource } from "alchemy";
 import type { ScopedPlanStatusSession } from "alchemy/Cli/Cli";
 import { deepEqual, isResolved } from "alchemy/Diff";

package/src/ServiceUsage/ApiEnable.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "@distilled.cloud/gcp";
-import * as su from "@distilled.cloud/gcp/serviceusage-v1";
+import * as su from "@distilled.cloud/gcp/serviceusage_v1";
 import { Resource } from "alchemy";
 import type { ScopedPlanStatusSession } from "alchemy/Cli/Cli";
 import { isResolved } from "alchemy/Diff";

package/src/Sqladmin/Database.ts

@@ -1,4 +1,4 @@
-import * as sql from "@distilled.cloud/gcp/sqladmin-v1";
+import * as sql from "@distilled.cloud/gcp/sqladmin_v1";
 import { Resource } from "alchemy";
 import { isResolved, somePropsAreDifferent } from "alchemy/Diff";
 import * as Provider from "alchemy/Provider";

package/src/Sqladmin/Instance.ts

@@ -1,4 +1,4 @@
-import * as sql from "@distilled.cloud/gcp/sqladmin-v1";
+import * as sql from "@distilled.cloud/gcp/sqladmin_v1";
 import { Resource } from "alchemy";
 import { Unowned } from "alchemy/AdoptPolicy";
 import type { ScopedPlanStatusSession } from "alchemy/Cli/Cli";
@@ -11,7 +11,7 @@ import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Schedule from "effect/Schedule";
 import type * as GCP from "../Providers.ts";
-import { gcpInternalLabels, hasAlchemyLabels } from "../Tags.ts";
+import { gcpInternalLabels, hasAlchemyLabels, normalizeStringMap } from "../Tags.ts";
 import { makeAwaitOperation } from "./Operations.ts";
 import type {
   PostgresVersion,
@@ -289,7 +289,7 @@ const toAttributes = (
         }
       : undefined,
     settingsVersion: i.settings?.settingsVersion,
-    labels: { ...(i.settings?.userLabels ?? {}) },
+    labels: normalizeStringMap(i.settings?.userLabels) ?? {},
   };
 };
 
@@ -341,7 +341,7 @@ const toSettingsBody = (
       }
     : {}),
   ...(s.backupConfiguration ? { backupConfiguration: s.backupConfiguration } : {}),
-  ...(s.databaseFlags ? { databaseFlags: s.databaseFlags } : {}),
+  ...(s.databaseFlags ? { databaseFlags: [...s.databaseFlags] } : {}),
   ...(s.deletionProtectionEnabled !== undefined
     ? { deletionProtectionEnabled: s.deletionProtectionEnabled }
     : {}),
@@ -454,7 +454,7 @@ export const SqlInstanceProvider = () =>
         );
 
         const labelDiff = diffTags(
-          { ...(obsSettings.userLabels ?? {}) },
+          normalizeStringMap(obsSettings.userLabels) ?? {},
           args.desiredLabels,
         );
         if (labelDiff.removed.length > 0 || labelDiff.upsert.length > 0) {
@@ -631,7 +631,10 @@ export const SqlInstanceProvider = () =>
             );
             for (const candidate of page?.items ?? []) {
               if (
-                yield* hasAlchemyLabels(id, candidate.settings?.userLabels)
+                yield* hasAlchemyLabels(
+                  id,
+                  normalizeStringMap(candidate.settings?.userLabels),
+                )
               ) {
                 observed = candidate;
                 break;
@@ -644,7 +647,10 @@ export const SqlInstanceProvider = () =>
             region,
             name: observed.name,
           });
-          return (yield* hasAlchemyLabels(id, observed.settings?.userLabels))
+          return (yield* hasAlchemyLabels(
+            id,
+            normalizeStringMap(observed.settings?.userLabels),
+          ))
             ? attrs
             : Unowned(attrs);
         }),

package/src/Sqladmin/Operations.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "@distilled.cloud/gcp";
-import * as sql from "@distilled.cloud/gcp/sqladmin-v1";
+import * as sql from "@distilled.cloud/gcp/sqladmin_v1";
 import type { ScopedPlanStatusSession } from "alchemy/Cli/Cli";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";

package/src/Sqladmin/User.ts

@@ -1,4 +1,4 @@
-import * as sql from "@distilled.cloud/gcp/sqladmin-v1";
+import * as sql from "@distilled.cloud/gcp/sqladmin_v1";
 import { Resource } from "alchemy";
 import { isResolved, somePropsAreDifferent } from "alchemy/Diff";
 import * as Provider from "alchemy/Provider";

package/src/Storage/Bucket.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "@distilled.cloud/gcp";
-import * as storage from "@distilled.cloud/gcp/storage-v1";
+import * as storage from "@distilled.cloud/gcp/storage_v1";
 import { Resource } from "alchemy";
 import { Unowned } from "alchemy/AdoptPolicy";
 import { isResolved } from "alchemy/Diff";

package/src/Storage/StorageBucketIamMember.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "@distilled.cloud/gcp";
-import * as storage from "@distilled.cloud/gcp/storage-v1";
+import * as storage from "@distilled.cloud/gcp/storage_v1";
 import { Resource } from "alchemy";
 import { isResolved } from "alchemy/Diff";
 import * as Provider from "alchemy/Provider";

package/src/Tags.ts

@@ -28,6 +28,18 @@ const sanitizeLabelValue = (raw: string): string => {
   return replaced.slice(0, 63);
 };
 
+/** Normalize an SDK string map by omitting absent values at the boundary. */
+export const normalizeStringMap = (
+  value: Record<string, string | undefined> | undefined,
+): Record<string, string> | undefined =>
+  value === undefined
+    ? undefined
+    : Object.fromEntries(
+        Object.entries(value).filter(
+          (entry): entry is [string, string] => entry[1] !== undefined,
+        ),
+      );
+
 /**
  * Compute the alchemy-internal label set for a Resource. Merge the
  * result with user-provided labels (user wins on key collision is
@@ -50,7 +62,10 @@ export const gcpInternalLabels = Effect.fnUntraced(function* (id: string) {
  */
 export const hasAlchemyLabels = Effect.fnUntraced(function* (
   id: string,
-  labels: Record<string, string> | undefined,
+  // Distilled's generated Kubernetes/GCP map types have index signatures that
+  // include `undefined` (`{ [k: string]: string | undefined }`), so accept the
+  // wider shape — the equality checks below are unaffected.
+  labels: Record<string, string | undefined> | undefined,
 ) {
   if (!labels) return false;
   const expected = yield* gcpInternalLabels(id);