alchemy 0.22.4 → 0.24.0

package/src/aws/bucket.ts

@@ -13,6 +13,7 @@ import {
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { ignore } from "../util/ignore.ts";
+import { retry } from "./retry.ts";
 
 /**
  * Properties for creating or updating an S3 bucket
@@ -133,52 +134,60 @@ export const Bucket = Resource(
 
     if (this.phase === "delete") {
       await ignore(NoSuchBucket.name, () =>
-        client.send(
-          new DeleteBucketCommand({
-            Bucket: props.bucketName,
-          }),
+        retry(() =>
+          client.send(
+            new DeleteBucketCommand({
+              Bucket: props.bucketName,
+            }),
+          ),
         ),
       );
       return this.destroy();
     }
     try {
       // Check if bucket exists
-      await client.send(
-        new HeadBucketCommand({
-          Bucket: props.bucketName,
-        }),
+      await retry(() =>
+        client.send(
+          new HeadBucketCommand({
+            Bucket: props.bucketName,
+          }),
+        ),
       );
 
       // Update tags if they changed and bucket exists
       if (this.phase === "update" && props.tags) {
-        await client.send(
-          new PutBucketTaggingCommand({
-            Bucket: props.bucketName,
-            Tagging: {
-              TagSet: Object.entries(props.tags).map(([Key, Value]) => ({
-                Key,
-                Value,
-              })),
-            },
-          }),
-        );
-      }
-    } catch (error: any) {
-      if (error.name === "NotFound") {
-        // Create bucket if it doesn't exist
-        await client.send(
-          new CreateBucketCommand({
-            Bucket: props.bucketName,
-            // Add tags during creation if specified
-            ...(props.tags && {
+        await retry(() =>
+          client.send(
+            new PutBucketTaggingCommand({
+              Bucket: props.bucketName,
               Tagging: {
-                TagSet: Object.entries(props.tags).map(([Key, Value]) => ({
+                TagSet: Object.entries(props.tags!).map(([Key, Value]) => ({
                   Key,
                   Value,
                 })),
               },
             }),
-          }),
+          ),
+        );
+      }
+    } catch (error: any) {
+      if (error.name === "NotFound") {
+        // Create bucket if it doesn't exist
+        await retry(() =>
+          client.send(
+            new CreateBucketCommand({
+              Bucket: props.bucketName,
+              // Add tags during creation if specified
+              ...(props.tags && {
+                Tagging: {
+                  TagSet: Object.entries(props.tags).map(([Key, Value]) => ({
+                    Key,
+                    Value,
+                  })),
+                },
+              }),
+            }),
+          ),
         );
       } else {
         throw error;
@@ -188,11 +197,19 @@ export const Bucket = Resource(
     // Get bucket details
     const [locationResponse, versioningResponse, aclResponse] =
       await Promise.all([
-        client.send(new GetBucketLocationCommand({ Bucket: props.bucketName })),
-        client.send(
-          new GetBucketVersioningCommand({ Bucket: props.bucketName }),
+        retry(() =>
+          client.send(
+            new GetBucketLocationCommand({ Bucket: props.bucketName }),
+          ),
+        ),
+        retry(() =>
+          client.send(
+            new GetBucketVersioningCommand({ Bucket: props.bucketName }),
+          ),
+        ),
+        retry(() =>
+          client.send(new GetBucketAclCommand({ Bucket: props.bucketName })),
         ),
-        client.send(new GetBucketAclCommand({ Bucket: props.bucketName })),
       ]);
 
     const region = locationResponse.LocationConstraint || "us-east-1";
@@ -201,8 +218,10 @@ export const Bucket = Resource(
     let tags = props.tags;
     if (!tags) {
       try {
-        const taggingResponse = await client.send(
-          new GetBucketTaggingCommand({ Bucket: props.bucketName }),
+        const taggingResponse = await retry(() =>
+          client.send(
+            new GetBucketTaggingCommand({ Bucket: props.bucketName }),
+          ),
         );
         tags = Object.fromEntries(
           taggingResponse.TagSet?.map(({ Key, Value }) => [Key, Value]) || [],

package/src/aws/control/client.ts

@@ -2,6 +2,7 @@ import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
 import { loadConfig } from "@aws-sdk/node-config-provider";
 import { AwsClient } from "aws4fetch";
 
+import { safeFetch } from "../../util/safe-fetch.ts";
 import {
   AlreadyExistsError,
   CloudControlError,
@@ -202,18 +203,17 @@ export class CloudControlClient {
     identifier: string,
   ): Promise<Record<string, any> | undefined> {
     try {
-      return JSON.parse(
-        (
-          await this.fetch<{
-            ResourceDescription: {
-              Properties: string;
-            };
-          }>("GetResource", {
-            TypeName: typeName,
-            Identifier: identifier,
-          })
-        ).ResourceDescription.Properties,
-      );
+      const resource = await this.fetch<{
+        Identifier: string;
+        TypeName: string;
+        ResourceDescription: {
+          Properties: string;
+        };
+      }>("GetResource", {
+        TypeName: typeName,
+        Identifier: identifier,
+      });
+      return JSON.parse(resource.ResourceDescription.Properties);
     } catch (error: any) {
       if (error instanceof ResourceNotFoundException) {
         return undefined;
@@ -366,7 +366,7 @@ export class CloudControlClient {
           },
         ] as const;
         const signedRequest = await this.client.sign(...args);
-        const response = await fetch(signedRequest);
+        const response = await safeFetch(signedRequest);
 
         if (!response.ok) {
           const data: any = await response.json();

package/src/aws/control/properties.ts

@@ -120,6 +120,7 @@ const properties = {
       "DistributionDomainName",
       "DistributionHostedZoneId",
       "DomainName",
+      "DomainNameArn",
       "RegionalDomainName",
       "RegionalHostedZoneId",
     ],
@@ -533,7 +534,11 @@ const properties = {
     ],
   },
   AutoScaling: {
-    AutoScalingGroup: ["AutoScalingGroupName", "InstanceId"],
+    AutoScalingGroup: [
+      "AutoScalingGroupARN",
+      "AutoScalingGroupName",
+      "InstanceId",
+    ],
     LaunchConfiguration: [
       "AssociatePublicIpAddress",
       "BlockDeviceMappings",
@@ -757,6 +762,18 @@ const properties = {
       "GuardrailIdentifier",
       "Version",
     ],
+    IntelligentPromptRouter: [
+      "CreatedAt",
+      "Description",
+      "FallbackModel",
+      "Models",
+      "PromptRouterArn",
+      "PromptRouterName",
+      "RoutingCriteria",
+      "Status",
+      "Type",
+      "UpdatedAt",
+    ],
     KnowledgeBase: [
       "CreatedAt",
       "FailureReasons",
@@ -1092,7 +1109,6 @@ const properties = {
       "ETag",
       "Id",
       "LastModifiedTime",
-      "ManagedCertificateRequest",
       "Name",
       "Status",
     ],
@@ -1537,7 +1553,14 @@ const properties = {
       "SubnetArns",
       "VpcEndpointId",
     ],
-    LocationAzureBlob: ["AzureBlobContainerUrl", "LocationArn", "LocationUri"],
+    LocationAzureBlob: [
+      "AzureBlobContainerUrl",
+      "CmkSecretConfig.SecretArn",
+      "LocationArn",
+      "LocationUri",
+      "ManagedSecretConfig",
+      "ManagedSecretConfig.SecretArn",
+    ],
     LocationEFS: [
       "Ec2Config",
       "EfsFilesystemArn",
@@ -1571,14 +1594,16 @@ const properties = {
     ],
     LocationHDFS: ["LocationArn", "LocationUri"],
     LocationNFS: ["LocationArn", "LocationUri"],
-    LocationObjectStorage: ["BucketName", "LocationArn", "LocationUri"],
+    LocationObjectStorage: [
+      "BucketName",
+      "CmkSecretConfig.SecretArn",
+      "LocationArn",
+      "LocationUri",
+      "ManagedSecretConfig",
+      "ManagedSecretConfig.SecretArn",
+    ],
     LocationS3: ["LocationArn", "LocationUri", "S3BucketArn"],
     LocationSMB: ["LocationArn", "LocationUri"],
-    StorageSystem: [
-      "ConnectivityStatus",
-      "SecretsManagerArn",
-      "StorageSystemArn",
-    ],
     Task: [
       "DestinationLocationArn",
       "DestinationNetworkInterfaceArns",
@@ -1632,6 +1657,16 @@ const properties = {
       "RootDomainUnitId",
       "Status",
     ],
+    DomainUnit: [
+      "CreatedAt",
+      "DomainId",
+      "DomainIdentifier",
+      "Id",
+      "Identifier",
+      "LastUpdatedAt",
+      "ParentDomainUnitId",
+      "ParentDomainUnitIdentifier",
+    ],
     Environment: [
       "AwsAccountId",
       "AwsAccountRegion",
@@ -1686,15 +1721,29 @@ const properties = {
       "GroupName",
       "Id",
     ],
+    Owner: ["DomainIdentifier", "EntityIdentifier", "EntityType", "Owner"],
     Project: [
       "CreatedAt",
       "CreatedBy",
       "DomainId",
       "DomainIdentifier",
+      "DomainUnitId",
       "Id",
       "LastUpdatedAt",
+      "ProjectProfileId",
+      "ProjectStatus",
     ],
     ProjectMembership: ["DomainIdentifier", "Member", "ProjectIdentifier"],
+    ProjectProfile: [
+      "CreatedAt",
+      "CreatedBy",
+      "DomainId",
+      "DomainIdentifier",
+      "DomainUnitId",
+      "Id",
+      "Identifier",
+      "LastUpdatedAt",
+    ],
     SubscriptionTarget: [
       "CreatedAt",
       "CreatedBy",
@@ -1949,7 +1998,6 @@ const properties = {
     EIP: [
       "Address",
       "AllocationId",
-      "Domain",
       "IpamPoolId",
       "NetworkBorderGroup",
       "PublicIp",
@@ -2180,6 +2228,7 @@ const properties = {
       "AlternatePathHints",
       "Explanations",
       "FilterInArns",
+      "FilterOutArns",
       "ForwardPathComponents",
       "NetworkInsightsAnalysisArn",
       "NetworkInsightsAnalysisId",
@@ -2591,7 +2640,6 @@ const properties = {
     PrimaryTaskSet: ["Cluster", "Service"],
     Service: [
       "Cluster",
-      "DeploymentController",
       "LaunchType",
       "Name",
       "Role",
@@ -3064,7 +3112,6 @@ const properties = {
       "FleetId",
       "GameServerContainerGroupDefinitionArn",
       "InstanceType",
-      "Locations",
       "MaximumGameServerContainerGroupsPerInstance",
       "PerInstanceContainerGroupDefinitionArn",
       "Status",
@@ -3084,6 +3131,7 @@ const properties = {
       "CertificateConfiguration",
       "ComputeType",
       "EC2InstanceType",
+      "FleetArn",
       "FleetId",
       "FleetType",
       "InstanceRoleARN",
@@ -3822,7 +3870,7 @@ const properties = {
     ],
   },
   Kendra: {
-    DataSource: ["Arn", "Id", "Type"],
+    DataSource: ["Arn", "Id", "IndexId", "Type"],
     Faq: [
       "Arn",
       "Description",
@@ -4328,7 +4376,7 @@ const properties = {
     Queue: ["Arn", "Name", "Name"],
   },
   MediaLive: {
-    Channel: ["AnywhereSettings", "Arn", "Inputs", "Vpc"],
+    Channel: ["Arn", "Inputs", "Vpc"],
     ChannelPlacementGroup: ["Arn", "Channels", "ClusterId", "Id", "State"],
     CloudWatchAlarmTemplate: [
       "Arn",
@@ -4848,6 +4896,22 @@ const properties = {
       "Status",
       "StorageCapacity",
       "Type",
+      "Uuid",
+    ],
+    WorkflowVersion: [
+      "Accelerators",
+      "Arn",
+      "CreationTime",
+      "DefinitionUri",
+      "Engine",
+      "Main",
+      "ParameterTemplate",
+      "Status",
+      "Type",
+      "Uuid",
+      "VersionName",
+      "WorkflowBucketOwnerId",
+      "WorkflowId",
     ],
   },
   OpenSearchServerless: {
@@ -5808,11 +5872,8 @@ const properties = {
       "IpAddressCount",
       "Name",
       "OutpostArn",
-      "OutpostArn",
-      "PreferredInstanceType",
       "PreferredInstanceType",
       "ResolverEndpointId",
-      "ResolverEndpointType",
       "SecurityGroupIds",
     ],
     ResolverQueryLoggingConfig: [
@@ -5911,6 +5972,14 @@ const properties = {
     StorageLensGroup: ["Name", "StorageLensGroupArn"],
   },
   S3Express: {
+    AccessPoint: [
+      "Arn",
+      "Bucket",
+      "BucketAccountId",
+      "Name",
+      "NetworkOrigin",
+      "VpcConfiguration",
+    ],
     BucketPolicy: ["Bucket"],
     DirectoryBucket: [
       "Arn",
@@ -5983,6 +6052,11 @@ const properties = {
       "AddonSubscriptionArn",
       "AddonSubscriptionId",
     ],
+    MailManagerAddressList: [
+      "AddressListArn",
+      "AddressListId",
+      "AddressListName",
+    ],
     MailManagerArchive: [
       "ArchiveArn",
       "ArchiveId",
@@ -6042,6 +6116,9 @@ const properties = {
     Plan: ["Arn", "ContactId"],
     Rotation: ["Arn"],
   },
+  SSMGuiConnect: {
+    Preferences: ["AccountId"],
+  },
   SSMIncidents: {
     ReplicationSet: ["Arn"],
     ResponsePlan: ["Arn", "Name"],
@@ -6074,6 +6151,7 @@ const properties = {
       "AppArn",
       "AppName",
       "AppType",
+      "BuiltInLifecycleConfigArn",
       "DomainId",
       "ResourceSpec",
       "Tags",
@@ -6578,7 +6656,6 @@ const properties = {
     ],
     ScheduledQuery: [
       "Arn",
-      "ClientToken",
       "ErrorReportConfiguration",
       "KmsKeyId",
       "NotificationConfiguration",
@@ -6939,7 +7016,7 @@ const properties = {
     TransactionSearchConfig: ["AccountId"],
   },
   Alexa: {
-    ASK: ["VendorId"],
+    ASKSkill: ["VendorId"],
   },
 };
 

package/src/aws/control/resource.ts

@@ -9,6 +9,7 @@ import { createCloudControlClient, type ProgressEvent } from "./client.ts";
 import {
   AlreadyExistsError,
   ConcurrentOperationError,
+  NotFoundError,
   UpdateFailedError,
 } from "./error.ts";
 import readOnlyPropertiesMap from "./properties.ts";
@@ -206,7 +207,19 @@ export const CloudControlResource = Resource(
 // register a catch-all for AWS::* resources (Resources created with the Control API)
 registerDynamicResource((typeName) => {
   if (typeName.startsWith("AWS::")) {
-    return Resource(typeName, CloudControlLifecycle) as unknown as Provider;
+    return Resource(
+      typeName,
+      function (
+        this: Context<CloudControlResource, CloudControlResourceProps>,
+        id: string,
+        props: Omit<CloudControlResourceProps, "typeName">,
+      ) {
+        return CloudControlLifecycle.bind(this)(id, {
+          typeName,
+          ...props,
+        });
+      },
+    ) as unknown as Provider;
   }
   return undefined;
 });
@@ -228,8 +241,11 @@ async function CloudControlLifecycle(
       try {
         await client.deleteResource(props.typeName, this.output.id);
       } catch (error) {
-        // Log but don't throw on cleanup errors
-        console.error(`Error deleting resource ${id}:`, error);
+        if (error instanceof NotFoundError) {
+          // great, this is the desired outcome
+        } else {
+          throw error;
+        }
       }
     }
     return this.destroy();