Skip to content

feat: enable s3 endpoint for VPC and Public Subnet on standard networking on AWS #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: enable s3 endpoint for VPC and Public Subnet on standard networking on AWS #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/provider/aws/modules/network/standard/standard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func DefaultNetworkRequest(name, regionName string) NetworkRequest {
return NetworkRequest{
Name: name,
CIDR: DefaultCIDRNetwork,
Region: regionName,
AvailabilityZones: azs,
PublicSubnetsCIDRs: GeneratePublicSubnetCIDRs(azCount),
PrivateSubnetsCIDRs: GeneratePrivateSubnetCIDRs(azCount),
Expand Down Expand Up @@ -166,6 +167,7 @@ func (r NetworkRequest) managePublicSubnets(mCtx *mc.Context, vpc *ec2.Vpc,
VPC: vpc,
InternetGateway: igw,
CIDR: r.PublicSubnetsCIDRs[i],
Region: r.Region,
AvailabilityZone: r.AvailabilityZones[i],
Name: fmt.Sprintf("%s%s%d", namePrefix, r.Name, i),
AddNatGateway: r.checkIfNatGatewayRequired(i),
Expand Down
63 changes: 63 additions & 0 deletions pkg/provider/aws/services/vpc/subnet/public.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type PublicSubnetRequest struct {
VPC *ec2.Vpc
InternetGateway *ec2.InternetGateway
CIDR string
Region string
AvailabilityZone string
Name string
AddNatGateway bool
Expand Down Expand Up @@ -89,6 +90,11 @@ func (r PublicSubnetRequest) Create(ctx *pulumi.Context, mCtx *mc.Context) (*Pub
if err != nil {
return nil, err
}
// Manage endpoints
err = endpoints(ctx, r.Name, r.Region, r.VPC, sn, rt)
if err != nil {
return nil, err
}
return &PublicSubnetResources{
Subnet: sn,
RouteTable: rt,
Expand All @@ -97,3 +103,60 @@ func (r PublicSubnetRequest) Create(ctx *pulumi.Context, mCtx *mc.Context) (*Pub
NatGatewayEip: nEip},
nil
}

func endpoints(ctx *pulumi.Context, name, region string,
vpc *ec2.Vpc, sn *ec2.Subnet, rt *ec2.RouteTable) error {
sg, err := ec2.NewSecurityGroup(ctx,
fmt.Sprintf("%s-%s", "sg-endpoints", name),
&ec2.SecurityGroupArgs{
VpcId: vpc.ID(),
Ingress: ec2.SecurityGroupIngressArray{
&ec2.SecurityGroupIngressArgs{
Protocol: pulumi.String("tcp"),
FromPort: pulumi.Int(443),
ToPort: pulumi.Int(443),
CidrBlocks: pulumi.StringArray{vpc.CidrBlock},
},
},
})
if err != nil {
return err
}
_, err = ec2.NewVpcEndpoint(ctx,
fmt.Sprintf("%s-%s", "endpoint-s3", name),
&ec2.VpcEndpointArgs{
VpcId: vpc.ID(),
ServiceName: pulumi.Sprintf("com.amazonaws.%s.s3", region),
VpcEndpointType: pulumi.String("Gateway"),
RouteTableIds: pulumi.StringArray{rt.ID()},
SecurityGroupIds: pulumi.StringArray{sg.ID()},
})
if err != nil {
return err
}
_, err = ec2.NewVpcEndpoint(ctx,
fmt.Sprintf("%s-%s", "endpoint-ecr", name),
&ec2.VpcEndpointArgs{
VpcId: vpc.ID(),
ServiceName: pulumi.Sprintf("com.amazonaws.%s.ecr.dkr", region),
VpcEndpointType: pulumi.String("Interface"),
SubnetIds: pulumi.StringArray{sn.ID()},
SecurityGroupIds: pulumi.StringArray{sg.ID()},
})
if err != nil {
return err
}
_, err = ec2.NewVpcEndpoint(ctx,
fmt.Sprintf("%s-%s", "endpoint-ssm", name),
&ec2.VpcEndpointArgs{
VpcId: vpc.ID(),
ServiceName: pulumi.Sprintf("com.amazonaws.%s.ssm", region),
VpcEndpointType: pulumi.String("Interface"),
SubnetIds: pulumi.StringArray{sn.ID()},
SecurityGroupIds: pulumi.StringArray{sg.ID()},
})
if err != nil {
return err
}
return nil
}