@fjall/components-infrastructure 0.1.34 → 0.1.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/patterns/aws/basicApp.d.ts +1 -1
- package/dist/lib/patterns/aws/basicApp.js +2 -2
- package/dist/lib/patterns/aws/freeTierApp.d.ts +1 -1
- package/dist/lib/patterns/aws/freeTierApp.js +2 -2
- package/dist/lib/patterns/aws/spotInstanceApp.d.ts +1 -1
- package/dist/lib/patterns/aws/spotInstanceApp.js +2 -2
- package/dist/lib/resources/aws/{awsStack.d.ts → base/awsStack.d.ts} +2 -1
- package/dist/lib/resources/aws/base/awsStack.js +98 -0
- package/dist/lib/resources/aws/base/index.d.ts +1 -0
- package/dist/lib/resources/aws/base/index.js +18 -0
- package/dist/lib/resources/aws/compute/ecs.d.ts +1 -1
- package/dist/lib/resources/aws/compute/ecs.js +1 -1
- package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +1 -1
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +1 -1
- package/dist/lib/resources/aws/compute/ecsSpot.d.ts +1 -1
- package/dist/lib/resources/aws/compute/ecsSpot.js +1 -1
- package/dist/lib/resources/aws/database/database.d.ts +1 -1
- package/dist/lib/resources/aws/database/database.js +1 -1
- package/dist/lib/resources/aws/database/databaseFreeTier.d.ts +1 -1
- package/dist/lib/resources/aws/database/databaseFreeTier.js +1 -1
- package/dist/lib/resources/aws/database/databaseInstance.d.ts +1 -1
- package/dist/lib/resources/aws/database/databaseInstance.js +1 -1
- package/dist/lib/resources/aws/database/rdsInstance.d.ts +1 -1
- package/dist/lib/resources/aws/database/rdsInstance.js +1 -1
- package/dist/lib/resources/aws/index.d.ts +1 -1
- package/dist/lib/resources/aws/index.js +2 -2
- package/dist/lib/resources/aws/networking/vpc.d.ts +1 -1
- package/dist/lib/resources/aws/networking/vpc.js +1 -1
- package/dist/lib/resources/aws/secrets/secret.d.ts +1 -1
- package/dist/lib/resources/aws/secrets/secret.js +1 -1
- package/dist/lib/resources/aws/storage/ecr.d.ts +1 -1
- package/dist/lib/resources/aws/storage/ecr.js +1 -1
- package/package.json +2 -2
- package/dist/lib/resources/aws/awsStack.js +0 -96
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Construct } from "constructs";
|
|
2
2
|
import * as ec2 from "aws-cdk-lib/aws-ec2";
|
|
3
|
-
import { StackBuilder } from "../awsStack";
|
|
3
|
+
import { StackBuilder } from "../base/awsStack";
|
|
4
4
|
import { KeyValue } from "../../../types";
|
|
5
5
|
interface VpcProps extends ec2.VpcProps {
|
|
6
6
|
region?: string;
|
|
@@ -67,4 +67,4 @@ class Vpc extends ec2.Vpc {
|
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
exports.Vpc = Vpc;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3MvbmV0d29ya2luZy92cGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQXlEO0FBQ3pELDJDQUEyQztBQUczQyxrREFBK0M7QUFXL0MsTUFBYSxHQUFJLFNBQVEsR0FBRyxDQUFDLEdBQUc7SUFDOUIsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQjtRQUN4RCxLQUFLLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7WUFDeEIsR0FBRyxLQUFLO1lBQ1IsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3BCLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUM7WUFDL0MsUUFBUSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7WUFDeEMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDO1lBQ3ZCLHFFQUFxRTtZQUNyRSxrQkFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLEVBQUUsS0FBSyxFQUFFLFNBQVMsSUFBSSxRQUFRLENBQUMsQ0FBQztRQUMzRSxDQUFDO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxLQUFnQjtRQUN2QyxPQUFPLG1CQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZ0I7UUFDNUQsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFFakQsT0FBTztZQUNMLENBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQyxFQUFFO2dCQUNwQixXQUFXLEVBQUUsR0FBRyxDQUFDLGtCQUFrQixDQUFDLGdCQUFnQixDQUNsRCxJQUFJLG1CQUFRLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxjQUFjLEVBQUU7b0JBQ3ZDLFlBQVksRUFBRSxxQkFBcUIsRUFBRSxHQUFHO29CQUN4QyxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxPQUFPO2lCQUNyQyxDQUFDLENBQ0g7YUFDRjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQjtRQUMvRCxJQUFJLENBQUMsS0FBSyxFQUFFLFNBQVMsSUFBSSxDQUFDLEtBQUssRUFBRSxjQUFjLEVBQUUsQ0FBQztZQUNoRCxPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTyxHQUFHLENBQUMsV0FBVyxDQUFDLGlCQUFpQixDQUFDO1lBQ3ZDLGNBQWMsRUFBRSxLQUFLLENBQUMsY0FBYztZQUNwQyxpQkFBaUIsRUFBRSxFQUFFO1lBQ3JCLDhCQUE4QixFQUFFLEVBQUU7U0FDbkMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBVSxFQUFFLEtBQWdCO1FBQ3ZDLE9BQU8sQ0FBQyxFQUFnQixFQUFFLEVBQUU7WUFDMUIsT0FBTyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzVDLENBQUMsQ0FBQztJQUNKLENBQUM7SUFDRDs7Ozs7Ozs7O09BU0c7SUFDSCxNQUFNLENBQUMsTUFBTSxDQUNYLEVBQVUsRUFDVixZQUFvQjtRQUVwQixPQUFPLENBQUMsRUFBZ0IsRUFBRSxFQUFFO1lBQzFCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRTtnQkFDM0MsT0FBTyxFQUFFLEdBQUcsWUFBWSxJQUFJLEVBQUUsRUFBRTthQUNqQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF4RUQsa0JBd0VDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IFRhZ3MsIFJlbW92YWxQb2xpY3ksIFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgKiBhcyBlYzIgZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcblxuaW1wb3J0IHsgU3RhY2tCdWlsZGVyIH0gZnJvbSBcIi4uL2Jhc2UvYXdzU3RhY2tcIjtcbmltcG9ydCB7IExvZ0dyb3VwIH0gZnJvbSBcIi4uL2xvZ2dpbmcvbG9nR3JvdXBcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5cbmludGVyZmFjZSBWcGNQcm9wcyBleHRlbmRzIGVjMi5WcGNQcm9wcyB7XG4gIHJlZ2lvbj86IHN0cmluZztcbiAgYWNjb3VudElkPzogc3RyaW5nO1xuICBhdmFpbGFiaWxpdHlab25lcz86IHN0cmluZ1tdO1xuICBpcHY0SXBhbVBvb2xJZD86IHN0cmluZztcbiAgdGFnczogS2V5VmFsdWU7XG59XG5cbmV4cG9ydCBjbGFzcyBWcGMgZXh0ZW5kcyBlYzIuVnBjIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBgdnBjLSR7aWR9YCwge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICB2cGNOYW1lOiBgdnBjLSR7aWR9YCxcbiAgICAgIGF2YWlsYWJpbGl0eVpvbmVzOiBWcGMuYXZhaWxhYmlsaXR5Wm9uZXMoc2NvcGUpLFxuICAgICAgZmxvd0xvZ3M6IFZwYy5mbG93TG9ncyhzY29wZSwgaWQsIHByb3BzKSxcbiAgICAgIGlwQWRkcmVzc2VzOiBWcGMuaXBBZGRyZXNzZXMoc2NvcGUsIGlkLCBwcm9wcylcbiAgICB9KTtcblxuICAgIGlmICghIXByb3BzPy5hY2NvdW50SWQpIHtcbiAgICAgIC8vIFJlcXVpcmVkIGZvciB0aGUgVlBDIHRvIHVzZSB0aGUgSVBBTSBQb29sIHRvIHByb3ZzaW9uIElQIGFkZHJlc3Nlc1xuICAgICAgVGFncy5vZih0aGlzKS5hZGQoXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIiwgcHJvcHM/LmFjY291bnRJZCB8fCBcIm5vUG9vbFwiKTtcbiAgICB9XG4gIH1cblxuICBzdGF0aWMgYXZhaWxhYmlsaXR5Wm9uZXMoc2NvcGU6IENvbnN0cnVjdCkge1xuICAgIHJldHVybiBTdGFjay5vZihzY29wZSkuYXZhaWxhYmlsaXR5Wm9uZXMuc2xpY2UoMCwgMyk7XG4gIH1cblxuICBzdGF0aWMgZmxvd0xvZ3Moc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIGlmICghcHJvcHMgfHwgIXByb3BzLmFjY291bnRJZCkgcmV0dXJuIHVuZGVmaW5lZDtcblxuICAgIHJldHVybiB7XG4gICAgICBbYCR7aWR9VnBjRmxvd0xvZ3NgXToge1xuICAgICAgICBkZXN0aW5hdGlvbjogZWMyLkZsb3dMb2dEZXN0aW5hdGlvbi50b0Nsb3VkV2F0Y2hMb2dzKFxuICAgICAgICAgIG5ldyBMb2dHcm91cChzY29wZSwgYCR7aWR9Rmxvd0xvZ0dyb3VwYCwge1xuICAgICAgICAgICAgbG9nR3JvdXBOYW1lOiBgL3ZwYy9mbG93bG9ncy92cGMtJHtpZH0vYCxcbiAgICAgICAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWVxuICAgICAgICAgIH0pXG4gICAgICAgIClcbiAgICAgIH1cbiAgICB9O1xuICB9XG5cbiAgc3RhdGljIGlwQWRkcmVzc2VzKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzPzogVnBjUHJvcHMpIHtcbiAgICBpZiAoIXByb3BzPy5hY2NvdW50SWQgfHwgIXByb3BzPy5pcHY0SXBhbVBvb2xJZCkge1xuICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICB9XG5cbiAgICByZXR1cm4gZWMyLklwQWRkcmVzc2VzLmF3c0lwYW1BbGxvY2F0aW9uKHtcbiAgICAgIGlwdjRJcGFtUG9vbElkOiBwcm9wcy5pcHY0SXBhbVBvb2xJZCxcbiAgICAgIGlwdjROZXRtYXNrTGVuZ3RoOiAyMCxcbiAgICAgIGRlZmF1bHRTdWJuZXRJcHY0TmV0bWFza0xlbmd0aDogMjNcbiAgICB9KTtcbiAgfVxuXG4gIHN0YXRpYyBidWlsZChpZDogc3RyaW5nLCBwcm9wcz86IFZwY1Byb3BzKTogKHNiOiBTdGFja0J1aWxkZXIpID0+IENvbnN0cnVjdCB7XG4gICAgcmV0dXJuIChzYjogU3RhY2tCdWlsZGVyKSA9PiB7XG4gICAgICByZXR1cm4gbmV3IHRoaXMoc2IuZ2V0U3RhY2soKSwgaWQsIHByb3BzKTtcbiAgICB9O1xuICB9XG4gIC8qKlxuICAgKiBJbXBvcnRzIGEgcHJlLWV4aXN0aW5nIFZQQyBSZXNvdXJjZSBpbnRvIHlvdXIgU3RhY2tcbiAgICpcbiAgICogQmVmb3JlIHVzaW5nIGFuIGltcG9ydCBtZXRob2QgZW5zdXJlIHlvdSBoYXZlIHNldCB0aGUgYWNjb3VudCBhbmQgcmVnaW9uIHByb3BzXG4gICAqICB3aGVuIGNyZWF0aW5nIHlvdXIgQXdzU3RhY2suXG4gICAqXG4gICAqIEBwYXJhbSBpZFxuICAgKiBAcGFyYW0gdnBjU3RhY2tOYW1lXG4gICAqIEByZXR1cm5zXG4gICAqL1xuICBzdGF0aWMgaW1wb3J0KFxuICAgIGlkOiBzdHJpbmcsXG4gICAgdnBjU3RhY2tOYW1lOiBzdHJpbmdcbiAgKTogKHNiOiBTdGFja0J1aWxkZXIpID0+IENvbnN0cnVjdCB7XG4gICAgcmV0dXJuIChzYjogU3RhY2tCdWlsZGVyKSA9PiB7XG4gICAgICByZXR1cm4gZWMyLlZwYy5mcm9tTG9va3VwKHNiLmdldFN0YWNrKCksIGlkLCB7XG4gICAgICAgIHZwY05hbWU6IGAke3ZwY1N0YWNrTmFtZX0vJHtpZH1gXG4gICAgICB9KTtcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SecretValue } from "aws-cdk-lib";
|
|
2
2
|
import { Secret as CdkSecret, SecretStringGenerator } from "aws-cdk-lib/aws-secretsmanager";
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
|
-
import { StackBuilder } from "../awsStack";
|
|
4
|
+
import { StackBuilder } from "../base/awsStack";
|
|
5
5
|
import { CustomerManagedKey } from "./kms";
|
|
6
6
|
import { KeyValue } from "../../../types";
|
|
7
7
|
interface SecretProps {
|
|
@@ -50,4 +50,4 @@ class Secret extends constructs_1.Construct {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.Secret = Secret;
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjcmV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvc2VjcmV0cy9zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQTBDO0FBQzFDLHVFQUd3QztBQUN4QywyQ0FBdUM7QUFDdkMsNERBQXFEO0FBRXJELCtCQUEyQztBQWUzQyxNQUFhLE1BQU8sU0FBUSxzQkFBUztJQUluQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWtCO1FBQzFELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLHlCQUF5QixHQUFHLElBQUksd0JBQWtCLENBQ3JELElBQUksRUFDSixHQUFHLEVBQUUsb0JBQW9CLEVBQ3pCO1lBQ0UsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3RCLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSTtTQUNqQixDQUNGLENBQUM7UUFFRjs7V0FFRztRQUNILE1BQU0saUJBQWlCLEdBQUcsS0FBSyxDQUFDLGlCQUFpQjtZQUMvQyxDQUFDLENBQUM7Z0JBQ0UsaUJBQWlCLEVBQUUseUJBQVcsQ0FBQyxlQUFlLENBQzVDLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQzlCO2FBQ0Y7WUFDSCxDQUFDLENBQUMsRUFBRSxDQUFDO1FBRVA7OztXQUdHO1FBQ0gsTUFBTSxvQkFBb0IsR0FDeEIsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLElBQUksS0FBSyxDQUFDLG9CQUFvQjtZQUNwRCxDQUFDLENBQUMsRUFBRSxvQkFBb0IsRUFBRSxLQUFLLENBQUMsb0JBQW9CLEVBQUU7WUFDdEQsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUVULDJDQUEyQztRQUMzQyxNQUFNLGFBQWEsR0FBRztZQUNwQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7WUFDNUIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtZQUMxQyxhQUFhLEVBQUUsSUFBSSxDQUFDLHlCQUF5QixDQUFDLEdBQUc7WUFDakQsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO1lBQzlCLEdBQUcsaUJBQWlCO1lBQ3BCLEdBQUcsb0JBQW9CO1NBQ3hCLENBQUM7UUFFRixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksMkJBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUVoRSxJQUFBLHFCQUFXLEVBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQ1YsRUFBVSxFQUNWLEtBQWtCO1FBRWxCLE9BQU8sQ0FBQyxFQUFnQixFQUFFLEVBQUU7WUFDMUIsTUFBTSxRQUFRLEdBQWdCO2dCQUM1QixHQUFHLEtBQUs7YUFDVCxDQUFDO1lBQ0YsT0FBTyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQy9DLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQTlERCx3QkE4REMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTZWNyZXRWYWx1ZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHtcbiAgU2VjcmV0IGFzIENka1NlY3JldCxcbiAgU2VjcmV0U3RyaW5nR2VuZXJhdG9yXG59IGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtc2VjcmV0c21hbmFnZXJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgdGFnUmVzb3VyY2UgZnJvbSBcIi4uLy4uLy4uL3V0aWxzL3RhZ1Jlc291cmNlXCI7XG5pbXBvcnQgeyBTdGFja0J1aWxkZXIgfSBmcm9tIFwiLi4vYmFzZS9hd3NTdGFja1wiO1xuaW1wb3J0IHsgQ3VzdG9tZXJNYW5hZ2VkS2V5IH0gZnJvbSBcIi4va21zXCI7XG5pbXBvcnQgeyBLZXlWYWx1ZSB9IGZyb20gXCIuLi8uLi8uLi90eXBlc1wiO1xuXG5pbnRlcmZhY2UgU2VjcmV0UHJvcHMge1xuICBzZWNyZXROYW1lOiBzdHJpbmc7XG4gIHNlY3JldE9iamVjdFZhbHVlPzoge1xuICAgIFtrZXk6IHN0cmluZ106IFNlY3JldFZhbHVlO1xuICB9O1xuICBzZWNyZXRTdHJpbmdWYWx1ZT86IHN0cmluZztcbiAgZGVzY3JpcHRpb24/OiBzdHJpbmc7XG4gIGFsaWFzTmFtZT86IHN0cmluZztcbiAgZ2VuZXJhdGVTZWNyZXRTdHJpbmc/OiBTZWNyZXRTdHJpbmdHZW5lcmF0b3I7XG4gIHRhZ3M6IEtleVZhbHVlO1xufVxuXG5leHBvcnQgY2xhc3MgU2VjcmV0IGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IHNlY3JldDogQ2RrU2VjcmV0O1xuICBwdWJsaWMgcmVhZG9ubHkgc2VjcmV0c0N1c3RvbWVyTWFuYWdlZEtleTogQ3VzdG9tZXJNYW5hZ2VkS2V5O1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTZWNyZXRQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICB0aGlzLnNlY3JldHNDdXN0b21lck1hbmFnZWRLZXkgPSBuZXcgQ3VzdG9tZXJNYW5hZ2VkS2V5KFxuICAgICAgdGhpcyxcbiAgICAgIGAke2lkfUN1c3RvbWVyTWFuYWdlZEtleWAsXG4gICAgICB7XG4gICAgICAgIGFsaWFzTmFtZTogYGNtay8ke2lkfWAsXG4gICAgICAgIHRhZ3M6IHByb3BzLnRhZ3NcbiAgICAgIH1cbiAgICApO1xuXG4gICAgLyoqXG4gICAgICogSWYgYSBzZWNyZXRTdHJpbmdWYWx1ZSBpcyBwcm92aWRlZCwgdXNlIGl0IHRvIGNyZWF0ZSB0aGUgc2VjcmV0LlxuICAgICAqL1xuICAgIGNvbnN0IHNlY3JldFN0cmluZ1ZhbHVlID0gcHJvcHMuc2VjcmV0U3RyaW5nVmFsdWVcbiAgICAgID8ge1xuICAgICAgICAgIHNlY3JldFN0cmluZ1ZhbHVlOiBTZWNyZXRWYWx1ZS51bnNhZmVQbGFpblRleHQoXG4gICAgICAgICAgICBwcm9wcy5zZWNyZXRTdHJpbmdWYWx1ZSB8fCBcIlwiXG4gICAgICAgICAgKVxuICAgICAgICB9XG4gICAgICA6IHt9O1xuXG4gICAgLyoqXG4gICAgICogSWYgYSBnZW5lcmF0ZVNlY3JldFN0cmluZyBpcyBwcm92aWRlZCwgdXNlIGl0IHRvIGNyZWF0ZSB0aGUgc2VjcmV0LlxuICAgICAqIElmIGEgc2VjcmV0U3RyaW5nVmFsdWUgaXMgcHJvdmlkZWQsIGlnbm9yZSB0aGUgZ2VuZXJhdGVTZWNyZXRTdHJpbmcuXG4gICAgICovXG4gICAgY29uc3QgZ2VuZXJhdGVTZWNyZXRTdHJpbmcgPVxuICAgICAgIXByb3BzLnNlY3JldFN0cmluZ1ZhbHVlICYmIHByb3BzLmdlbmVyYXRlU2VjcmV0U3RyaW5nXG4gICAgICAgID8geyBnZW5lcmF0ZVNlY3JldFN0cmluZzogcHJvcHMuZ2VuZXJhdGVTZWNyZXRTdHJpbmcgfVxuICAgICAgICA6IHt9O1xuXG4gICAgLy8gQ29uc3RydWN0IHRoZSBiYXNlIG9wdGlvbnMgZm9yIENka1NlY3JldFxuICAgIGNvbnN0IHNlY3JldE9wdGlvbnMgPSB7XG4gICAgICBzZWNyZXROYW1lOiBwcm9wcy5zZWNyZXROYW1lLFxuICAgICAgc2VjcmV0T2JqZWN0VmFsdWU6IHByb3BzLnNlY3JldE9iamVjdFZhbHVlLFxuICAgICAgZW5jcnlwdGlvbktleTogdGhpcy5zZWNyZXRzQ3VzdG9tZXJNYW5hZ2VkS2V5LmtleSxcbiAgICAgIGRlc2NyaXB0aW9uOiBwcm9wcy5kZXNjcmlwdGlvbixcbiAgICAgIC4uLnNlY3JldFN0cmluZ1ZhbHVlLFxuICAgICAgLi4uZ2VuZXJhdGVTZWNyZXRTdHJpbmdcbiAgICB9O1xuXG4gICAgdGhpcy5zZWNyZXQgPSBuZXcgQ2RrU2VjcmV0KHRoaXMsIGAke2lkfVNlY3JldGAsIHNlY3JldE9wdGlvbnMpO1xuXG4gICAgdGFnUmVzb3VyY2UodGhpcy5zZWNyZXQsIHByb3BzLnRhZ3MpO1xuICB9XG5cbiAgc3RhdGljIGJ1aWxkKFxuICAgIGlkOiBzdHJpbmcsXG4gICAgcHJvcHM6IFNlY3JldFByb3BzXG4gICk6IChzYjogU3RhY2tCdWlsZGVyKSA9PiBDb25zdHJ1Y3Qge1xuICAgIHJldHVybiAoc2I6IFN0YWNrQnVpbGRlcikgPT4ge1xuICAgICAgY29uc3QgbmV3UHJvcHM6IFNlY3JldFByb3BzID0ge1xuICAgICAgICAuLi5wcm9wc1xuICAgICAgfTtcbiAgICAgIHJldHVybiBuZXcgdGhpcyhzYi5nZXRTdGFjaygpLCBpZCwgbmV3UHJvcHMpO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Construct } from "constructs";
|
|
2
2
|
import { Repository, RepositoryProps } from "aws-cdk-lib/aws-ecr";
|
|
3
|
-
import { StackBuilder } from "../awsStack";
|
|
3
|
+
import { StackBuilder } from "../base/awsStack";
|
|
4
4
|
interface EcrProps {
|
|
5
5
|
}
|
|
6
6
|
export declare class Ecr extends Repository {
|
|
@@ -28,4 +28,4 @@ class Ecr extends aws_ecr_1.Repository {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
exports.Ecr = Ecr;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWNyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvc3RvcmFnZS9lY3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsaURBSTZCO0FBQzdCLDZDQUF1RDtBQU12RCxNQUFhLEdBQUksU0FBUSxvQkFBVTtJQUdqQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWdCO1FBQ3hELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBSDFDLFlBQU8sR0FBZ0IsRUFBRSxDQUFDO1FBS2hDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUNmLElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsZUFBZSxFQUFFO1lBQ25DLEdBQUcsRUFBRSxnQkFBZ0I7WUFDckIsS0FBSyxFQUFFLElBQUksQ0FBQyxjQUFjO1lBQzFCLFVBQVUsRUFBRSxHQUFHLEVBQUUsZ0JBQWdCO1NBQ2xDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELDZEQUE2RDtJQUM3RCxNQUFNLENBQUMsa0JBQWtCLENBQUMsS0FBZ0I7UUFDeEMsdUJBQXVCO1FBQ3ZCLG9FQUFvRTtRQUNwRSxPQUFPO1lBQ0wsZUFBZSxFQUFFLElBQUk7WUFDckIsa0JBQWtCLEVBQUUsdUJBQWEsQ0FBQyxPQUFPO1lBQ3pDLGFBQWEsRUFBRSwyQkFBYSxDQUFDLE1BQU07U0FDcEMsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFnQjtRQUN2QyxPQUFPLENBQUMsS0FBbUIsRUFBRSxFQUFFLENBQUMsSUFBSSxHQUFHLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN2RSxDQUFDO0NBQ0Y7QUE3QkQsa0JBNkJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7XG4gIFJlcG9zaXRvcnksXG4gIFJlcG9zaXRvcnlQcm9wcyxcbiAgVGFnTXV0YWJpbGl0eVxufSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjclwiO1xuaW1wb3J0IHsgUmVtb3ZhbFBvbGljeSwgQ2ZuT3V0cHV0IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5cbmltcG9ydCB7IFN0YWNrQnVpbGRlciB9IGZyb20gXCIuLi9iYXNlL2F3c1N0YWNrXCI7XG5cbmludGVyZmFjZSBFY3JQcm9wcyB7fVxuXG5leHBvcnQgY2xhc3MgRWNyIGV4dGVuZHMgUmVwb3NpdG9yeSB7XG4gIHByaXZhdGUgb3V0cHV0czogQ2ZuT3V0cHV0W10gPSBbXTtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IEVjclByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBFY3IuZ2V0UmVwb3NpdG9yeVByb3BzKHByb3BzKSk7XG5cbiAgICB0aGlzLm91dHB1dHMucHVzaChcbiAgICAgIG5ldyBDZm5PdXRwdXQodGhpcywgXCJlY3JSZXBvc2l0b3J5XCIsIHtcbiAgICAgICAga2V5OiBcIlJlcG9zaXRvcnlOYW1lXCIsXG4gICAgICAgIHZhbHVlOiB0aGlzLnJlcG9zaXRvcnlOYW1lLFxuICAgICAgICBleHBvcnROYW1lOiBgJHtpZH1SZXBvc2l0b3J5TmFtZWBcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdW51c2VkLXZhcnNcbiAgc3RhdGljIGdldFJlcG9zaXRvcnlQcm9wcyhwcm9wcz86IEVjclByb3BzKTogUmVwb3NpdG9yeVByb3BzIHtcbiAgICAvLyB0b2RvOiBsaWZlQ3ljbGVSdWxlc1xuICAgIC8vIHRvZG86IEVuY3J5cHRpb24gJiBFbmNyeXB0aW9uS2V5IChkZWZhdWx0IGlzIEFXUyBtYW5hZ2VkIEtNUyBrZXkpXG4gICAgcmV0dXJuIHtcbiAgICAgIGltYWdlU2Nhbk9uUHVzaDogdHJ1ZSxcbiAgICAgIGltYWdlVGFnTXV0YWJpbGl0eTogVGFnTXV0YWJpbGl0eS5NVVRBQkxFLFxuICAgICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5SRVRBSU5cbiAgICB9O1xuICB9XG5cbiAgc3RhdGljIGJ1aWxkKGlkOiBzdHJpbmcsIHByb3BzPzogRWNyUHJvcHMpOiAoc2NvcGU6IFN0YWNrQnVpbGRlcikgPT4gRWNyIHtcbiAgICByZXR1cm4gKHNjb3BlOiBTdGFja0J1aWxkZXIpID0+IG5ldyBFY3Ioc2NvcGUuZ2V0U3RhY2soKSwgaWQsIHByb3BzKTtcbiAgfVxufVxuIl19
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.35",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"overrides": {
|
|
69
69
|
"@smithy/core": "2.5.5"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "482d47eb8c0c6ed8def1e1b6e063e37371ba5b96"
|
|
72
72
|
}
|
|
@@ -1,96 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
4
|
-
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
5
|
-
const constructs_1 = require("constructs");
|
|
6
|
-
const app_1 = require("../../app");
|
|
7
|
-
const aws_ecr_1 = require("aws-cdk-lib/aws-ecr");
|
|
8
|
-
class AwsStack {
|
|
9
|
-
constructor(id, dependencies, props) {
|
|
10
|
-
this.resources = {};
|
|
11
|
-
// Create inner CDK Stack
|
|
12
|
-
this.stack = this.getCdkStack(id, props);
|
|
13
|
-
// Register all stack dependencies
|
|
14
|
-
this.addDependencies(dependencies);
|
|
15
|
-
}
|
|
16
|
-
addDependencies(dependencies) {
|
|
17
|
-
if (!dependencies)
|
|
18
|
-
return;
|
|
19
|
-
if (Array.isArray(dependencies)) {
|
|
20
|
-
for (const dependency of dependencies) {
|
|
21
|
-
this.stack.addDependency(dependency.getStack());
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
this.stack.addDependency(dependencies.getStack());
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
getCdkStack(id, props) {
|
|
29
|
-
if (process.env.JEST_WORKER_ID !== undefined) {
|
|
30
|
-
return new aws_cdk_lib_1.Stack(undefined, id, this.getStackProps(props)); // Create a mock stack for testing
|
|
31
|
-
}
|
|
32
|
-
return new aws_cdk_lib_1.Stack(app_1.default.getInstance(), id, this.getStackProps(props));
|
|
33
|
-
}
|
|
34
|
-
getStackProps(props) {
|
|
35
|
-
if (!props)
|
|
36
|
-
return;
|
|
37
|
-
const stackProps = {
|
|
38
|
-
env: props.accountId && props.region
|
|
39
|
-
? { account: props.accountId, region: props.region }
|
|
40
|
-
: undefined
|
|
41
|
-
};
|
|
42
|
-
return stackProps;
|
|
43
|
-
}
|
|
44
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
|
-
isConnectable(arg) {
|
|
46
|
-
return arg.connections;
|
|
47
|
-
}
|
|
48
|
-
addConstruct(construct) {
|
|
49
|
-
this.resources[construct.node.id] = construct;
|
|
50
|
-
return this;
|
|
51
|
-
}
|
|
52
|
-
addResource(fn) {
|
|
53
|
-
const resource = fn(this);
|
|
54
|
-
this.resources[resource.node.id] = resource;
|
|
55
|
-
return this;
|
|
56
|
-
}
|
|
57
|
-
addNetwork(resource) {
|
|
58
|
-
const resourceActual = resource instanceof constructs_1.Construct ? resource : resource(this);
|
|
59
|
-
this.resources[resourceActual.node.id] = resourceActual;
|
|
60
|
-
this.network = resourceActual;
|
|
61
|
-
return this;
|
|
62
|
-
}
|
|
63
|
-
addContainerRegistry(resource) {
|
|
64
|
-
const resourceActual = resource instanceof aws_ecr_1.Repository ? resource : resource(this);
|
|
65
|
-
this.resources[resourceActual.node.id] = resourceActual;
|
|
66
|
-
this.containerRegistry = resourceActual;
|
|
67
|
-
return this;
|
|
68
|
-
}
|
|
69
|
-
getStack() {
|
|
70
|
-
return this.stack;
|
|
71
|
-
}
|
|
72
|
-
getNetwork() {
|
|
73
|
-
return this.network;
|
|
74
|
-
}
|
|
75
|
-
getContainerRegistry() {
|
|
76
|
-
return this.containerRegistry;
|
|
77
|
-
}
|
|
78
|
-
getResource(identifier) {
|
|
79
|
-
return this.resources[identifier];
|
|
80
|
-
}
|
|
81
|
-
connect(from, to, port) {
|
|
82
|
-
if (!from || !to)
|
|
83
|
-
return this;
|
|
84
|
-
const fromResource = from instanceof constructs_1.Construct ? from : this.getResource(from);
|
|
85
|
-
const toResource = to instanceof constructs_1.Construct ? to : this.getResource(to);
|
|
86
|
-
if (!fromResource || !toResource)
|
|
87
|
-
return this;
|
|
88
|
-
if (!this.isConnectable(fromResource) || !this.isConnectable(toResource))
|
|
89
|
-
return this;
|
|
90
|
-
const portActual = port ? aws_ec2_1.Port.tcp(port) : aws_ec2_1.Port.allTcp();
|
|
91
|
-
fromResource.connections.allowTo(toResource, portActual);
|
|
92
|
-
return this;
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
exports.default = AwsStack;
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../lib/resources/aws/awsStack.ts"],"names":[],"mappings":"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","sourcesContent":["import { Stack, StackProps } from \"aws-cdk-lib\";\nimport { IConnectable, Port } from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\n\nimport App from \"../../app\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\n\nexport interface StackBuilder {\n  addConstruct(resource: Construct): StackBuilder;\n  addResource(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n\n  addNetwork(resource: Construct): StackBuilder;\n  addNetwork(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n  addNetwork(resource: Construct | string): StackBuilder;\n\n  getStack(): Stack;\n  getNetwork(): Construct;\n}\n\nexport interface AwsStackProps {\n  readonly accountId?: string;\n  readonly region?: string;\n  accountName?: string;\n}\n\nexport default class AwsStack implements StackBuilder {\n  public readonly resources: {\n    [key: string]: Construct;\n  } = {};\n\n  private stack: Stack;\n  private network: Construct;\n  private containerRegistry: Repository;\n\n  constructor(\n    id: string,\n    dependencies?: AwsStack | AwsStack[],\n    props?: AwsStackProps\n  ) {\n    // Create inner CDK Stack\n    this.stack = this.getCdkStack(id, props);\n\n    // Register all stack dependencies\n    this.addDependencies(dependencies);\n  }\n\n  private addDependencies(dependencies?: AwsStack | AwsStack[]) {\n    if (!dependencies) return;\n\n    if (Array.isArray(dependencies)) {\n      for (const dependency of dependencies) {\n        this.stack.addDependency(dependency.getStack());\n      }\n    } else {\n      this.stack.addDependency(dependencies.getStack());\n    }\n  }\n\n  private getCdkStack(id: string, props?: AwsStackProps) {\n    if (process.env.JEST_WORKER_ID !== undefined) {\n      return new Stack(undefined, id, this.getStackProps(props)); // Create a mock stack for testing\n    }\n\n    return new Stack(App.getInstance(), id, this.getStackProps(props));\n  }\n\n  private getStackProps(\n    props: AwsStackProps | undefined\n  ): StackProps | undefined {\n    if (!props) return;\n\n    const stackProps: StackProps = {\n      env:\n        props.accountId && props.region\n          ? { account: props.accountId, region: props.region }\n          : undefined\n    };\n\n    return stackProps;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private isConnectable(arg: any): arg is IConnectable {\n    return arg.connections;\n  }\n\n  public addConstruct(construct: Construct): AwsStack {\n    this.resources[construct.node.id] = construct;\n    return this;\n  }\n\n  public addResource(fn: (stackBuilder: StackBuilder) => Construct): AwsStack {\n    const resource = fn(this);\n    this.resources[resource.node.id] = resource;\n    return this;\n  }\n\n  public addNetwork(resource: Construct): AwsStack;\n  public addNetwork(\n    resource: (stackBuilder: StackBuilder) => Construct\n  ): AwsStack;\n  public addNetwork(\n    resource: Construct | ((stackBuilder: StackBuilder) => Construct)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Construct ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.network = resourceActual;\n    return this;\n  }\n\n  public addContainerRegistry(resource: Repository): AwsStack;\n  public addContainerRegistry(\n    resource: (stackBuilder: StackBuilder) => Repository\n  ): AwsStack;\n  public addContainerRegistry(\n    resource: Repository | ((stackBuilder: StackBuilder) => Repository)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Repository ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.containerRegistry = resourceActual;\n    return this;\n  }\n\n  public getStack() {\n    return this.stack;\n  }\n\n  public getNetwork() {\n    return this.network;\n  }\n\n  public getContainerRegistry() {\n    return this.containerRegistry;\n  }\n\n  public getResource(identifier: string) {\n    return this.resources[identifier];\n  }\n\n  public connect(\n    from: Construct | string,\n    to: Construct | string,\n    port?: number\n  ) {\n    if (!from || !to) return this;\n\n    const fromResource =\n      from instanceof Construct ? from : this.getResource(from);\n    const toResource = to instanceof Construct ? to : this.getResource(to);\n\n    if (!fromResource || !toResource) return this;\n\n    if (!this.isConnectable(fromResource) || !this.isConnectable(toResource))\n      return this;\n\n    const portActual = port ? Port.tcp(port) : Port.allTcp();\n    fromResource.connections.allowTo(toResource, portActual);\n\n    return this;\n  }\n}\n"]}
|