@pulumi/awsx 0.40.0 → 1.0.0-alpha.1650483692
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/{acmpca → classic/acmpca}/index.d.ts +0 -0
- package/classic/acmpca/index.js +21 -0
- package/classic/acmpca/index.js.map +1 -0
- package/{acmpca → classic/acmpca}/metrics.d.ts +0 -0
- package/{acmpca → classic/acmpca}/metrics.js +1 -0
- package/classic/acmpca/metrics.js.map +1 -0
- package/{apigateway → classic/apigateway}/api.d.ts +0 -0
- package/{apigateway → classic/apigateway}/api.js +12 -11
- package/classic/apigateway/api.js.map +1 -0
- package/{apigateway → classic/apigateway}/apikey.d.ts +0 -0
- package/{apigateway → classic/apigateway}/apikey.js +1 -0
- package/classic/apigateway/apikey.js.map +1 -0
- package/{apigateway → classic/apigateway}/cognitoAuthorizer.d.ts +0 -0
- package/{apigateway → classic/apigateway}/cognitoAuthorizer.js +1 -0
- package/classic/apigateway/cognitoAuthorizer.js.map +1 -0
- package/classic/apigateway/index.d.ts +7 -0
- package/classic/apigateway/index.js +27 -0
- package/classic/apigateway/index.js.map +1 -0
- package/{apigateway → classic/apigateway}/lambdaAuthorizer.d.ts +0 -0
- package/{apigateway → classic/apigateway}/lambdaAuthorizer.js +1 -0
- package/classic/apigateway/lambdaAuthorizer.js.map +1 -0
- package/{apigateway → classic/apigateway}/metrics.d.ts +0 -0
- package/{apigateway → classic/apigateway}/metrics.js +1 -0
- package/classic/apigateway/metrics.js.map +1 -0
- package/{apigateway → classic/apigateway}/requestValidator.d.ts +0 -0
- package/{apigateway → classic/apigateway}/requestValidator.js +0 -0
- package/classic/apigateway/requestValidator.js.map +1 -0
- package/{apigateway → classic/apigateway}/swagger_json.d.ts +0 -0
- package/{apigateway → classic/apigateway}/swagger_json.js +0 -0
- package/classic/apigateway/swagger_json.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/autoscaling.d.ts +7 -6
- package/{autoscaling → classic/autoscaling}/autoscaling.js +4 -3
- package/classic/autoscaling/autoscaling.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/index.d.ts +0 -0
- package/classic/autoscaling/index.js +26 -0
- package/classic/autoscaling/index.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/launchConfiguration.d.ts +4 -4
- package/{autoscaling → classic/autoscaling}/launchConfiguration.js +67 -55
- package/classic/autoscaling/launchConfiguration.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/metrics.d.ts +0 -0
- package/{autoscaling → classic/autoscaling}/metrics.js +1 -0
- package/classic/autoscaling/metrics.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/schedule.d.ts +0 -0
- package/{autoscaling → classic/autoscaling}/schedule.js +1 -0
- package/classic/autoscaling/schedule.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/stepScaling.d.ts +2 -2
- package/{autoscaling → classic/autoscaling}/stepScaling.js +1 -0
- package/classic/autoscaling/stepScaling.js.map +1 -0
- package/{autoscaling → classic/autoscaling}/targetTracking.d.ts +4 -3
- package/{autoscaling → classic/autoscaling}/targetTracking.js +3 -2
- package/classic/autoscaling/targetTracking.js.map +1 -0
- package/{aws.d.ts → classic/aws.d.ts} +0 -0
- package/{aws.js → classic/aws.js} +15 -3
- package/classic/aws.js.map +1 -0
- package/{billing → classic/billing}/index.d.ts +0 -0
- package/classic/billing/index.js +21 -0
- package/classic/billing/index.js.map +1 -0
- package/{billing → classic/billing}/metrics.d.ts +0 -0
- package/{billing → classic/billing}/metrics.js +1 -0
- package/classic/billing/metrics.js.map +1 -0
- package/{cloudfront → classic/cloudfront}/index.d.ts +0 -0
- package/classic/cloudfront/index.js +21 -0
- package/classic/cloudfront/index.js.map +1 -0
- package/{cloudfront → classic/cloudfront}/metrics.d.ts +0 -0
- package/{cloudfront → classic/cloudfront}/metrics.js +1 -0
- package/classic/cloudfront/metrics.js.map +1 -0
- package/classic/cloudtrail/index.d.ts +1 -0
- package/classic/cloudtrail/index.js +21 -0
- package/classic/cloudtrail/index.js.map +1 -0
- package/classic/cloudtrail/trail.d.ts +44 -0
- package/classic/cloudtrail/trail.js +71 -0
- package/classic/cloudtrail/trail.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/dashboard.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/dashboard.js +1 -0
- package/classic/cloudwatch/dashboard.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/index.d.ts +1 -0
- package/classic/cloudwatch/index.js +29 -0
- package/classic/cloudwatch/index.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/metric.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/metric.js +2 -1
- package/classic/cloudwatch/metric.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/metrics.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/metrics.js +1 -0
- package/classic/cloudwatch/metrics.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widget.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/widget.js +0 -0
- package/classic/cloudwatch/widget.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_annotations.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_annotations.js +1 -0
- package/classic/cloudwatch/widgets_annotations.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_flow.d.ts +0 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_flow.js +1 -0
- package/classic/cloudwatch/widgets_flow.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_graph.d.ts +5 -4
- package/{cloudwatch → classic/cloudwatch}/widgets_graph.js +1 -0
- package/classic/cloudwatch/widgets_graph.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_json.d.ts +7 -5
- package/{cloudwatch → classic/cloudwatch}/widgets_json.js +0 -0
- package/classic/cloudwatch/widgets_json.js.map +1 -0
- package/{cloudwatch → classic/cloudwatch}/widgets_simple.d.ts +2 -2
- package/{cloudwatch → classic/cloudwatch}/widgets_simple.js +1 -0
- package/classic/cloudwatch/widgets_simple.js.map +1 -0
- package/{codebuild → classic/codebuild}/index.d.ts +0 -0
- package/classic/codebuild/index.js +21 -0
- package/classic/codebuild/index.js.map +1 -0
- package/{codebuild → classic/codebuild}/metrics.d.ts +0 -0
- package/{codebuild → classic/codebuild}/metrics.js +1 -0
- package/classic/codebuild/metrics.js.map +1 -0
- package/{cognito → classic/cognito}/index.d.ts +0 -0
- package/classic/cognito/index.js +21 -0
- package/classic/cognito/index.js.map +1 -0
- package/{cognito → classic/cognito}/metrics.d.ts +0 -0
- package/{cognito → classic/cognito}/metrics.js +1 -0
- package/classic/cognito/metrics.js.map +1 -0
- package/{dynamodb → classic/dynamodb}/index.d.ts +0 -0
- package/classic/dynamodb/index.js +21 -0
- package/classic/dynamodb/index.js.map +1 -0
- package/{dynamodb → classic/dynamodb}/metrics.d.ts +0 -0
- package/{dynamodb → classic/dynamodb}/metrics.js +1 -0
- package/classic/dynamodb/metrics.js.map +1 -0
- package/{ebs → classic/ebs}/index.d.ts +0 -0
- package/classic/ebs/index.js +21 -0
- package/classic/ebs/index.js.map +1 -0
- package/{ebs → classic/ebs}/metrics.d.ts +0 -0
- package/{ebs → classic/ebs}/metrics.js +1 -0
- package/classic/ebs/metrics.js.map +1 -0
- package/{ec2 → classic/ec2}/cidr.d.ts +0 -0
- package/{ec2 → classic/ec2}/cidr.js +1 -0
- package/classic/ec2/cidr.js.map +1 -0
- package/{ec2 → classic/ec2}/index.d.ts +2 -0
- package/classic/ec2/index.js +29 -0
- package/classic/ec2/index.js.map +1 -0
- package/{ec2 → classic/ec2}/internetGateway.d.ts +7 -6
- package/{ec2 → classic/ec2}/internetGateway.js +1 -0
- package/classic/ec2/internetGateway.js.map +1 -0
- package/{ec2 → classic/ec2}/metrics.d.ts +0 -0
- package/{ec2 → classic/ec2}/metrics.js +1 -0
- package/classic/ec2/metrics.js.map +1 -0
- package/{ec2 → classic/ec2}/natGateway.d.ts +8 -7
- package/{ec2 → classic/ec2}/natGateway.js +3 -2
- package/classic/ec2/natGateway.js.map +1 -0
- package/{ec2 → classic/ec2}/securityGroup.d.ts +13 -12
- package/{ec2 → classic/ec2}/securityGroup.js +8 -6
- package/classic/ec2/securityGroup.js.map +1 -0
- package/{ec2 → classic/ec2}/securityGroupRule.d.ts +13 -13
- package/{ec2 → classic/ec2}/securityGroupRule.js +5 -5
- package/classic/ec2/securityGroupRule.js.map +1 -0
- package/{ec2 → classic/ec2}/subnet.d.ts +4 -4
- package/{ec2 → classic/ec2}/subnet.js +3 -2
- package/classic/ec2/subnet.js.map +1 -0
- package/{ec2 → classic/ec2}/vpc.d.ts +12 -10
- package/{ec2 → classic/ec2}/vpc.js +86 -58
- package/classic/ec2/vpc.js.map +1 -0
- package/{ec2 → classic/ec2}/vpcTopology.d.ts +2 -2
- package/{ec2 → classic/ec2}/vpcTopology.js +3 -2
- package/classic/ec2/vpcTopology.js.map +1 -0
- package/{ecr → classic/ecr}/index.d.ts +0 -0
- package/classic/ecr/index.js +23 -0
- package/classic/ecr/index.js.map +1 -0
- package/{ecr → classic/ecr}/lifecyclePolicy.d.ts +0 -0
- package/{ecr → classic/ecr}/lifecyclePolicy.js +1 -0
- package/classic/ecr/lifecyclePolicy.js.map +1 -0
- package/{ecr → classic/ecr}/repository.d.ts +0 -0
- package/{ecr → classic/ecr}/repository.js +2 -1
- package/classic/ecr/repository.js.map +1 -0
- package/{ecr → classic/ecr}/repositoryImage.d.ts +0 -0
- package/{ecr → classic/ecr}/repositoryImage.js +1 -0
- package/classic/ecr/repositoryImage.js.map +1 -0
- package/{ecs → classic/ecs}/capacityProviderService.d.ts +11 -8
- package/{ecs → classic/ecs}/capacityProviderService.js +10 -7
- package/classic/ecs/capacityProviderService.js.map +1 -0
- package/{ecs → classic/ecs}/cluster.d.ts +14 -13
- package/{ecs → classic/ecs}/cluster.js +11 -9
- package/classic/ecs/cluster.js.map +1 -0
- package/{ecs → classic/ecs}/container.d.ts +3 -3
- package/{ecs → classic/ecs}/container.js +7 -6
- package/classic/ecs/container.js.map +1 -0
- package/{ecs → classic/ecs}/ec2Service.d.ts +14 -11
- package/{ecs → classic/ecs}/ec2Service.js +11 -8
- package/classic/ecs/ec2Service.js.map +1 -0
- package/classic/ecs/fargateService.d.ts +217 -0
- package/classic/ecs/fargateService.js +181 -0
- package/classic/ecs/fargateService.js.map +1 -0
- package/{ecs → classic/ecs}/image.d.ts +3 -3
- package/{ecs → classic/ecs}/image.js +14 -4
- package/classic/ecs/image.js.map +1 -0
- package/classic/ecs/index.d.ts +9 -0
- package/classic/ecs/index.js +29 -0
- package/classic/ecs/index.js.map +1 -0
- package/{ecs → classic/ecs}/metrics.d.ts +0 -0
- package/{ecs → classic/ecs}/metrics.js +1 -0
- package/classic/ecs/metrics.js.map +1 -0
- package/{ecs → classic/ecs}/service.d.ts +12 -10
- package/{ecs → classic/ecs}/service.js +5 -3
- package/classic/ecs/service.js.map +1 -0
- package/{ecs → classic/ecs}/taskDefinition.d.ts +11 -9
- package/{ecs → classic/ecs}/taskDefinition.js +30 -18
- package/classic/ecs/taskDefinition.js.map +1 -0
- package/{efs → classic/efs}/index.d.ts +0 -0
- package/classic/efs/index.js +21 -0
- package/classic/efs/index.js.map +1 -0
- package/{efs → classic/efs}/metrics.d.ts +0 -0
- package/{efs → classic/efs}/metrics.js +1 -0
- package/classic/efs/metrics.js.map +1 -0
- package/classic/index.d.ts +25 -0
- package/classic/index.js +67 -0
- package/classic/index.js.map +1 -0
- package/{lambda → classic/lambda}/index.d.ts +0 -0
- package/classic/lambda/index.js +21 -0
- package/classic/lambda/index.js.map +1 -0
- package/{lambda → classic/lambda}/metrics.d.ts +0 -0
- package/{lambda → classic/lambda}/metrics.js +1 -0
- package/classic/lambda/metrics.js.map +1 -0
- package/{lb → classic/lb}/application.d.ts +21 -19
- package/{lb → classic/lb}/application.js +13 -10
- package/classic/lb/application.js.map +1 -0
- package/{lb → classic/lb}/index.d.ts +4 -4
- package/classic/lb/index.js +28 -0
- package/classic/lb/index.js.map +1 -0
- package/{lb → classic/lb}/listener.d.ts +11 -9
- package/{lb → classic/lb}/listener.js +8 -6
- package/classic/lb/listener.js.map +1 -0
- package/{lb → classic/lb}/listenerRule.d.ts +3 -3
- package/{lb → classic/lb}/listenerRule.js +4 -3
- package/classic/lb/listenerRule.js.map +1 -0
- package/{lb → classic/lb}/loadBalancer.d.ts +13 -11
- package/{lb → classic/lb}/loadBalancer.js +6 -5
- package/classic/lb/loadBalancer.js.map +1 -0
- package/{lb → classic/lb}/metrics.d.ts +0 -0
- package/{lb → classic/lb}/metrics.js +1 -0
- package/classic/lb/metrics.js.map +1 -0
- package/{lb → classic/lb}/network.d.ts +21 -18
- package/{lb → classic/lb}/network.js +8 -6
- package/classic/lb/network.js.map +1 -0
- package/{lb → classic/lb}/targetGroup.d.ts +15 -12
- package/{lb → classic/lb}/targetGroup.js +16 -4
- package/classic/lb/targetGroup.js.map +1 -0
- package/{lb → classic/lb}/targetGroupAttachment.d.ts +3 -2
- package/{lb → classic/lb}/targetGroupAttachment.js +3 -2
- package/classic/lb/targetGroupAttachment.js.map +1 -0
- package/{rds → classic/rds}/index.d.ts +0 -0
- package/classic/rds/index.js +21 -0
- package/classic/rds/index.js.map +1 -0
- package/{rds → classic/rds}/metrics.d.ts +0 -0
- package/{rds → classic/rds}/metrics.js +1 -0
- package/classic/rds/metrics.js.map +1 -0
- package/{role.d.ts → classic/role.d.ts} +0 -0
- package/{role.js → classic/role.js} +1 -0
- package/classic/role.js.map +1 -0
- package/{s3 → classic/s3}/index.d.ts +0 -0
- package/classic/s3/index.js +21 -0
- package/classic/s3/index.js.map +1 -0
- package/{s3 → classic/s3}/metrics.d.ts +0 -0
- package/{s3 → classic/s3}/metrics.js +1 -0
- package/classic/s3/metrics.js.map +1 -0
- package/{sns → classic/sns}/index.d.ts +0 -0
- package/classic/sns/index.js +21 -0
- package/classic/sns/index.js.map +1 -0
- package/{sns → classic/sns}/metrics.d.ts +0 -0
- package/{sns → classic/sns}/metrics.js +1 -0
- package/classic/sns/metrics.js.map +1 -0
- package/{sqs → classic/sqs}/index.d.ts +0 -0
- package/classic/sqs/index.js +21 -0
- package/classic/sqs/index.js.map +1 -0
- package/{sqs → classic/sqs}/metrics.d.ts +0 -0
- package/{sqs → classic/sqs}/metrics.js +1 -0
- package/classic/sqs/metrics.js.map +1 -0
- package/{utils.d.ts → classic/utils.d.ts} +0 -0
- package/{utils.js → classic/utils.js} +1 -0
- package/classic/utils.js.map +1 -0
- package/cloudtrail/index.js +34 -17
- package/cloudtrail/index.js.map +1 -1
- package/cloudtrail/trail.d.ts +73 -20
- package/cloudtrail/trail.js +41 -50
- package/cloudtrail/trail.js.map +1 -1
- package/ecs/fargateService.d.ts +63 -140
- package/ecs/fargateService.js +61 -164
- package/ecs/fargateService.js.map +1 -1
- package/ecs/fargateTaskDefinition.d.ts +138 -0
- package/ecs/fargateTaskDefinition.js +72 -0
- package/ecs/fargateTaskDefinition.js.map +1 -0
- package/ecs/index.d.ts +1 -8
- package/ecs/index.js +38 -25
- package/ecs/index.js.map +1 -1
- package/index.d.ts +4 -20
- package/index.js +36 -59
- package/index.js.map +1 -1
- package/package.json +13 -16
- package/package.json.dev +13 -16
- package/provider.d.ts +21 -0
- package/provider.js +38 -0
- package/provider.js.map +1 -0
- package/scripts/install-pulumi-plugin.js +21 -0
- package/types/index.d.ts +3 -0
- package/types/index.js +11 -0
- package/types/index.js.map +1 -0
- package/types/input.d.ts +546 -0
- package/types/input.js +5 -0
- package/types/input.js.map +1 -0
- package/types/output.d.ts +6 -0
- package/types/output.js +5 -0
- package/types/output.js.map +1 -0
- package/utilities.d.ts +4 -0
- package/utilities.js +57 -0
- package/utilities.js.map +1 -0
- package/acmpca/index.js +0 -20
- package/acmpca/index.js.map +0 -1
- package/acmpca/metrics.js.map +0 -1
- package/apigateway/api.js.map +0 -1
- package/apigateway/apikey.js.map +0 -1
- package/apigateway/cognitoAuthorizer.js.map +0 -1
- package/apigateway/index.d.ts +0 -6
- package/apigateway/index.js +0 -32
- package/apigateway/index.js.map +0 -1
- package/apigateway/lambdaAuthorizer.js.map +0 -1
- package/apigateway/metrics.js.map +0 -1
- package/apigateway/requestValidator.js.map +0 -1
- package/apigateway/swagger_json.js.map +0 -1
- package/autoscaling/autoscaling.js.map +0 -1
- package/autoscaling/index.js +0 -25
- package/autoscaling/index.js.map +0 -1
- package/autoscaling/launchConfiguration.js.map +0 -1
- package/autoscaling/metrics.js.map +0 -1
- package/autoscaling/schedule.js.map +0 -1
- package/autoscaling/stepScaling.js.map +0 -1
- package/autoscaling/targetTracking.js.map +0 -1
- package/aws.js.map +0 -1
- package/billing/index.js +0 -20
- package/billing/index.js.map +0 -1
- package/billing/metrics.js.map +0 -1
- package/cloudfront/index.js +0 -20
- package/cloudfront/index.js.map +0 -1
- package/cloudfront/metrics.js.map +0 -1
- package/cloudwatch/dashboard.js.map +0 -1
- package/cloudwatch/index.js +0 -26
- package/cloudwatch/index.js.map +0 -1
- package/cloudwatch/metric.js.map +0 -1
- package/cloudwatch/metrics.js.map +0 -1
- package/cloudwatch/widget.js.map +0 -1
- package/cloudwatch/widgets_annotations.js.map +0 -1
- package/cloudwatch/widgets_flow.js.map +0 -1
- package/cloudwatch/widgets_graph.js.map +0 -1
- package/cloudwatch/widgets_json.js.map +0 -1
- package/cloudwatch/widgets_simple.js.map +0 -1
- package/codebuild/index.js +0 -20
- package/codebuild/index.js.map +0 -1
- package/codebuild/metrics.js.map +0 -1
- package/cognito/index.js +0 -20
- package/cognito/index.js.map +0 -1
- package/cognito/metrics.js.map +0 -1
- package/dynamodb/index.js +0 -20
- package/dynamodb/index.js.map +0 -1
- package/dynamodb/metrics.js.map +0 -1
- package/ebs/index.js +0 -20
- package/ebs/index.js.map +0 -1
- package/ebs/metrics.js.map +0 -1
- package/ec2/cidr.js.map +0 -1
- package/ec2/index.js +0 -26
- package/ec2/index.js.map +0 -1
- package/ec2/internetGateway.js.map +0 -1
- package/ec2/metrics.js.map +0 -1
- package/ec2/natGateway.js.map +0 -1
- package/ec2/securityGroup.js.map +0 -1
- package/ec2/securityGroupRule.js.map +0 -1
- package/ec2/subnet.js.map +0 -1
- package/ec2/vpc.js.map +0 -1
- package/ec2/vpcTopology.js.map +0 -1
- package/ecr/index.js +0 -22
- package/ecr/index.js.map +0 -1
- package/ecr/lifecyclePolicy.js.map +0 -1
- package/ecr/repository.js.map +0 -1
- package/ecr/repositoryImage.js.map +0 -1
- package/ecs/capacityProviderService.js.map +0 -1
- package/ecs/cluster.js.map +0 -1
- package/ecs/container.js.map +0 -1
- package/ecs/ec2Service.js.map +0 -1
- package/ecs/image.js.map +0 -1
- package/ecs/metrics.js.map +0 -1
- package/ecs/service.js.map +0 -1
- package/ecs/taskDefinition.js.map +0 -1
- package/efs/index.js +0 -20
- package/efs/index.js.map +0 -1
- package/efs/metrics.js.map +0 -1
- package/lambda/index.js +0 -20
- package/lambda/index.js.map +0 -1
- package/lambda/metrics.js.map +0 -1
- package/lb/application.js.map +0 -1
- package/lb/index.js +0 -27
- package/lb/index.js.map +0 -1
- package/lb/listener.js.map +0 -1
- package/lb/listenerRule.js.map +0 -1
- package/lb/loadBalancer.js.map +0 -1
- package/lb/metrics.js.map +0 -1
- package/lb/network.js.map +0 -1
- package/lb/targetGroup.js.map +0 -1
- package/lb/targetGroupAttachment.js.map +0 -1
- package/rds/index.js +0 -20
- package/rds/index.js.map +0 -1
- package/rds/metrics.js.map +0 -1
- package/role.js.map +0 -1
- package/s3/index.js +0 -20
- package/s3/index.js.map +0 -1
- package/s3/metrics.js.map +0 -1
- package/sns/index.js +0 -20
- package/sns/index.js.map +0 -1
- package/sns/metrics.js.map +0 -1
- package/sqs/index.js +0 -20
- package/sqs/index.js.map +0 -1
- package/sqs/metrics.js.map +0 -1
- package/utils.js.map +0 -1
|
@@ -12,10 +12,22 @@
|
|
|
12
12
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
16
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
17
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
18
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
19
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
20
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
21
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
22
|
+
});
|
|
23
|
+
};
|
|
15
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
+
exports.Vpc = void 0;
|
|
16
26
|
const aws = require("@pulumi/aws");
|
|
17
27
|
const pulumi = require("@pulumi/pulumi");
|
|
18
|
-
const
|
|
28
|
+
const internetGateway_1 = require("./internetGateway");
|
|
29
|
+
const natGateway_1 = require("./natGateway");
|
|
30
|
+
const subnet_1 = require("./subnet");
|
|
19
31
|
const topology = require("./vpcTopology");
|
|
20
32
|
const utils = require("../utils");
|
|
21
33
|
// Mapping from provider to Vpc. 'undefined' is used to encode the Vpc we create when no provider
|
|
@@ -59,7 +71,7 @@ class VpcData {
|
|
|
59
71
|
// to the vpc.
|
|
60
72
|
if (args.internetGatewayId) {
|
|
61
73
|
const igName = `${name}-ig`;
|
|
62
|
-
this.internetGateway = new
|
|
74
|
+
this.internetGateway = new internetGateway_1.InternetGateway(igName, parent, {
|
|
63
75
|
internetGateway: aws.ec2.InternetGateway.get(igName, args.internetGatewayId, {}, { parent }),
|
|
64
76
|
}, { parent, aliases: [{ parent: pulumi.rootStackResource }] });
|
|
65
77
|
}
|
|
@@ -67,7 +79,7 @@ class VpcData {
|
|
|
67
79
|
for (let i = 0, n = args.natGatewayIds.length; i < n; i++) {
|
|
68
80
|
const natGatewayId = args.natGatewayIds[i];
|
|
69
81
|
const natName = `${name}-nat-${i}`;
|
|
70
|
-
this.natGateways.push(new
|
|
82
|
+
this.natGateways.push(new natGateway_1.NatGateway(natName, parent, {
|
|
71
83
|
natGateway: aws.ec2.NatGateway.get(natName, natGatewayId, {}, { parent }),
|
|
72
84
|
}, { parent, aliases: [{ parent: pulumi.rootStackResource }] }));
|
|
73
85
|
}
|
|
@@ -104,7 +116,7 @@ class VpcData {
|
|
|
104
116
|
// Only set one of availabilityZone or availabilityZoneId
|
|
105
117
|
const availabilityZone = desc.args.availabilityZone;
|
|
106
118
|
const availabilityZoneId = availabilityZone ? undefined : desc.args.availabilityZoneId;
|
|
107
|
-
const subnet = new
|
|
119
|
+
const subnet = new subnet_1.Subnet(desc.subnetName, this.parent, Object.assign(Object.assign({}, desc.args), { availabilityZone,
|
|
108
120
|
availabilityZoneId, tags: utils.mergeTags({ type: desc.type, Name: desc.subnetName }, desc.args.tags) }), { aliases: [{ parent: opts.parent }], ignoreChanges: desc.ignoreChanges, parent: this.parent });
|
|
109
121
|
this.addSubnet(desc.type, subnet);
|
|
110
122
|
}
|
|
@@ -164,7 +176,7 @@ class VpcData {
|
|
|
164
176
|
}
|
|
165
177
|
// See https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Internet_Gateway.html#Add_IGW_Attach_Gateway
|
|
166
178
|
// for more details.
|
|
167
|
-
this.internetGateway = new
|
|
179
|
+
this.internetGateway = new internetGateway_1.InternetGateway(name, this.parent, args, opts);
|
|
168
180
|
subnets = subnets || this.publicSubnets;
|
|
169
181
|
for (const subnet of subnets) {
|
|
170
182
|
subnet.createRoute("ig", this.internetGateway);
|
|
@@ -181,7 +193,7 @@ class VpcData {
|
|
|
181
193
|
* This can be done by calling [subnet.createRoute] and passing in the newly created NatGateway.
|
|
182
194
|
*/
|
|
183
195
|
addNatGateway(name, args, opts = {}) {
|
|
184
|
-
const natGateway = new
|
|
196
|
+
const natGateway = new natGateway_1.NatGateway(name, this.parent, args, opts);
|
|
185
197
|
this.natGateways.push(natGateway);
|
|
186
198
|
return natGateway;
|
|
187
199
|
}
|
|
@@ -215,34 +227,42 @@ class Vpc extends pulumi.ComponentResource {
|
|
|
215
227
|
}
|
|
216
228
|
}
|
|
217
229
|
/** @internal */
|
|
218
|
-
|
|
219
|
-
return
|
|
230
|
+
initializeExistingVpcArgs(name, args, opts) {
|
|
231
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
232
|
+
return new VpcData(name, this, args, opts);
|
|
233
|
+
});
|
|
220
234
|
}
|
|
221
235
|
/** @internal */
|
|
222
|
-
|
|
223
|
-
return
|
|
236
|
+
initializeExistingVpcIdArgs(name, args, opts) {
|
|
237
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
238
|
+
return new VpcData(name, this, args, opts);
|
|
239
|
+
});
|
|
224
240
|
}
|
|
225
241
|
/** @internal */
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
242
|
+
initializeDefaultVpcArgs(name, args, opts) {
|
|
243
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
244
|
+
// back compat. We always would just use the first two public subnets of the region
|
|
245
|
+
// we're in. So preserve that, even though we could get all of them here. Pulling in
|
|
246
|
+
// more than the two we pulled in before could have deep implications for clients as
|
|
247
|
+
// those subnets are used to make many downstream resource-creating decisions.
|
|
248
|
+
const vpcId = yield args.vpcId;
|
|
249
|
+
const provider = args.provider;
|
|
250
|
+
const getSubnetsResult = yield aws.ec2.getSubnetIds({ vpcId }, { provider, async: true });
|
|
251
|
+
const publicSubnetIds = getSubnetsResult.ids.slice(0, 2);
|
|
252
|
+
return new VpcData(name, this, {
|
|
253
|
+
vpcId,
|
|
254
|
+
publicSubnetIds,
|
|
255
|
+
}, opts);
|
|
256
|
+
});
|
|
239
257
|
}
|
|
240
258
|
/** @internal */
|
|
241
|
-
|
|
259
|
+
initializeVpcArgs(name, args, opts) {
|
|
242
260
|
var _a;
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
261
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
262
|
+
const provider = Vpc.getProvider(opts);
|
|
263
|
+
const availabilityZones = yield getAvailabilityZones(opts.parent, provider, (_a = args.requestedAvailabilityZones) !== null && _a !== void 0 ? _a : args.numberOfAvailabilityZones);
|
|
264
|
+
return new VpcData(name, this, Object.assign(Object.assign({}, args), { availabilityZones }), opts);
|
|
265
|
+
});
|
|
246
266
|
}
|
|
247
267
|
static getProvider(opts = {}) {
|
|
248
268
|
// Pull out the provider to ensure we're looking up the default vpc in the right location.
|
|
@@ -252,13 +272,17 @@ class Vpc extends pulumi.ComponentResource {
|
|
|
252
272
|
opts.parent ? opts.parent.getProvider("aws::") : undefined;
|
|
253
273
|
return provider;
|
|
254
274
|
}
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
275
|
+
addInternetGateway(name, subnets, args = {}, opts = {}) {
|
|
276
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
277
|
+
const vpc = yield this.getData();
|
|
278
|
+
vpc.addInternetGateway(name, subnets, args, opts);
|
|
279
|
+
});
|
|
258
280
|
}
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
281
|
+
addNatGateway(name, args, opts = {}) {
|
|
282
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
283
|
+
const vpc = yield this.getData();
|
|
284
|
+
vpc.addNatGateway(name, args, opts);
|
|
285
|
+
});
|
|
262
286
|
}
|
|
263
287
|
/**
|
|
264
288
|
* Get an existing Vpc resource's state with the given name and IDs of its relevant
|
|
@@ -310,12 +334,14 @@ class Vpc extends pulumi.ComponentResource {
|
|
|
310
334
|
}
|
|
311
335
|
// lifted members of VpcData
|
|
312
336
|
/** @internal */
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
337
|
+
liftMember(func, def) {
|
|
338
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
339
|
+
const data = yield this.getData();
|
|
340
|
+
if (!data) {
|
|
341
|
+
return def;
|
|
342
|
+
}
|
|
343
|
+
return func(data);
|
|
344
|
+
});
|
|
319
345
|
}
|
|
320
346
|
/**
|
|
321
347
|
* Asynchronously retrieves the IDs for the public subnets in this Vpc. This will only retrieve
|
|
@@ -383,32 +409,34 @@ utils.Capture(Vpc.prototype).initializeDefaultVpcArgs.doNotCapture = true;
|
|
|
383
409
|
utils.Capture(Vpc.prototype).initializeExistingVpcArgs.doNotCapture = true;
|
|
384
410
|
utils.Capture(Vpc.prototype).initializeExistingVpcIdArgs.doNotCapture = true;
|
|
385
411
|
utils.Capture(Vpc.prototype).initializeVpcArgs.doNotCapture = true;
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
412
|
+
function getAvailabilityZones(parent, provider, requestedZones = 2) {
|
|
413
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
414
|
+
const result = yield aws.getAvailabilityZones(/*args:*/ undefined, { provider, async: true });
|
|
415
|
+
if (result.names.length !== result.zoneIds.length) {
|
|
416
|
+
throw new pulumi.ResourceError("Availability zones for region had mismatched names and ids.", parent);
|
|
417
|
+
}
|
|
418
|
+
const descriptions = result.names.map((name, idx) => ({ name, id: result.zoneIds[idx] }));
|
|
419
|
+
if (Array.isArray(requestedZones) || typeof requestedZones === "object") {
|
|
420
|
+
return new Promise((resolve, reject) => {
|
|
421
|
+
pulumi.Output.create(requestedZones).apply(requestedZones => {
|
|
422
|
+
const mappedZones = descriptions.filter(zone => requestedZones.includes(zone.name));
|
|
423
|
+
mappedZones.length === requestedZones.length ?
|
|
424
|
+
resolve(mappedZones) :
|
|
425
|
+
reject(new pulumi.ResourceError("Availability zones did not match requested zones", parent));
|
|
426
|
+
});
|
|
399
427
|
});
|
|
400
|
-
}
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
}
|
|
428
|
+
}
|
|
429
|
+
else {
|
|
430
|
+
return descriptions.slice(0, requestedZones === "all" ? descriptions.length : requestedZones);
|
|
431
|
+
}
|
|
432
|
+
});
|
|
405
433
|
}
|
|
406
434
|
function getExistingSubnets(vpcData, vpc, vpcName, type, inputs = []) {
|
|
407
435
|
const subnets = vpcData.getSubnets(type);
|
|
408
436
|
const subnetIds = vpcData.getSubnetIds(type);
|
|
409
437
|
for (let i = 0, n = inputs.length; i < n; i++) {
|
|
410
438
|
const subnetName = `${vpcName}-${type}-${i}`;
|
|
411
|
-
const subnet = new
|
|
439
|
+
const subnet = new subnet_1.Subnet(subnetName, vpc, {
|
|
412
440
|
subnet: aws.ec2.Subnet.get(subnetName, inputs[i], /*state:*/ undefined, { parent: vpc }),
|
|
413
441
|
}, { parent: vpc });
|
|
414
442
|
subnets.push(subnet);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vpc.js","sourceRoot":"","sources":["../../../classic/ec2/vpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
|
-
import
|
|
3
|
-
export declare function create(resource: pulumi.Resource | undefined, vpcName: string, vpcCidr: string, ipv6CidrBlock: pulumi.Output<string> | undefined, availabilityZones: AvailabilityZoneDescription[], numberOfNatGateways: number, assignGeneratedIpv6CidrBlock: pulumi.Input<boolean>, subnetArgsArray:
|
|
2
|
+
import { VpcSubnetArgs } from "./vpc";
|
|
3
|
+
export declare function create(resource: pulumi.Resource | undefined, vpcName: string, vpcCidr: string, ipv6CidrBlock: pulumi.Output<string> | undefined, availabilityZones: AvailabilityZoneDescription[], numberOfNatGateways: number, assignGeneratedIpv6CidrBlock: pulumi.Input<boolean>, subnetArgsArray: VpcSubnetArgs[]): VpcTopologyDescription;
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.create = void 0;
|
|
16
17
|
const pulumi = require("@pulumi/pulumi");
|
|
17
18
|
const cidr_1 = require("./cidr");
|
|
18
19
|
const utils = require("../utils");
|
|
@@ -161,8 +162,8 @@ This needs ${ipsPerBlock} IPs/subnet, which is smaller than the minimum (16) all
|
|
|
161
162
|
const nextCidrBlock = new cidr_1.Cidr32Block(nextStartIpAddressInclusive, mask);
|
|
162
163
|
// Make sure this latest block doesn't go past the end of the cidr block of the vpc.
|
|
163
164
|
if (nextCidrBlock.endIpAddressExclusive > this.vpcCidrBlock.endIpAddressExclusive) {
|
|
164
|
-
const lastAllocatedIpAddress = cidr_1.getIPv4Address(nextCidrBlock.endIpAddressExclusive);
|
|
165
|
-
const lastVpcIpAddress = cidr_1.getIPv4Address(this.vpcCidrBlock.endIpAddressExclusive);
|
|
165
|
+
const lastAllocatedIpAddress = (0, cidr_1.getIPv4Address)(nextCidrBlock.endIpAddressExclusive);
|
|
166
|
+
const lastVpcIpAddress = (0, cidr_1.getIPv4Address)(this.vpcCidrBlock.endIpAddressExclusive);
|
|
166
167
|
throw new Error(`Subnet cidr block end ip address extends past that last legal ip address for the vpc.
|
|
167
168
|
${lastAllocatedIpAddress} > ${lastVpcIpAddress}`);
|
|
168
169
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vpcTopology.js","sourceRoot":"","sources":["../../../classic/ec2/vpcTopology.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *** WARNING: this file was generated by pulumi-gen-awsx. ***
|
|
3
|
+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
|
|
4
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
5
|
+
if (k2 === undefined) k2 = k;
|
|
6
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
7
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
8
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
9
|
+
}
|
|
10
|
+
Object.defineProperty(o, k2, desc);
|
|
11
|
+
}) : (function(o, m, k, k2) {
|
|
12
|
+
if (k2 === undefined) k2 = k;
|
|
13
|
+
o[k2] = m[k];
|
|
14
|
+
}));
|
|
15
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
16
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
17
|
+
};
|
|
18
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
+
// Export members:
|
|
20
|
+
__exportStar(require("./lifecyclePolicy"), exports);
|
|
21
|
+
__exportStar(require("./repository"), exports);
|
|
22
|
+
__exportStar(require("./repositoryImage"), exports);
|
|
23
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../classic/ecr/index.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,iFAAiF;;;;;;;;;;;;;;;;AAEjF,kBAAkB;AAClB,oDAAkC;AAClC,+CAA6B;AAC7B,oDAAkC"}
|
|
File without changes
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.convertToJSON = exports.LifecyclePolicy = void 0;
|
|
16
17
|
const aws = require("@pulumi/aws");
|
|
17
18
|
const pulumi = require("@pulumi/pulumi");
|
|
18
19
|
class LifecyclePolicy extends aws.ecr.LifecyclePolicy {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lifecyclePolicy.js","sourceRoot":"","sources":["../../../classic/ecr/lifecyclePolicy.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.buildAndPushImage = exports.Repository = void 0;
|
|
16
17
|
const aws = require("@pulumi/aws");
|
|
17
18
|
const pulumi = require("@pulumi/pulumi");
|
|
18
19
|
const ecs_1 = require("../ecs");
|
|
@@ -41,7 +42,7 @@ class Repository extends pulumi.ComponentResource {
|
|
|
41
42
|
*/
|
|
42
43
|
buildAndPushImage(pathOrBuild) {
|
|
43
44
|
return pulumi.all([pathOrBuild, this.repository.repositoryUrl, this.repository.registryId])
|
|
44
|
-
.apply(([pathOrBuild, repositoryUrl, registryId]) => ecs_1.computeImageFromAsset(pathOrBuild, repositoryUrl, registryId, this));
|
|
45
|
+
.apply(([pathOrBuild, repositoryUrl, registryId]) => (0, ecs_1.computeImageFromAsset)(pathOrBuild, repositoryUrl, registryId, this));
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
48
|
exports.Repository = Repository;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../classic/ecr/repository.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,mCAAmC;AAEnC,yCAAyC;AAEzC,gCAA+C;AAC/C,uDAAyE;AACzE,uDAAoD;AAEpD;;;;;;;GAOG;AACH,MAAa,UAAW,SAAQ,MAAM,CAAC,iBAAiB;IAIpD,YAAY,IAAY,EAAE,OAAuB,EAAE,EAAE,OAAwC,EAAE;QAC3F,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAEpD,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACnG,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvH,IAAI,CAAC,eAAe,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,WAAsD;QAC3E,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;aAC7E,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,EAAE,CACjD,IAAA,2BAAqB,EAAC,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC;CACJ;AAzBD,gCAyBC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC7B,IAAY,EAAE,WAAsD,EAAE,IAAqB,EAAE,IAAsC;IAEnI,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,OAAO,IAAI,iCAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC5C,CAAC;AAND,8CAMC"}
|
|
File without changes
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.RepositoryImage = void 0;
|
|
16
17
|
/**
|
|
17
18
|
* A simple pair of a [Repository] and a built docker image that was pushed to it. This can
|
|
18
19
|
* be passed in as the `image: repoImage` value to an `ecs.Container`.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repositoryImage.js","sourceRoot":"","sources":["../../../classic/ecr/repositoryImage.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAOjC;;;GAGG;AACH,MAAa,eAAe;IAIxB,YAAY,UAAsB,EAAE,KAA2B;QAKxD,UAAK,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;QAC9B,gBAAW,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC;QAL1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC5B,CAAC;CAIJ;AAXD,0CAWC"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import * as aws from "@pulumi/aws";
|
|
2
2
|
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
-
import * as
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
import * as ec2 from "../ec2";
|
|
4
|
+
import { Cluster } from "./cluster";
|
|
5
|
+
import { EC2TaskDefinition } from "./ec2Service";
|
|
6
|
+
import { FargateTaskDefinition } from "./fargateService";
|
|
7
|
+
import { Service, ServiceLoadBalancer, ServiceLoadBalancerProvider } from "./service";
|
|
8
|
+
export declare class CapacityProviderService extends Service {
|
|
9
|
+
readonly taskDefinition: FargateTaskDefinition | EC2TaskDefinition;
|
|
7
10
|
constructor(name: string, args: CapacityProviderServiceArgs, opts?: pulumi.ComponentResourceOptions);
|
|
8
11
|
}
|
|
9
12
|
export interface CapacityProviderServiceArgs {
|
|
@@ -68,7 +71,7 @@ export interface CapacityProviderServiceArgs {
|
|
|
68
71
|
/**
|
|
69
72
|
* A load balancer block. Load balancers documented below.
|
|
70
73
|
*/
|
|
71
|
-
loadBalancers?: (pulumi.Input<
|
|
74
|
+
loadBalancers?: (pulumi.Input<ServiceLoadBalancer> | ServiceLoadBalancerProvider)[];
|
|
72
75
|
/**
|
|
73
76
|
* The name of the service (up to 255 letters, numbers, hyphens, and underscores)
|
|
74
77
|
*/
|
|
@@ -84,7 +87,7 @@ export interface CapacityProviderServiceArgs {
|
|
|
84
87
|
*
|
|
85
88
|
* Defaults to [cluster.securityGroups] if unspecified.
|
|
86
89
|
*/
|
|
87
|
-
securityGroups?:
|
|
90
|
+
securityGroups?: ec2.SecurityGroupOrId[];
|
|
88
91
|
/**
|
|
89
92
|
* The subnets to connect the instances to. If unspecified and [assignPublicIp] is true, then
|
|
90
93
|
* these will be the public subnets of the cluster's vpc. If unspecified and [assignPublicIp]
|
|
@@ -126,7 +129,7 @@ export interface CapacityProviderServiceArgs {
|
|
|
126
129
|
/**
|
|
127
130
|
* Cluster this service will run in. If unspecified, [Cluster.getDefault()] will be used.
|
|
128
131
|
*/
|
|
129
|
-
cluster?:
|
|
132
|
+
cluster?: Cluster;
|
|
130
133
|
os?: pulumi.Input<"linux" | "windows">;
|
|
131
134
|
/**
|
|
132
135
|
* Wait for the service to reach a steady state (like [`aws ecs wait
|
|
@@ -137,7 +140,7 @@ export interface CapacityProviderServiceArgs {
|
|
|
137
140
|
/**
|
|
138
141
|
* The task definition to create the service from.
|
|
139
142
|
*/
|
|
140
|
-
taskDefinition:
|
|
143
|
+
taskDefinition: FargateTaskDefinition | EC2TaskDefinition;
|
|
141
144
|
/**
|
|
142
145
|
* Key-value mapping of resource tags
|
|
143
146
|
*/
|
|
@@ -13,21 +13,24 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
|
|
17
|
-
const
|
|
16
|
+
exports.CapacityProviderService = void 0;
|
|
17
|
+
const ec2 = require("../ec2");
|
|
18
18
|
const utils = require("../utils");
|
|
19
|
-
|
|
19
|
+
const cluster_1 = require("./cluster");
|
|
20
|
+
const fargateService_1 = require("./fargateService");
|
|
21
|
+
const service_1 = require("./service");
|
|
22
|
+
class CapacityProviderService extends service_1.Service {
|
|
20
23
|
constructor(name, args, opts = {}) {
|
|
21
24
|
if (!args.taskDefinition) {
|
|
22
25
|
throw new Error("The [taskDefinition] must be provided");
|
|
23
26
|
}
|
|
24
|
-
const cluster = args.cluster ||
|
|
27
|
+
const cluster = args.cluster || cluster_1.Cluster.getDefault();
|
|
25
28
|
const taskDefinition = args.taskDefinition;
|
|
26
|
-
const securityGroups =
|
|
29
|
+
const securityGroups = ec2.getSecurityGroups(cluster.vpc, name, args.securityGroups || cluster.securityGroups, opts) || [];
|
|
27
30
|
let assignPublicIp, networkConfiguration, subnets;
|
|
28
|
-
if (taskDefinition instanceof
|
|
31
|
+
if (taskDefinition instanceof fargateService_1.FargateTaskDefinition) {
|
|
29
32
|
assignPublicIp = utils.ifUndefined(args.assignPublicIp, true);
|
|
30
|
-
subnets =
|
|
33
|
+
subnets = (0, fargateService_1.getSubnets)(cluster, args.subnets, assignPublicIp);
|
|
31
34
|
networkConfiguration = {
|
|
32
35
|
subnets,
|
|
33
36
|
assignPublicIp,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capacityProviderService.js","sourceRoot":"","sources":["../../../classic/ecs/capacityProviderService.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAIjC,8BAA8B;AAE9B,kCAAkC;AAClC,uCAAoC;AAEpC,qDAAqE;AACrE,uCAAmG;AAEnG,MAAa,uBAAwB,SAAQ,iBAAO;IAGhD,YAAY,IAAY,EACZ,IAAiC,EACjC,OAAwC,EAAE;QAElD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC5D;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,iBAAO,CAAC,UAAU,EAAE,CAAC;QAErD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE3C,MAAM,cAAc,GAAG,GAAG,CAAC,iBAAiB,CACxC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAElF,IAAI,cAAc,EAAE,oBAAoB,EACxC,OAA6C,CAAC;QAE9C,IAAI,cAAc,YAAY,sCAAqB,EAAE;YACjD,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YAC9D,OAAO,GAAG,IAAA,2BAAU,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAC5D,oBAAoB,GAAG;gBACnB,OAAO;gBACP,cAAc;gBACd,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAChD,CAAC;SACL;aAAM;YACH,cAAc,GAAG,KAAK,CAAC;YACvB,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACtD,oBAAoB,GAAG,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBACvE,qFAAqF;gBACrF,8EAA8E;gBAC9E,sEAAsE;gBACtE,IAAI,CAAC,KAAK,QAAQ,EAAE;oBAChB,OAAO,SAAU,CAAC;iBACrB;gBAED,OAAO;oBACH,OAAO;oBACP,cAAc,EAAE,KAAK;oBACrB,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChD,CAAC;YACN,CAAC,CAAC,CAAC;SACN;QAED,KAAK,CAAC,oCAAoC,EAAE,IAAI,kCACzC,IAAI,KACP,cAAc;YACd,cAAc;YACd,oBAAoB,KACrB,IAAI,CAAC,CAAC;QAET,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,CAAC,eAAe,EAAE,CAAC;IAC3B,CAAC;CACJ;AA3DD,0DA2DC;AAmLD,oGAAoG;AACpG,MAAM,IAAI,GAAW,KAAK,CAAC,WAAW,EAAqE,CAAC"}
|
|
@@ -1,40 +1,41 @@
|
|
|
1
1
|
import * as aws from "@pulumi/aws";
|
|
2
2
|
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
-
import * as
|
|
3
|
+
import * as autoscaling from "../autoscaling";
|
|
4
|
+
import * as ec2 from "../ec2";
|
|
4
5
|
/**
|
|
5
6
|
* A Cluster is a general purpose ECS cluster configured to run in a provided Network.
|
|
6
7
|
*/
|
|
7
|
-
export declare class Cluster extends pulumi.ComponentResource implements
|
|
8
|
+
export declare class Cluster extends pulumi.ComponentResource implements autoscaling.AutoScalingUserData {
|
|
8
9
|
readonly cluster: aws.ecs.Cluster;
|
|
9
10
|
readonly id: pulumi.Output<string>;
|
|
10
11
|
/**
|
|
11
12
|
* The network in which to create this cluster.
|
|
12
13
|
*/
|
|
13
|
-
readonly vpc:
|
|
14
|
+
readonly vpc: ec2.Vpc;
|
|
14
15
|
/**
|
|
15
16
|
* Security groups associated with this this ECS Cluster.
|
|
16
17
|
*/
|
|
17
|
-
readonly securityGroups:
|
|
18
|
-
readonly extraBootcmdLines: () => pulumi.Input<
|
|
19
|
-
readonly autoScalingGroups:
|
|
18
|
+
readonly securityGroups: ec2.SecurityGroup[];
|
|
19
|
+
readonly extraBootcmdLines: () => pulumi.Input<autoscaling.UserDataLine[]>;
|
|
20
|
+
readonly autoScalingGroups: autoscaling.AutoScalingGroup[];
|
|
20
21
|
constructor(name: string, args?: ClusterArgs, opts?: pulumi.ComponentResourceOptions);
|
|
21
|
-
addAutoScalingGroup(group:
|
|
22
|
+
addAutoScalingGroup(group: autoscaling.AutoScalingGroup): void;
|
|
22
23
|
/**
|
|
23
24
|
* Creates a new autoscaling group and adds it to the list of autoscaling groups targeting this
|
|
24
25
|
* cluster. The autoscaling group will be created with is network set to the same network as
|
|
25
26
|
* this cluster as well as using this cluster to initialize both its securityGroups and
|
|
26
27
|
* launchConfiguration userData.
|
|
27
28
|
*/
|
|
28
|
-
createAutoScalingGroup(name: string, args?:
|
|
29
|
+
createAutoScalingGroup(name: string, args?: autoscaling.AutoScalingGroupArgs, opts?: pulumi.ComponentResourceOptions): autoscaling.AutoScalingGroup;
|
|
29
30
|
/**
|
|
30
31
|
* Gets or creates a cluster that can be used by default for the current aws account and region.
|
|
31
32
|
* The cluster will use the default Vpc for the account and will be provisioned with a security
|
|
32
33
|
* group created by [createDefaultSecurityGroup].
|
|
33
34
|
*/
|
|
34
35
|
static getDefault(opts?: pulumi.ComponentResourceOptions): Cluster;
|
|
35
|
-
static createDefaultSecurityGroup(name: string, vpc?:
|
|
36
|
-
static createDefaultSecurityGroupEgressRules(name: string, securityGroup:
|
|
37
|
-
static createDefaultSecurityGroupIngressRules(name: string, securityGroup:
|
|
36
|
+
static createDefaultSecurityGroup(name: string, vpc?: ec2.Vpc, opts?: pulumi.ComponentResourceOptions): ec2.SecurityGroup;
|
|
37
|
+
static createDefaultSecurityGroupEgressRules(name: string, securityGroup: ec2.SecurityGroup): ec2.EgressSecurityGroupRule[];
|
|
38
|
+
static createDefaultSecurityGroupIngressRules(name: string, securityGroup: ec2.SecurityGroup): ec2.IngressSecurityGroupRule[];
|
|
38
39
|
}
|
|
39
40
|
/**
|
|
40
41
|
* Arguments bag for creating infrastructure for a new Cluster.
|
|
@@ -57,7 +58,7 @@ export interface ClusterArgs {
|
|
|
57
58
|
* The network in which to create this cluster. If not provided, Vpc.getDefault() will be
|
|
58
59
|
* used.
|
|
59
60
|
*/
|
|
60
|
-
vpc?:
|
|
61
|
+
vpc?: ec2.Vpc;
|
|
61
62
|
/**
|
|
62
63
|
* An existing aws.ecs.Cluster (or the name of an existing aws.ecs.Cluster) to use for this
|
|
63
64
|
* awsx.ecs.Cluster. If not provided, a default one will be created.
|
|
@@ -73,7 +74,7 @@ export interface ClusterArgs {
|
|
|
73
74
|
* The security group to place new instances into. If not provided, a default will be
|
|
74
75
|
* created. Pass an empty array to create no security groups.
|
|
75
76
|
*/
|
|
76
|
-
securityGroups?:
|
|
77
|
+
securityGroups?: ec2.SecurityGroupOrId[];
|
|
77
78
|
/**
|
|
78
79
|
* Key-value mapping of resource tags
|
|
79
80
|
*/
|