dcl-ops-lib 5.26.4 → 6.0.2

package/README.md

@@ -2,5 +2,6 @@
 
 Used to compile pulumi projects
 
+
 # License
-Published under Apache-2.0
+Published under Apache-2.0

package/StaticWebsite.d.ts

@@ -1,5 +1,5 @@
 import { Input } from "@pulumi/pulumi";
-export declare type StaticWebsite = {
+export type StaticWebsite = {
     domain: string;
     certificateArn?: string;
     additionalDomains?: string[];

package/acceptAlb.d.ts

@@ -1,10 +1,4 @@
-import * as awsx from "@pulumi/awsx";
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlb instead */
-export declare const acceptAlbSecurityGroup: () => Promise<awsx.ec2.SecurityGroup>;
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlb instead */
-export declare function acceptAlbSecurityGroupId(): Promise<import("@pulumi/pulumi").Output<string>>;
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlbV2 */
-export declare function makeSecurityGroupAccessibleFromSharedAlb(securityGroup: awsx.ec2.SecurityGroup): void;
-/** @deprecated Makes a given securityGropup accesible by the shared supra ALB */
-export declare function makeSecurityGroupAccessibleFromSharedAlbV2(securityGroup: awsx.ec2.SecurityGroup, ruleName?: string): void;
-export default acceptAlbSecurityGroup;
+import * as aws from "@pulumi/aws";
+/** Makes a given securityGropup accesible by the shared supra ALB */
+export declare function makeSecurityGroupAccessibleFromSharedAlb(securityGroup: aws.ec2.SecurityGroup, ruleName?: string): void;
+export default makeSecurityGroupAccessibleFromSharedAlb;

package/acceptAlb.js

@@ -1,46 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSecurityGroupAccessibleFromSharedAlbV2 = exports.makeSecurityGroupAccessibleFromSharedAlb = exports.acceptAlbSecurityGroupId = exports.acceptAlbSecurityGroup = void 0;
-const awsx = require("@pulumi/awsx");
+exports.makeSecurityGroupAccessibleFromSharedAlb = void 0;
 const aws = require("@pulumi/aws");
 const utils_1 = require("./utils");
 const values_1 = require("./values");
-const withCache_1 = require("./withCache");
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlb instead */
-exports.acceptAlbSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
-    const config = yield (0, values_1.getEnvConfiguration)();
-    return awsx.ec2.SecurityGroup.fromExistingId(`accept-alb-sg-reference`, config.acceptAlb);
-}));
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlb instead */
-function acceptAlbSecurityGroupId() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.acceptAlbSecurityGroup)()).id;
-    });
-}
-exports.acceptAlbSecurityGroupId = acceptAlbSecurityGroupId;
-/** @deprecated use makeSecurityGroupAccessibleFromSharedAlbV2 */
-function makeSecurityGroupAccessibleFromSharedAlb(securityGroup) {
-    new awsx.ec2.IngressSecurityGroupRule("accept-alb-ingress-rule", securityGroup, {
-        sourceSecurityGroupId: (0, values_1.getEnvConfiguration)().then(($) => $.albSecurityGroupId),
-        description: `Allow access from the supra ALB`,
-        fromPort: 0,
-        toPort: 0,
-        protocol: "-1",
-    });
-}
-exports.makeSecurityGroupAccessibleFromSharedAlb = makeSecurityGroupAccessibleFromSharedAlb;
-/** @deprecated Makes a given securityGropup accesible by the shared supra ALB */
-function makeSecurityGroupAccessibleFromSharedAlbV2(securityGroup, ruleName = "") {
-    new aws.ec2.SecurityGroupRule((0, utils_1.withRuleName)("accept-alb-ingress-rule-v2", ruleName), {
+/** Makes a given securityGropup accesible by the shared supra ALB */
+function makeSecurityGroupAccessibleFromSharedAlb(securityGroup, ruleName = "") {
+    new aws.ec2.SecurityGroupRule((0, utils_1.withRuleName)("accept-alb-ingress-rule", ruleName), {
         securityGroupId: securityGroup.id,
         sourceSecurityGroupId: (0, values_1.getEnvConfiguration)().then(($) => $.albSecurityGroupId),
         description: `Allow access from the supra ALB`,
@@ -50,6 +16,6 @@ function makeSecurityGroupAccessibleFromSharedAlbV2(securityGroup, ruleName = ""
         type: "egress",
     }, { deleteBeforeReplace: true });
 }
-exports.makeSecurityGroupAccessibleFromSharedAlbV2 = makeSecurityGroupAccessibleFromSharedAlbV2;
-exports.default = exports.acceptAlbSecurityGroup;
+exports.makeSecurityGroupAccessibleFromSharedAlb = makeSecurityGroupAccessibleFromSharedAlb;
+exports.default = makeSecurityGroupAccessibleFromSharedAlb;
 //# sourceMappingURL=acceptAlb.js.map

package/acceptBastion.d.ts

@@ -1,9 +1,3 @@
-import * as awsx from "@pulumi/awsx";
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-export declare const acceptBastionSecurityGroup: () => Promise<awsx.ec2.SecurityGroup>;
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-export declare function acceptBastionSecurityGroupId(): Promise<import("@pulumi/pulumi").Output<string>>;
-/** @deprecated use makeSecurityGroupAccessibleFromBastionV2 */
-export declare function makeSecurityGroupAccessibleFromBastion(securityGroup: awsx.ec2.SecurityGroup): void;
-export declare function makeSecurityGroupAccessibleFromBastionV2(securityGroup: awsx.ec2.SecurityGroup, ruleName?: string): void;
-export default acceptBastionSecurityGroup;
+import * as aws from "@pulumi/aws";
+export declare function makeSecurityGroupAccessibleFromBastion(securityGroup: aws.ec2.SecurityGroup, ruleName?: string): void;
+export default makeSecurityGroupAccessibleFromBastion;

package/acceptBastion.js

@@ -9,41 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSecurityGroupAccessibleFromBastionV2 = exports.makeSecurityGroupAccessibleFromBastion = exports.acceptBastionSecurityGroupId = exports.acceptBastionSecurityGroup = void 0;
-const awsx = require("@pulumi/awsx");
+exports.makeSecurityGroupAccessibleFromBastion = void 0;
 const aws = require("@pulumi/aws");
 const values_1 = require("./values");
 const withCache_1 = require("./withCache");
 const utils_1 = require("./utils");
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-exports.acceptBastionSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
-    const config = yield (0, values_1.getEnvConfiguration)();
-    return awsx.ec2.SecurityGroup.fromExistingId(`accept-bastion-sg-reference`, config.acceptBastion);
-}));
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-function acceptBastionSecurityGroupId() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.acceptBastionSecurityGroup)()).id;
-    });
-}
-exports.acceptBastionSecurityGroupId = acceptBastionSecurityGroupId;
 const bastionSecurityGroupId = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = yield (0, values_1.getEnvConfiguration)();
     return config.bastionSecurityGroupId;
 }));
-/** @deprecated use makeSecurityGroupAccessibleFromBastionV2 */
-function makeSecurityGroupAccessibleFromBastion(securityGroup) {
-    new aws.ec2.SecurityGroupRule("accesible-from-bastion", {
-        securityGroupId: securityGroup.id,
-        sourceSecurityGroupId: bastionSecurityGroupId(),
-        fromPort: -1,
-        toPort: -1,
-        type: "ingress",
-        protocol: "-1",
-    }, { deleteBeforeReplace: true });
-}
-exports.makeSecurityGroupAccessibleFromBastion = makeSecurityGroupAccessibleFromBastion;
-function makeSecurityGroupAccessibleFromBastionV2(securityGroup, ruleName = "") {
+function makeSecurityGroupAccessibleFromBastion(securityGroup, ruleName = "") {
     new aws.ec2.SecurityGroupRule((0, utils_1.withRuleName)("accesible-from-bastion-v2", ruleName), {
         securityGroupId: securityGroup.id,
         sourceSecurityGroupId: bastionSecurityGroupId(),
@@ -53,6 +28,6 @@ function makeSecurityGroupAccessibleFromBastionV2(securityGroup, ruleName = "")
         protocol: "-1",
     }, { deleteBeforeReplace: true });
 }
-exports.makeSecurityGroupAccessibleFromBastionV2 = makeSecurityGroupAccessibleFromBastionV2;
-exports.default = exports.acceptBastionSecurityGroup;
+exports.makeSecurityGroupAccessibleFromBastion = makeSecurityGroupAccessibleFromBastion;
+exports.default = makeSecurityGroupAccessibleFromBastion;
 //# sourceMappingURL=acceptBastion.js.map

package/acceptDb.d.ts

@@ -1,4 +1,4 @@
-import * as awsx from "@pulumi/awsx";
-export declare const acceptDbSecurityGroup: () => Promise<awsx.ec2.SecurityGroup>;
-export declare function acceptDbSecurityGroupId(): Promise<import("@pulumi/pulumi").Output<string>>;
+import * as aws from "@pulumi/aws";
+export declare const acceptDbSecurityGroup: () => Promise<aws.ec2.GetSecurityGroupResult>;
+export declare const acceptDbSecurityGroupId: () => Promise<string>;
 export default acceptDbSecurityGroup;

package/acceptDb.js

@@ -10,18 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.acceptDbSecurityGroupId = exports.acceptDbSecurityGroup = void 0;
-const awsx = require("@pulumi/awsx");
+const aws = require("@pulumi/aws");
 const values_1 = require("./values");
 const withCache_1 = require("./withCache");
 exports.acceptDbSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = yield (0, values_1.getEnvConfiguration)();
-    return awsx.ec2.SecurityGroup.fromExistingId(`accept-db-sg-reference`, config.dbSecurity);
+    return aws.ec2.getSecurityGroup({ id: config.dbSecurity });
+}));
+exports.acceptDbSecurityGroupId = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
+    const config = yield (0, values_1.getEnvConfiguration)();
+    return config.dbSecurity;
 }));
-function acceptDbSecurityGroupId() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.acceptDbSecurityGroup)()).id;
-    });
-}
-exports.acceptDbSecurityGroupId = acceptDbSecurityGroupId;
 exports.default = exports.acceptDbSecurityGroup;
 //# sourceMappingURL=acceptDb.js.map

package/accessTheInternet.d.ts

@@ -1,16 +1,5 @@
-import * as awsx from "@pulumi/awsx";
-/** @deprecated please use makeSecurityGroupAccessibleByCloudflare */
-export declare const accessCloudflareSecurityGroup: () => Promise<awsx.ec2.SecurityGroup>;
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-export declare const accessTheInternetSecurityGroup: () => Promise<awsx.ec2.SecurityGroup>;
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-export declare function accessTheInternetSecurityGroupId(): Promise<import("@pulumi/pulumi").Output<string>>;
-export default accessTheInternetSecurityGroup;
-/** @deprecated please use makeSecurityGroupAccessibleByCloudflare */
-export declare function accessFromCloudflareSecurityGroup(): Promise<import("@pulumi/pulumi").Output<string>>;
-/** @deprecated use makeSecurityGroupAccessTheInternetV2 */
-export declare function makeSecurityGroupAccessTheInternet(securityGroup: awsx.ec2.SecurityGroup): void;
+import * as aws from "@pulumi/aws";
 /** Enables egress traffic to 0.0.0.0/0/all */
-export declare function makeSecurityGroupAccessTheInternetV2(securityGroup: awsx.ec2.SecurityGroup, ruleName?: string): void;
+export declare function makeSecurityGroupAccessTheInternetV2(securityGroup: aws.ec2.SecurityGroup, ruleName?: string): void;
 /** Enables ingress traffic from cloudflare CIDRs */
-export declare function makeSecurityGroupAccessibleByCloudflare(securityGroup: awsx.ec2.SecurityGroup): Promise<void>;
+export declare function makeSecurityGroupAccessibleByCloudflare(securityGroup: aws.ec2.SecurityGroup): Promise<void>;

package/accessTheInternet.js

@@ -9,49 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSecurityGroupAccessibleByCloudflare = exports.makeSecurityGroupAccessTheInternetV2 = exports.makeSecurityGroupAccessTheInternet = exports.accessFromCloudflareSecurityGroup = exports.accessTheInternetSecurityGroupId = exports.accessTheInternetSecurityGroup = exports.accessCloudflareSecurityGroup = void 0;
-const awsx = require("@pulumi/awsx");
+exports.makeSecurityGroupAccessibleByCloudflare = exports.makeSecurityGroupAccessTheInternetV2 = void 0;
 const aws = require("@pulumi/aws");
 const cloudflare = require("@pulumi/cloudflare");
-const supra_1 = require("./supra");
-const values_1 = require("./values");
-const withCache_1 = require("./withCache");
 const utils_1 = require("./utils");
-/** @deprecated please use makeSecurityGroupAccessibleByCloudflare */
-exports.accessCloudflareSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
-    const config = yield (0, values_1.getEnvConfiguration)(); // ?
-    return awsx.ec2.SecurityGroup.fromExistingId(`accept-cloudflare-web-sg-reference`, supra_1.supra.getOutputValue(`cloudflareAcceptWeb`));
-}));
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-exports.accessTheInternetSecurityGroup = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
-    const config = yield (0, values_1.getEnvConfiguration)(); // ?
-    return awsx.ec2.SecurityGroup.fromExistingId(`access-the-internet-sg-reference`, supra_1.supra.getOutputValue(`accessTheInternet`));
-}));
-/** @deprecated please use makeSecurityGroupAccessTheInternet */
-function accessTheInternetSecurityGroupId() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.accessTheInternetSecurityGroup)()).id;
-    });
-}
-exports.accessTheInternetSecurityGroupId = accessTheInternetSecurityGroupId;
-exports.default = exports.accessTheInternetSecurityGroup;
-/** @deprecated please use makeSecurityGroupAccessibleByCloudflare */
-function accessFromCloudflareSecurityGroup() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield (0, exports.accessCloudflareSecurityGroup)()).id;
-    });
-}
-exports.accessFromCloudflareSecurityGroup = accessFromCloudflareSecurityGroup;
-/** @deprecated use makeSecurityGroupAccessTheInternetV2 */
-function makeSecurityGroupAccessTheInternet(securityGroup) {
-    securityGroup.createEgressRule("access-the-internet", {
-        cidrBlocks: ["0.0.0.0/0"],
-        fromPort: -1,
-        toPort: -1,
-        protocol: "-1",
-    });
-}
-exports.makeSecurityGroupAccessTheInternet = makeSecurityGroupAccessTheInternet;
 /** Enables egress traffic to 0.0.0.0/0/all */
 function makeSecurityGroupAccessTheInternetV2(securityGroup, ruleName = "") {
     new aws.ec2.SecurityGroupRule((0, utils_1.withRuleName)("access-the-internet-v2", ruleName), {
@@ -70,20 +31,24 @@ function makeSecurityGroupAccessibleByCloudflare(securityGroup) {
         const ips = yield cloudflare.getIpRanges({});
         for (let block of ips.ipv4CidrBlocks) {
             const hash = (0, utils_1.sha256hash)(block).substring(0, 6);
-            securityGroup.createIngressRule(`accept-cf-80-${hash}`, {
+            new aws.ec2.SecurityGroupRule(`accept-cf-80-${hash}`, {
                 protocol: "tcp",
                 fromPort: 80,
                 toPort: 80,
                 cidrBlocks: [block],
+                type: "ingress",
+                securityGroupId: securityGroup.id,
                 description: `pulumi-supra-${hash}`,
-            });
-            securityGroup.createIngressRule(`accept-cf-443-${hash}`, {
+            }, { deleteBeforeReplace: true });
+            new aws.ec2.SecurityGroupRule(`accept-cf-443-${hash}`, {
                 protocol: "tcp",
                 fromPort: 443,
                 toPort: 443,
                 cidrBlocks: [block],
+                type: "ingress",
+                securityGroupId: securityGroup.id,
                 description: `pulumi-supra-${hash}`,
-            });
+            }, { deleteBeforeReplace: true });
         }
     });
 }

package/alb.d.ts

@@ -1,6 +1,5 @@
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/awsx";
-export declare type ElbValues = {
+export type ElbValues = {
     dns: string;
     elbArn: string;
     elbUrn: string;
@@ -9,6 +8,6 @@ export declare type ElbValues = {
 };
 export declare const getAlb: () => Promise<{
     dns: string;
-    alb: awsx.elasticloadbalancingv2.ApplicationLoadBalancer;
+    alb: aws.lb.GetLoadBalancerResult;
     listener: aws.lb.GetListenerResult;
 }>;

package/alb.js

@@ -11,8 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlb = void 0;
 const aws = require("@pulumi/aws");
-const awsx = require("@pulumi/awsx");
-const domain_1 = require("./domain");
 const supra_1 = require("./supra");
 const withCache_1 = require("./withCache");
 const cache = {
@@ -25,9 +23,9 @@ const cache = {
 };
 exports.getAlb = (0, withCache_1.default)(() => __awaiter(void 0, void 0, void 0, function* () {
     const dns = yield supra_1.supra.getOutputValue("dns");
-    const loadBalancer = yield supra_1.supra.getOutputValue("albInstance");
+    const loadBalancer = yield supra_1.supra.getOutputDetails("albInstance");
     const elbValues = yield supra_1.supra.getOutputValue("elbValues");
-    const alb = new awsx.lb.ApplicationLoadBalancer(`${domain_1.env}-alb-all`, { loadBalancer });
+    const alb = yield aws.lb.getLoadBalancer({ arn: JSON.parse(loadBalancer.value).arn });
     const listener = yield aws.lb.getListener({ arn: elbValues.listenerArn });
     return { dns, alb, listener };
 }));

package/cloudflare.d.ts

@@ -1,12 +1,12 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as cloudflare from "@pulumi/cloudflare";
-export declare type DeployWorkerConfig = {
+export type DeployWorkerConfig = {
     jsWorkerFileName: string;
     routes: pulumi.Input<string>[];
     env?: Record<string, pulumi.Input<string>>;
     overrides?: cloudflare.WorkerScriptArgs;
 };
-export declare type SetRecordConfig = {
+export type SetRecordConfig = {
     recordName: string;
     type: "CNAME" | "A" | "TXT";
     value: pulumi.Input<string>;
@@ -17,8 +17,9 @@ export declare type SetRecordConfig = {
     proxied: true;
 });
 export declare function getZoneId(): Promise<string>;
+export declare function getAccountId(): string;
 export declare function deployWorker(workerName: string, config: DeployWorkerConfig): Promise<{
-    [x: string]: pulumi.Output<string> | cloudflare.WorkerScript;
-    worker: cloudflare.WorkerScript;
+    [x: string]: pulumi.Output<string> | import("@pulumi/cloudflare/workerScript").WorkerScript;
+    worker: import("@pulumi/cloudflare/workerScript").WorkerScript;
 }>;
-export declare function setRecord(config: SetRecordConfig): Promise<cloudflare.Record>;
+export declare function setRecord(config: SetRecordConfig): Promise<import("@pulumi/cloudflare/record").Record>;

package/cloudflare.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRecord = exports.deployWorker = exports.getZoneId = void 0;
+exports.setRecord = exports.deployWorker = exports.getAccountId = exports.getZoneId = void 0;
 const pulumi = require("@pulumi/pulumi");
 const cloudflare = require("@pulumi/cloudflare");
 const domain_1 = require("./domain");
@@ -23,6 +23,15 @@ function getZoneId() {
     });
 }
 exports.getZoneId = getZoneId;
+function getAccountId() {
+    if (process.env.CLOUDFLARE_ACCOUNT_ID) {
+        return process.env.CLOUDFLARE_ACCOUNT_ID;
+    }
+    else {
+        throw new Error("CLOUDFLARE_ACCOUNT_ID not set");
+    }
+}
+exports.getAccountId = getAccountId;
 function deployWorker(workerName, config) {
     return __awaiter(this, void 0, void 0, function* () {
         // get file contents
@@ -34,7 +43,7 @@ function deployWorker(workerName, config) {
         });
         // create the worker
         const worker = new cloudflare.WorkerScript(`${workerName}-${domain_1.publicTLD}`, Object.assign({ name: `${workerName}-${domain_1.publicTLD}`, content,
-            plainTextBindings }, (config.overrides || {})));
+            plainTextBindings, accountId: getAccountId() }, (config.overrides || {})));
         const ret = { [workerName + "-" + domain_1.publicTLD]: worker.id, worker };
         // create the routes
         let count = 0;

package/createBucketWithUser.d.ts

@@ -1,8 +1,7 @@
-import * as aws from "@pulumi/aws";
 import { BucketArgs } from "@pulumi/aws/s3/bucket";
 import * as pulumi from "@pulumi/pulumi";
 export declare function createBucketWithUser(name: string, bucketArgs?: BucketArgs): {
-    role: aws.iam.Role;
+    role: import("@pulumi/aws/iam/role").Role;
     user: pulumi.Output<string>;
     bucket: pulumi.Output<string>;
     bucketPolicyId: pulumi.Output<string>;

package/createFargateTask.d.ts

@@ -1,28 +1,26 @@
 import * as aws from "@pulumi/aws";
-import * as awsx from "@pulumi/awsx";
-import { ApplicationTargetGroupHealthCheck } from "@pulumi/awsx/lb";
 import * as pulumi from "@pulumi/pulumi";
 import { ExtraExposedServiceOptions } from "./exposePublicService";
-export declare const getDefaultLogs: (serviceName: string, logGroup: aws.cloudwatch.LogGroup) => pulumi.Output<aws.ecs.LogConfiguration>;
-export declare function getClusterInstance(cluster: string | awsx.ecs.Cluster | undefined): awsx.ecs.Cluster;
-export declare type ALBMapping = {
+export declare const getDefaultLogs: (serviceName: string, logGroup: aws.cloudwatch.LogGroup) => aws.ecs.LogConfiguration;
+export declare function getClusterInstance(cluster: string | aws.ecs.Cluster | undefined): Promise<pulumi.Output<string> | string>;
+export type ALBMapping = {
     domain: string;
     dockerListeningPort: number;
-    healthCheck?: Partial<ApplicationTargetGroupHealthCheck>;
+    healthCheck?: Partial<aws.types.input.alb.TargetGroupHealthCheck>;
     extraExposedServiceOptions?: ExtraExposedServiceOptions;
 };
 export declare function getFargateExecutionRole(name: string, policyArnNamedMap: Record<string, pulumi.Input<string> | aws.iam.Policy>): {
-    role: aws.iam.Role;
-    policies: aws.iam.RolePolicyAttachment[];
+    role: import("@pulumi/aws/iam/role").Role;
+    policies: import("@pulumi/aws/iam/rolePolicyAttachment").RolePolicyAttachment[];
 };
 export declare function getFargateTaskRole(name: string, policyArnNamedMap: Record<string, pulumi.Input<string> | aws.iam.Policy>): {
-    role: aws.iam.Role;
-    policies: aws.iam.RolePolicyAttachment[];
+    role: import("@pulumi/aws/iam/role").Role;
+    policies: import("@pulumi/aws/iam/rolePolicyAttachment").RolePolicyAttachment[];
 };
-export declare type FargateTaskOptions = {
+export type FargateTaskOptions = {
     securityGroups?: (string | pulumi.Output<string>)[];
-    cluster?: awsx.ecs.Cluster | string;
-    healthCheck?: Partial<ApplicationTargetGroupHealthCheck>;
+    cluster?: aws.ecs.Cluster | string;
+    healthCheck?: Partial<aws.types.input.alb.TargetGroupHealthCheck>;
     desiredCount?: number;
     memoryReservation?: number;
     cpuReservation?: number;
@@ -38,7 +36,7 @@ export declare type FargateTaskOptions = {
     extraALBMappings?: ALBMapping[];
     executionRolePolicies?: Record<string, pulumi.Input<string> | aws.iam.Policy>;
     taskRolePolicies?: Record<string, pulumi.Input<string> | aws.iam.Policy>;
-    secrets?: aws.ecs.Secret[] | pulumi.Input<aws.ecs.Secret[]>;
+    secrets?: aws.ecs.Secret[];
     ignoreServiceDiscovery?: boolean;
     team: "dapps" | "platform" | "data" | "marketing" | "infra";
     metrics?: {
@@ -50,8 +48,8 @@ export declare type FargateTaskOptions = {
     dependsOn?: pulumi.Resource[];
     volumes?: aws.types.input.ecs.TaskDefinitionVolume[] | pulumi.Input<aws.types.input.ecs.TaskDefinitionVolume[]>;
     deregistrationDelay?: pulumi.Input<number>;
-    mountPoints?: pulumi.Input<aws.ecs.MountPoint[]>;
-    repositoryCredentials?: pulumi.Input<aws.ecs.RepositoryCredentials>;
+    mountPoints?: aws.ecs.MountPoint[];
+    repositoryCredentials?: aws.ecs.RepositoryCredentials;
 };
 /**
  *
@@ -65,38 +63,38 @@ export declare type FargateTaskOptions = {
  * @param options.healthCheckPath
  * @param options.policyArnNamedMap key-value named map of policies to attach to the default execution role for this task
  */
-export declare function createFargateTask(serviceName: string, dockerImage: string | Promise<string> | pulumi.OutputInstance<string> | awsx.ecs.ContainerImageProvider, dockerListeningPort: number, environment: {
+export declare function createFargateTask(serviceName: string, dockerImage: string | Promise<string> | pulumi.OutputInstance<string>, dockerListeningPort: number, environment: {
     name: string;
     value: pulumi.Input<string>;
     secret?: boolean;
 }[], hostname: string, options: FargateTaskOptions): Promise<{
-    service: awsx.ecs.FargateService;
+    service: import("@pulumi/aws/ecs/service").Service;
     endpoint: string;
     exposed?: undefined;
 } | {
     endpoint: string;
-    service: awsx.ecs.FargateService;
+    service: import("@pulumi/aws/ecs/service").Service;
     exposed: {
         domain: string;
         certificate: pulumi.Input<string>;
-        record: void | aws.route53.Record;
-        targetGroup: awsx.elasticloadbalancingv2.ApplicationTargetGroup;
-        cloudflareRecord: void | import("@pulumi/cloudflare").Record;
+        record: import("@pulumi/aws/route53/record").Record | undefined;
+        targetGroup: import("@pulumi/aws/alb/targetGroup").TargetGroup;
+        cloudflareRecord: import("@pulumi/cloudflare/record").Record | undefined;
     };
 }>;
-export declare type InternalServiceOptions = {
+export type InternalServiceOptions = {
     serviceName: string;
-    cluster?: string | awsx.ecs.Cluster;
-    securityGroups?: awsx.ec2.SecurityGroupOrId[];
+    cluster?: string | aws.ecs.Cluster;
+    securityGroups?: (string | pulumi.Output<string>)[];
     ignoreServiceDiscovery?: boolean;
     serviceDiscoveryPort?: number;
     desiredCount?: number;
     executionRole?: aws.iam.Role;
     taskRole?: aws.iam.Role;
-    containerInfo: awsx.ecs.Container;
+    containerInfo: aws.ecs.ContainerDefinition;
     assignPublicIp?: boolean;
     dependsOn?: pulumi.Resource[];
     volumes?: pulumi.Input<aws.types.input.ecs.TaskDefinitionVolume[]>;
     team: string;
 };
-export declare function createInternalService(config: InternalServiceOptions): Promise<awsx.ecs.FargateService>;
+export declare function createInternalService(config: InternalServiceOptions): Promise<import("@pulumi/aws/ecs/service").Service>;