Skip to content

LBAAS-3995: add project ID to nat gateway #909

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

Merged
SSharma-10 merged 1 commit into from
Oct 3, 2025
Merged

LBAAS-3995: add project ID to nat gateway #909

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 vpc_nat_gateways.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type VPCNATGatewayRequest struct {
UDPTimeoutSeconds uint32 `json:"udp_timeout_seconds,omitempty"`
ICMPTimeoutSeconds uint32 `json:"icmp_timeout_seconds,omitempty"`
TCPTimeoutSeconds uint32 `json:"tcp_timeout_seconds,omitempty"`
ProjectID string `json:"project_id,omitempty"`
}

// VPCNATGateway represents a DigitalOcean VPC NAT Gateway resource
Expand All @@ -47,6 +48,7 @@ type VPCNATGateway struct {
TCPTimeoutSeconds uint32 `json:"tcp_timeout_seconds,omitempty"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
ProjectID string `json:"project_id,omitempty"`
}

// IngressVPC defines the ingress configs supported by a VPC NAT Gateway
Expand Down
30 changes: 20 additions & 10 deletions vpc_nat_gateways_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ var vpcNatGatewayGetJSONResponse = `
"icmp_timeout_seconds": 30,
"tcp_timeout_seconds": 300,
"created_at": "2025-04-28T14:20:00Z",
"updated_at": "2025-04-28T14:20:03Z"
"updated_at": "2025-04-28T14:20:03Z",
"project_id": "6929eef6-4e45-11ed-bdc3-0242ac120002"
}
}
`
Expand Down Expand Up @@ -69,7 +70,8 @@ var vpcNatGatewayListJSONResponse = `
"icmp_timeout_seconds": 30,
"tcp_timeout_seconds": 300,
"created_at": "2025-04-28T14:20:00Z",
"updated_at": "2025-04-28T14:20:03Z"
"updated_at": "2025-04-28T14:20:03Z",
"project_id": "6929eef6-4e45-11ed-bdc3-0242ac120002"
},
{
"id": "8e2fedf5-ce55-4ec3-82ca-e607be36ee08",
Expand All @@ -95,7 +97,8 @@ var vpcNatGatewayListJSONResponse = `
"icmp_timeout_seconds": 30,
"tcp_timeout_seconds": 300,
"created_at": "2025-04-28T14:20:29Z",
"updated_at": "2025-04-28T14:20:32Z"
"updated_at": "2025-04-28T14:20:32Z",
"project_id": "6929eef6-4e45-11ed-bdc3-0242ac120002"
}
],
"links": {},
Expand Down Expand Up @@ -131,7 +134,8 @@ var vpcNatGatewayUpdateJSONResponse = `
"icmp_timeout_seconds": 30,
"tcp_timeout_seconds": 300,
"created_at": "2025-04-28T14:20:00Z",
"updated_at": "2025-04-28T14:20:03Z"
"updated_at": "2025-04-28T14:20:03Z",
"project_id": "6929eef6-4e45-11ed-bdc3-0242ac120002"
}
}
`
Expand All @@ -151,6 +155,7 @@ func TestVPCNATGateways_Create(t *testing.T) {
UDPTimeoutSeconds: 30,
ICMPTimeoutSeconds: 30,
TCPTimeoutSeconds: 300,
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
}

mux.HandleFunc(vpcNatGatewaysBasePath, func(w http.ResponseWriter, r *http.Request) {
Expand All @@ -165,12 +170,13 @@ func TestVPCNATGateways_Create(t *testing.T) {
})

expectedGatewayResp := &VPCNATGateway{
ID: "97c46619-1f53-493b-8638-00c899f30152",
Name: "test-egress-gateway-01",
Type: "PUBLIC",
State: "STATE_ACTIVE",
Region: "nyc3",
Size: 1,
ID: "97c46619-1f53-493b-8638-00c899f30152",
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
Name: "test-egress-gateway-01",
Type: "PUBLIC",
State: "STATE_ACTIVE",
Region: "nyc3",
Size: 1,
VPCs: []*IngressVPC{
{VpcUUID: "4637280e-3842-4661-a628-a6f0392959d3", GatewayIP: "10.100.0.110"},
},
Expand Down Expand Up @@ -220,6 +226,7 @@ func TestVPCNATGateways_Get(t *testing.T) {
UDPTimeoutSeconds: 30,
ICMPTimeoutSeconds: 30,
TCPTimeoutSeconds: 300,
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
}

getGatewayResp, _, err := client.VPCNATGateways.Get(ctx, gatewayID)
Expand Down Expand Up @@ -273,6 +280,7 @@ func TestVPCNATGateways_List(t *testing.T) {
UDPTimeoutSeconds: 30,
ICMPTimeoutSeconds: 30,
TCPTimeoutSeconds: 300,
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
},
{
ID: "8e2fedf5-ce55-4ec3-82ca-e607be36ee08",
Expand All @@ -292,6 +300,7 @@ func TestVPCNATGateways_List(t *testing.T) {
UDPTimeoutSeconds: 30,
ICMPTimeoutSeconds: 30,
TCPTimeoutSeconds: 300,
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
},
}

Expand Down Expand Up @@ -360,6 +369,7 @@ func TestVPCNATGateways_Update(t *testing.T) {
UDPTimeoutSeconds: 30,
ICMPTimeoutSeconds: 30,
TCPTimeoutSeconds: 300,
ProjectID: "6929eef6-4e45-11ed-bdc3-0242ac120002",
}

updateGatewayResp, _, err := client.VPCNATGateways.Update(ctx, gatewayID, updateReq)
Expand Down