alchemy 0.69.0 → 0.70.0

package/lib/clickhouse/service.d.ts

@@ -0,0 +1,275 @@
+import type { Context } from "../context.ts";
+import { type Secret } from "../secret.ts";
+import type { Service as ApiService, Organization } from "./api/types.gen.ts";
+export interface ServiceProps {
+    /**
+     * The key ID for the Clickhouse API
+     */
+    keyId?: string | Secret<string>;
+    /**
+     * The secret for the Clickhouse API
+     */
+    secret?: string | Secret<string>;
+    /**
+     * The id of Clickhouse cloud organization to create the service in.
+     */
+    organization: string | Organization;
+    /**
+     * The name of the Clickhouse service to create.
+     *
+     * @default ${app}-${stage}-${id}
+     */
+    name?: string;
+    /**
+     * The underlying cloud provider to create the service on.
+     */
+    provider: ApiService["provider"];
+    /**
+     * The region to create the service in.
+     */
+    region: ApiService["region"];
+    /**
+     * The IP access list to create the service with.
+     *
+     * @default [{ description: "Anywhere", source: "0.0.0.0/0" }]
+     */
+    ipAccessList?: ApiService["ipAccessList"];
+    /**
+     * The minimum replica memory to create the service with.
+     *
+     * @default 8
+     */
+    minReplicaMemoryGb?: ApiService["minReplicaMemoryGb"];
+    /**
+     * The maximum replica memory to create the service with.
+     *
+     * @default 356
+     */
+    maxReplicaMemoryGb?: ApiService["maxReplicaMemoryGb"];
+    /**
+     * The number of replicas to create the service with.
+     *
+     * @default 3
+     */
+    numReplicas?: ApiService["numReplicas"];
+    /**
+     * Whether to enable idle scaling.
+     *
+     * @default true
+     */
+    idleScaling?: ApiService["idleScaling"];
+    /**
+     * The timeout minutes for idle scaling.
+     *
+     * @default 15
+     */
+    idleTimeoutMinutes?: ApiService["idleTimeoutMinutes"];
+    /**
+     * Whether to make the service readonly.
+     *
+     * @default false
+     */
+    isReadonly?: ApiService["isReadonly"];
+    /**
+     * The release channel to create the service with.
+     *
+     * @default "default"
+     */
+    releaseChannel?: ApiService["releaseChannel"];
+    /**
+     * The desired state of the service.
+     *
+     * @default "start"
+     */
+    stateTarget?: "start" | "stop";
+    /**
+     * Whether to enable the mysql endpoint.
+     *
+     * @default true
+     */
+    enableMysqlEndpoint?: boolean;
+    /**
+     * Whether to enable the https endpoint. Cannot be disabled
+     *
+     * @default true
+     */
+    enableHttpsEndpoint?: true;
+    /**
+     * Whether to enable the nativesecure endpoint. Cannot be disabled
+     *
+     * @default true
+     */
+    enableNativesecureEndpoint?: true;
+    /**
+     * The compliance type to create the service with.
+     */
+    complianceType?: ApiService["complianceType"];
+    byocId?: ApiService["byocId"];
+    hasTransparentDataEncryption?: ApiService["hasTransparentDataEncryption"];
+    profile?: ApiService["profile"];
+    dataWarehouseId?: ApiService["dataWarehouseId"];
+    backupId?: string;
+    encryptionKey?: ApiService["encryptionKey"];
+    encryptionAssumedRoleIdentifier?: ApiService["encryptionAssumedRoleIdentifier"];
+}
+export interface Service {
+    /**
+     * The id of Clickhouse cloud organization the service is in.
+     */
+    organizationId: string;
+    /**
+     * The name of the Clickhouse service.
+     *
+     */
+    name: string;
+    /**
+     * The clickhouse id of the Clickhouse service.
+     */
+    clickhouseId: string;
+    /**
+     * The password for the Clickhouse service.
+     */
+    password: Secret<string>;
+    /**
+     * The provider of the Clickhouse service.
+     */
+    provider: NonNullable<ApiService["provider"]>;
+    /**
+     * The region of the Clickhouse service.
+     */
+    region: NonNullable<ApiService["region"]>;
+    /**
+     * The IP access list of the Clickhouse service.
+     */
+    ipAccessList: NonNullable<ApiService["ipAccessList"]>;
+    /**
+     * The minimum replica memory of the Clickhouse service.
+     */
+    minReplicaMemoryGb: NonNullable<ApiService["minReplicaMemoryGb"]>;
+    /**
+     * The maximum replica memory of the Clickhouse service.
+     */
+    maxReplicaMemoryGb: NonNullable<ApiService["maxReplicaMemoryGb"]>;
+    /**
+     * The number of replicas of the Clickhouse service.
+     */
+    numReplicas: NonNullable<ApiService["numReplicas"]>;
+    /**
+     * Whether to enable idle scaling of the Clickhouse service.
+     */
+    idleScaling: NonNullable<ApiService["idleScaling"]>;
+    /**
+     * The timeout minutes for idle scaling of the Clickhouse service.
+     */
+    idleTimeoutMinutes: NonNullable<ApiService["idleTimeoutMinutes"]>;
+    /**
+     * Whether to make the Clickhouse service readonly.
+     */
+    isReadonly: NonNullable<ApiService["isReadonly"]>;
+    /**
+     * The data warehouse id of the Clickhouse service.
+     */
+    dataWarehouseId: NonNullable<ApiService["dataWarehouseId"]>;
+    /**
+     * The encryption key of the Clickhouse service.
+     */
+    encryptionKey?: ApiService["encryptionKey"];
+    /**
+     * The encryption assumed role identifier of the Clickhouse service.
+     */
+    encryptionAssumedRoleIdentifier?: ApiService["encryptionAssumedRoleIdentifier"];
+    /**
+     * The release channel of the Clickhouse service.
+     */
+    releaseChannel: NonNullable<ApiService["releaseChannel"]>;
+    /**
+     * The byoc id of the Clickhouse service if it is using BYOC infrastructure.
+     */
+    byocId?: ApiService["byocId"];
+    /**
+     * Whether to enable transparent data encryption of the Clickhouse service.
+     */
+    hasTransparentDataEncryption?: ApiService["hasTransparentDataEncryption"];
+    /**
+     * The profile the Clickhouse service was created using.
+     */
+    profile?: ApiService["profile"];
+    /**
+     * The compliance type of the Clickhouse service.
+     */
+    complianceType?: ApiService["complianceType"];
+    /**
+     * The backup id of the Clickhouse service.
+     */
+    backupId?: string;
+    /**
+     * If the mysql endpoint is enabled.
+     */
+    enableMysqlEndpoint?: boolean;
+    /**
+     * If the https endpoint is enabled.
+     */
+    enableHttpsEndpoint?: true;
+    /**
+     * If the nativesecure endpoint is enabled.
+     */
+    enableNativesecureEndpoint?: true;
+    /**
+     * The mysql endpoint details of the Clickhouse service.
+     */
+    mysqlEndpoint?: {
+        protocol: "mysql";
+        host: string;
+        port: number;
+        username: string;
+    };
+    /**
+     * The https endpoint details of the Clickhouse service.
+     */
+    httpsEndpoint?: {
+        protocol: "https";
+        host: string;
+        port: number;
+    };
+    /**
+     * The nativesecure endpoint details of the Clickhouse service.
+     */
+    nativesecureEndpoint?: {
+        protocol: "nativesecure";
+        host: string;
+        port: number;
+    };
+    /**
+     * The desired state of the Clickhouse service.
+     */
+    stateTarget: "start" | "stop";
+    /**
+     * The state of the Clickhouse service.
+     */
+    state: ApiService["state"];
+}
+/**
+ * Create, manage and delete Clickhouse services
+ *
+ * @example
+ * // Create a basic Clickhouse service on aws
+ * const organization = await getOrganizationByName("Alchemy's Organization");
+ * const service = await Service("clickhouse", {
+ *   organization,
+ *   provider: "aws",
+ *   region: "us-east-1",
+ * });
+ *
+ * @example
+ * // Create a basic Clickhouse service on aws with custom scaling rules
+ * const service = await Service("clickhouse", {
+ *   organization,
+ *   provider: "aws",
+ *   region: "us-east-1",
+ *   minReplicaMemoryGb: 8,
+ *   maxReplicaMemoryGb: 356,
+ *   numReplicas: 3,
+ * });
+ */
+export declare const Service: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Service>, id: string, props: ServiceProps) => Promise<Service>);
+//# sourceMappingURL=service.d.ts.map

package/lib/clickhouse/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/clickhouse/service.ts"],"names":[],"mappings":"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"}

package/lib/clickhouse/service.js

@@ -0,0 +1,274 @@
+import { Resource } from "../resource.js";
+import { secret } from "../secret.js";
+import { diff } from "../util/diff.js";
+import { createClickhouseApi } from "./api.js";
+/**
+ * Create, manage and delete Clickhouse services
+ *
+ * @example
+ * // Create a basic Clickhouse service on aws
+ * const organization = await getOrganizationByName("Alchemy's Organization");
+ * const service = await Service("clickhouse", {
+ *   organization,
+ *   provider: "aws",
+ *   region: "us-east-1",
+ * });
+ *
+ * @example
+ * // Create a basic Clickhouse service on aws with custom scaling rules
+ * const service = await Service("clickhouse", {
+ *   organization,
+ *   provider: "aws",
+ *   region: "us-east-1",
+ *   minReplicaMemoryGb: 8,
+ *   maxReplicaMemoryGb: 356,
+ *   numReplicas: 3,
+ * });
+ */
+export const Service = Resource("clickhouse::Service", async function (id, props) {
+    const api = createClickhouseApi({
+        keyId: props.keyId,
+        secret: props.secret,
+    });
+    const idleScaling = props.idleScaling ?? true;
+    const isReadonly = props.isReadonly ?? false;
+    const releaseChannel = props.releaseChannel ?? "default";
+    const endpoints = [];
+    const enableMysqlEndpoint = props.enableMysqlEndpoint ?? true;
+    if (enableMysqlEndpoint) {
+        endpoints.push({ protocol: "mysql", enabled: true });
+    }
+    //todo(michael): comment these in when disabling is supported
+    // const enableHttpsEndpoint = props.enableHttpsEndpoint ?? true;
+    // if (enableHttpsEndpoint) {
+    // 	endpoints.push({ protocol: "https", enabled: true });
+    // }
+    // const enableNativesecureEndpoint = props.enableNativesecureEndpoint ?? true;
+    // if (enableNativesecureEndpoint) {
+    // 	endpoints.push({ protocol: "nativesecure", enabled: true });
+    // }
+    const stateTarget = props.stateTarget ?? "start";
+    const ipAccessList = props.ipAccessList ?? [
+        {
+            description: "Anywhere",
+            source: "0.0.0.0/0",
+        },
+    ];
+    const minReplicaMemoryGb = props.minReplicaMemoryGb ?? 8;
+    const maxReplicaMemoryGb = props.maxReplicaMemoryGb ?? 356;
+    const numReplicas = props.numReplicas ?? 3;
+    const idleTimeoutMinutes = props.idleTimeoutMinutes ?? 15;
+    const name = props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+    const organizationId = typeof props.organization === "string"
+        ? props.organization
+        : props.organization.id;
+    if (this.phase === "delete") {
+        await api.updateServiceState({
+            path: {
+                organizationId: organizationId,
+                serviceId: this.output.clickhouseId,
+            },
+            body: {
+                command: "stop",
+            },
+        });
+        await waitForServiceState(api, organizationId, this.output.clickhouseId, (state) => state === "stopped", 10 * 60);
+        await api.deleteService({
+            path: {
+                organizationId: organizationId,
+                serviceId: this.output.clickhouseId,
+            },
+        });
+        return this.destroy();
+    }
+    if (this.phase === "update") {
+        const resourceDiff = diff({
+            ...props,
+            idleScaling,
+            isReadonly,
+            releaseChannel,
+            name,
+        }, {
+            ...this.output,
+            organization: props.organization,
+        });
+        const updates = {};
+        if (resourceDiff.some((prop) => prop !== "name" &&
+            prop !== "ipAccessList" &&
+            prop !== "releaseChannel" &&
+            prop !== "enableMysqlEndpoint" &&
+            prop !== "enableHttpsEndpoint" &&
+            prop !== "enableNativesecureEndpoint" &&
+            prop !== "minReplicaMemoryGb" &&
+            prop !== "maxReplicaMemoryGb" &&
+            prop !== "numReplicas" &&
+            prop !== "idleScaling" &&
+            prop !== "idleTimeoutMinutes" &&
+            prop !== "stateTarget")) {
+            return this.replace();
+        }
+        if (
+        //todo(michael): check encryption key swap?
+        resourceDiff.some((prop) => prop === "name" ||
+            prop === "ipAccessList" ||
+            prop === "releaseChannel") ||
+            enableMysqlEndpoint !== this.output.enableMysqlEndpoint) {
+            const ipAccessListToRemove = this.output.ipAccessList.filter((ipAccessList) => !props.ipAccessList?.includes(ipAccessList));
+            const ipAccessListToAdd = props.ipAccessList?.filter((ipAccessList) => !this.output.ipAccessList.includes(ipAccessList));
+            const response = (await api.updateServiceBasicDetails({
+                path: {
+                    organizationId: organizationId,
+                    serviceId: this.output.clickhouseId,
+                },
+                body: {
+                    name,
+                    ipAccessList: {
+                        remove: ipAccessListToRemove,
+                        add: ipAccessListToAdd,
+                    },
+                    releaseChannel,
+                    endpoints,
+                },
+            })).data.result;
+            updates.name = response.name;
+            updates.ipAccessList = response.ipAccessList;
+            updates.releaseChannel = response.releaseChannel;
+            updates.mysqlEndpoint = response.endpoints.find((endpoint) => endpoint.protocol === "mysql");
+            updates.httpsEndpoint = response.endpoints.find((endpoint) => endpoint.protocol === "https");
+            updates.nativesecureEndpoint = response.endpoints.find((endpoint) => endpoint.protocol === "nativesecure");
+        }
+        if (stateTarget !== this.output.stateTarget) {
+            const response = await api.updateServiceState({
+                path: {
+                    organizationId: organizationId,
+                    serviceId: this.output.clickhouseId,
+                },
+                body: {
+                    command: stateTarget,
+                },
+            });
+            updates.state = response.data.result.state;
+            updates.stateTarget = stateTarget;
+        }
+        if (resourceDiff.some((prop) => prop === "minReplicaMemoryGb" ||
+            prop === "maxReplicaMemoryGb" ||
+            prop === "numReplicas" ||
+            prop === "idleScaling" ||
+            prop === "idleTimeoutMinutes")) {
+            const response = (await api.updateServiceAutoScalingSettings2({
+                path: {
+                    organizationId: organizationId,
+                    serviceId: this.output.clickhouseId,
+                },
+                body: {
+                    minReplicaMemoryGb: props.minReplicaMemoryGb,
+                    maxReplicaMemoryGb: props.maxReplicaMemoryGb,
+                    numReplicas: props.numReplicas,
+                    idleScaling: props.idleScaling,
+                    idleTimeoutMinutes: idleTimeoutMinutes,
+                },
+            })).data.result;
+            updates.minReplicaMemoryGb = response.minReplicaMemoryGb;
+            updates.maxReplicaMemoryGb = response.maxReplicaMemoryGb;
+            updates.numReplicas = response.numReplicas;
+            updates.idleScaling = response.idleScaling;
+            updates.idleTimeoutMinutes = response.idleTimeoutMinutes;
+        }
+        return {
+            ...this.output,
+            ...updates,
+        };
+    }
+    const response = (await api.createNewService({
+        path: {
+            organizationId: organizationId,
+        },
+        body: {
+            name,
+            provider: props.provider,
+            region: props.region,
+            ipAccessList: ipAccessList,
+            minReplicaMemoryGb: minReplicaMemoryGb,
+            maxReplicaMemoryGb: maxReplicaMemoryGb,
+            numReplicas: numReplicas,
+            idleScaling: idleScaling,
+            idleTimeoutMinutes: idleTimeoutMinutes,
+            isReadonly: isReadonly,
+            dataWarehouseId: props.dataWarehouseId,
+            backupId: props.backupId,
+            encryptionKey: props.encryptionKey,
+            encryptionAssumedRoleIdentifier: props.encryptionAssumedRoleIdentifier,
+            privatePreviewTermsChecked: true,
+            releaseChannel: releaseChannel,
+            byocId: props.byocId,
+            hasTransparentDataEncryption: props.hasTransparentDataEncryption ?? false,
+            endpoints: endpoints,
+            profile: props.profile,
+            complianceType: props.complianceType,
+        },
+    })).data.result;
+    const password = response.password;
+    const service = response.service;
+    await waitForServiceState(api, organizationId, response.service.id, (state) => state === "running" || state === "idle", 10 * 60);
+    return {
+        organizationId: organizationId,
+        name: service.name,
+        clickhouseId: service.id,
+        password: secret(password),
+        provider: service.provider,
+        region: service.region,
+        ipAccessList: service.ipAccessList,
+        minReplicaMemoryGb: service.minReplicaMemoryGb,
+        maxReplicaMemoryGb: service.maxReplicaMemoryGb,
+        numReplicas: service.numReplicas,
+        idleScaling: service.idleScaling,
+        idleTimeoutMinutes: service.idleTimeoutMinutes,
+        isReadonly: service.isReadonly,
+        dataWarehouseId: service.dataWarehouseId,
+        backupId: props.backupId,
+        encryptionKey: service.encryptionKey,
+        encryptionAssumedRoleIdentifier: service.encryptionAssumedRoleIdentifier,
+        releaseChannel: service.releaseChannel,
+        byocId: service.byocId,
+        hasTransparentDataEncryption: service.hasTransparentDataEncryption,
+        profile: service.profile,
+        complianceType: service.complianceType,
+        stateTarget,
+        state: service.state,
+        mysqlEndpoint: service.endpoints.find((endpoint) => endpoint.protocol === "mysql"),
+        httpsEndpoint: service.endpoints.find((endpoint) => endpoint.protocol === "https"),
+        nativesecureEndpoint: service.endpoints.find((endpoint) => endpoint.protocol === "nativesecure"),
+    };
+});
+async function waitForServiceState(api, organizationId, serviceId, stateChecker, maxWaitSeconds) {
+    const checkState = async () => {
+        const service = await api.getServiceDetails({
+            path: {
+                organizationId: organizationId,
+                serviceId: serviceId,
+            },
+        });
+        const serviceState = service.data.result.state;
+        if (stateChecker(serviceState)) {
+            return;
+        }
+        throw new Error(`Service ${serviceId} is in state ${serviceState}`);
+    };
+    if (maxWaitSeconds < 5) {
+        maxWaitSeconds = 5;
+    }
+    const maxRetries = Math.floor(maxWaitSeconds / 5);
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            await checkState();
+            return;
+        }
+        catch (error) {
+            if (attempt === maxRetries - 1) {
+                throw error;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 5000));
+        }
+    }
+}
+//# sourceMappingURL=service.js.map

package/lib/clickhouse/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/clickhouse/service.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/account-api-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-api-token.d.ts","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,EAAE,CAAC,mBAAmB,GAAG,0BAA0B,CAAC,EAAE,CAAC;IAEvE;;OAEG;IACH,SAAS,EAAE;SACR,GAAG,IAAI,sBAAsB,CAAC,CAAC,EAAE,MAAM;KACzC,CAAC;CACH;AAED;;GAEG;AACH,KAAK,sBAAsB,GACvB,+BAA+B,GAC/B,iCAAiC,MAAM,EAAE,GACzC,4BAA4B,GAC5B,8BAA8B,MAAM,EAAE,GAEtC,mCAAmC,MAAM,EAAE,GAE3C,2BAA2B,MAAM,EAAE,GACnC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAEd;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AA4BD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,MAC1B,MAAM,SACH,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CA0J5B,CAAC"}
+{"version":3,"file":"account-api-token.d.ts","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,EAAE,CAAC,mBAAmB,GAAG,0BAA0B,CAAC,EAAE,CAAC;IAEvE;;OAEG;IACH,SAAS,EAAE;SACR,GAAG,IAAI,sBAAsB,CAAC,CAAC,EAAE,MAAM;KACzC,CAAC;CACH;AAED;;GAEG;AACH,KAAK,sBAAsB,GACvB,+BAA+B,GAC/B,iCAAiC,MAAM,EAAE,GACzC,4BAA4B,GAC5B,8BAA8B,MAAM,EAAE,GAEtC,mCAAmC,MAAM,EAAE,GAE3C,2BAA2B,MAAM,EAAE,GACnC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAEd;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AA4BD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,MAC1B,MAAM,SACH,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CAuJ5B,CAAC"}

package/lib/cloudflare/account-api-token.js

@@ -91,7 +91,7 @@ export const AccountApiToken = Resource("cloudflare::AccountApiToken", async fun
         // Return destroyed state
         return this.destroy();
     }
-    const permissionGroups = await PermissionGroups("cloudflare-permission-groups", props);
+    const permissionGroups = await PermissionGroups(props);
     // Transform our properties to API format
     const apiPayload = {
         name: tokenName,

package/lib/cloudflare/account-api-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-api-token.js","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account-api-token.js","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/bucket-object.d.ts

@@ -1,3 +1,4 @@
+import type { R2PutOptions } from "@cloudflare/workers-types/experimental/index.ts";
 import type { Context } from "../context.ts";
 import { type CloudflareApiOptions } from "./api.ts";
 import { type PutObjectObject, type R2Bucket } from "./bucket.ts";
@@ -19,6 +20,10 @@ export interface R2ObjectProps extends CloudflareApiOptions {
      * Supports various data types including streams, buffers, strings, and blobs
      */
     content: PutObjectObject;
+    /**
+     * The options to use for the object
+     */
+    options?: Pick<R2PutOptions, "httpMetadata">;
 }
 /**
  * Output returned after R2 Object creation/update

package/lib/cloudflare/bucket-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bucket-object.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,oBAAoB;IACzD;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,OAAO,EAAE,eAAe,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,eAAO,MAAM,QAAQ,yFAGX,OAAO,CAAC,QAAQ,CAAC,MACnB,MAAM,SACH,aAAa,KACnB,OAAO,CAAC,QAAQ,CAAC,CAuBrB,CAAC"}
+{"version":3,"file":"bucket-object.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AACpF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,oBAAoB;IACzD;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,OAAO,EAAE,eAAe,CAAC;IAEzB;;OAEG;IACH,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,eAAO,MAAM,QAAQ,yFAGX,OAAO,CAAC,QAAQ,CAAC,MACnB,MAAM,SACH,aAAa,KACnB,OAAO,CAAC,QAAQ,CAAC,CA2BrB,CAAC"}

package/lib/cloudflare/bucket-object.js

@@ -56,7 +56,7 @@ export const R2Object = Resource("cloudflare::R2Object", async function (id, pro
             this.replace();
         }
         // Create or update the object in the bucket
-        const response = await props.bucket.put(props.key, props.content);
+        const response = await props.bucket.put(props.key, props.content, props.options);
         return {
             id,
             key: props.key,

package/lib/cloudflare/bucket-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"bucket-object.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAA6B,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAuC,MAAM,aAAa,CAAC;AA4ChF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAC9B,sBAAsB,EACtB,KAAK,WAEH,EAAU,EACV,KAAoB;IAEpB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC7C,oCAAoC;QACpC,MAAM,YAAY,CAAC,GAAG,EAAE;YACtB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YAC7B,GAAG,EAAE,KAAK,CAAC,GAAG;SACf,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAElE,OAAO;YACL,EAAE;YACF,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC;IACJ,CAAC;AACH,CAAC,CACF,CAAC"}
+{"version":3,"file":"bucket-object.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAA6B,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAuC,MAAM,aAAa,CAAC;AAiDhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAC9B,sBAAsB,EACtB,KAAK,WAEH,EAAU,EACV,KAAoB;IAEpB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC7C,oCAAoC;QACpC,MAAM,YAAY,CAAC,GAAG,EAAE;YACtB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YAC7B,GAAG,EAAE,KAAK,CAAC,GAAG;SACf,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CACrC,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,OAAO,CACd,CAAC;QAEF,OAAO;YACL,EAAE;YACF,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC;IACJ,CAAC;AACH,CAAC,CACF,CAAC"}