Skip to content

Properly handle existing GCP firewall rules #348

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
HarrisonWAffel merged 2 commits into from
Sep 24, 2025
Merged

Properly handle existing GCP firewall rules #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
421fff0
fix: do not return an error if firewall rules already exist
HarrisonWAffel Sep 15, 2025
88ce46a
fix: update compute_util_test.go to be less flakey
HarrisonWAffel Sep 22, 2025
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
17 changes: 14 additions & 3 deletions drivers/google/compute_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,14 @@ func (c *ComputeUtil) openInternalFirewallPorts(d *Driver) error {
log.Infof("Updating existing internal firewall rule '%s'", rule.Name)
op, err = c.service.Firewalls.Update(c.project, c.internalFirewallRuleName(), rule).Do()
}

if err != nil {
return err
var apiErr *googleapi.Error
ok := errors.As(err, &apiErr)
if !ok || apiErr.Code != http.StatusConflict {
return fmt.Errorf("failed to create internal firewall rule: %w", err)
}
log.Warnf("Conflict encountered when creating internal firewall rule, %s already exists, will use existing rule", rule.Name)
return nil
}

return c.waitForGlobalOp(op.Name)
Expand Down Expand Up @@ -372,7 +377,13 @@ func (c *ComputeUtil) openPublicFirewallPorts(d *Driver) error {
op, err = c.service.Firewalls.Update(c.project, c.externalFirewallRuleName(), rule).Do()
}
if err != nil {
return err
var apiErr *googleapi.Error
ok := errors.As(err, &apiErr)
if !ok || apiErr.Code != http.StatusConflict {
return fmt.Errorf("failed to create external firewall rule: %w", err)
}
log.Warnf("Conflict when creating external firewall rule, %s already exists, will use existing rule", rule.Name)
return nil
}

return c.waitForGlobalOp(op.Name)
Expand Down
14 changes: 12 additions & 2 deletions drivers/google/compute_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,26 @@ func TestUpdatePorts(t *testing.T) {
t.Fail()
}

var udpPorts, tcpPorts []string
for _, allowed := range tt.rule.Allowed {
if allowed.IPProtocol == "udp" {
udpPorts = allowed.Ports
}
if allowed.IPProtocol == "tcp" {
tcpPorts = allowed.Ports
}
}

for _, p := range tt.incomingPorts {
port, proto := driverutil.SplitPortProto(p)
switch proto {
case "udp":
if !slices.Contains(tt.rule.Allowed[1].Ports, port) {
if !slices.Contains(udpPorts, port) {
t.Logf("expected port %s to be in allowed list", port)
t.Fail()
}
default:
if !slices.Contains(tt.rule.Allowed[0].Ports, port) {
if !slices.Contains(tcpPorts, port) {
t.Logf("expected port %s to be in allowed list", port)
t.Fail()
}
Expand Down
Loading