Skip to content

Commit

Permalink
Firewall diff fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@fluxynet
fluxynet committed Jan 9, 2025
1 parent c70dbc3 commit bdd43e5
Show file tree
Hide file tree
Showing 3 changed files with 202 additions and 0 deletions.
10 changes: 10 additions & 0 deletions internal/ccx/api/datastore_firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"errors"
"fmt"
"net/http"
"slices"
"strings"

"github.com/severalnines/terraform-provider-ccx/internal/ccx"
"github.com/severalnines/terraform-provider-ccx/internal/lib"
Expand Down Expand Up @@ -40,6 +42,10 @@ func (svc *DatastoreService) GetFirewallRules(ctx context.Context, storeID strin
})
}

slices.SortStableFunc(ls, func(a, b ccx.FirewallRule) int {
return strings.Compare(a.Source, b.Source)
})

return ls, nil
}

Expand Down Expand Up @@ -149,6 +155,10 @@ func (svc *DatastoreService) DeleteFirewallRules(ctx context.Context, storeID st
}

func (svc *DatastoreService) SetFirewallRules(ctx context.Context, storeID string, firewalls []ccx.FirewallRule) error {
slices.SortStableFunc(firewalls, func(a, b ccx.FirewallRule) int {
return strings.Compare(a.Source, b.Source)
})

have, err := svc.GetFirewallRules(ctx, storeID)
if err != nil {
return fmt.Errorf("getting firewalls: %w", err)
Expand Down
182 changes: 182 additions & 0 deletions resources/datastore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,4 +560,186 @@ resource "ccx_datastore" "luna" {

m.AssertExpectations(t)
})

t.Run("basic with firewalls", func(t *testing.T) {
m, p := mockProvider()

m.datastore.EXPECT().Create(mock.Anything, ccx.Datastore{
Name: "luna",
Size: 1,
DBVendor: "postgres",
Type: "postgres_streaming",
Tags: []string{"new", "test"},
CloudProvider: "aws",
CloudRegion: "eu-north-1",
InstanceSize: "m5.large",
VolumeType: "gp2",
VolumeSize: 80,
AvailabilityZones: nil,
FirewallRules: []ccx.FirewallRule{
{
Source: "2.2.2.0/24",
Description: "One",
},
{
Source: "2.2.2.1/32",
Description: "Two",
},
},
NetworkType: "public",
Notifications: ccx.Notifications{
Enabled: false,
Emails: []string{},
},
}).Return(&ccx.Datastore{
ID: "datastore-id",
Name: "luna",
Size: 1,
DBVendor: "postgres",
DBVersion: "15",
Type: "postgres_streaming",
Tags: []string{"new", "test", "postgres", "15", "postgres_streaming", "aws", "eu-north-1"},
CloudProvider: "aws",
CloudRegion: "eu-north-1",
InstanceSize: "m5.large",
VolumeType: "gp2",
VolumeSize: 80,
VolumeIOPS: 0,
Notifications: ccx.Notifications{
Enabled: false,
Emails: []string{"[email protected]"},
},
MaintenanceSettings: &ccx.MaintenanceSettings{
DayOfWeek: 1,
StartHour: 0,
EndHour: 2,
},
}, nil)

m.datastore.EXPECT().SetFirewallRules(mock.Anything, "datastore-id", []ccx.FirewallRule{
{
Source: "2.2.2.0/24",
Description: "One",
},
{
Source: "2.2.2.1/32",
Description: "Two",
},
}).Return(nil)

m.datastore.EXPECT().Read(mock.Anything, "datastore-id").Return(&ccx.Datastore{
ID: "datastore-id",
Name: "luna",
Size: 1,
DBVendor: "postgres",
DBVersion: "15",
Type: "postgres_streaming",
Tags: []string{"new", "test", "postgres", "15", "postgres_streaming", "aws", "eu-north-1"},
CloudProvider: "aws",
CloudRegion: "eu-north-1",
InstanceSize: "m5.large",
VolumeType: "gp2",
VolumeSize: 80,
VolumeIOPS: 0,
Notifications: ccx.Notifications{
Enabled: false,
Emails: []string{"[email protected]"},
},
MaintenanceSettings: &ccx.MaintenanceSettings{
DayOfWeek: 1,
StartHour: 0,
EndHour: 2,
},
FirewallRules: []ccx.FirewallRule{
{
Source: "2.2.2.1/32",
Description: "Two",
},
{
Source: "2.2.2.0/24",
Description: "One",
},
},
}, nil)

m.datastore.EXPECT().Delete(mock.Anything, "datastore-id").Return(nil)

resource.Test(t, resource.TestCase{
IsUnitTest: true,
PreCheck: func() {
},
ProviderFactories: map[string]func() (*schema.Provider, error){
"ccx": func() (*schema.Provider, error) {
return p, nil
},
},
Steps: []resource.TestStep{
{
Config: `
resource "ccx_datastore" "luna" {
name = "luna"
size = 1
db_vendor = "postgres"
tags = ["new", "test"]
cloud_provider = "aws"
cloud_region = "eu-north-1"
instance_size = "m5.large"
volume_size = 80
volume_type = "gp2"
network_type = "public"
firewall {
source = "2.2.2.0/24"
description = "One"
}
firewall {
source = "2.2.2.1/32"
description = "Two"
}
}
`,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("ccx_datastore.luna", "id", "datastore-id"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "size", "1"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "db_vendor", "postgres"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "db_version", "15"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "type", "postgres_streaming"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "tags.#", "2"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "tags.0", "new"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "tags.1", "test"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "cloud_provider", "aws"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "cloud_region", "eu-north-1"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "instance_size", "m5.large"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "volume_type", "gp2"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "volume_size", "80"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "volume_iops", "0"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "network_type", "public"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "network_vpc_uuid", ""),
resource.TestCheckResourceAttr("ccx_datastore.luna", "network_ha_enabled", "false"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "notifications_enabled", "false"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "notifications_emails.#", "1"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "notifications_emails.0", "[email protected]"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "maintenance_day_of_week", "1"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "maintenance_start_hour", "0"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "maintenance_end_hour", "2"),

resource.TestCheckResourceAttr("ccx_datastore.luna", "firewall.#", "2"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "firewall.0.source", "2.2.2.0/24"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "firewall.0.description", "One"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "firewall.1.source", "2.2.2.1/32"),
resource.TestCheckResourceAttr("ccx_datastore.luna", "firewall.1.description", "Two"),
),
},
},
})

m.AssertExpectations(t)
})
}
10 changes: 10 additions & 0 deletions resources/firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package resources

import (
"fmt"
"slices"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/severalnines/terraform-provider-ccx/internal/ccx"
Expand Down Expand Up @@ -53,12 +55,20 @@ func getFirewalls(d *schema.ResourceData) ([]ccx.FirewallRule, error) {
}
}

slices.SortStableFunc(ls, func(a, b ccx.FirewallRule) int {
return strings.Compare(a.Source, b.Source)
})

return ls, nil
}

func setFirewalls(d *schema.ResourceData, firewalls []ccx.FirewallRule) error {
value := make([]map[string]any, 0, len(firewalls))

slices.SortStableFunc(firewalls, func(a, b ccx.FirewallRule) int {
return strings.Compare(a.Source, b.Source)
})

for _, f := range firewalls {
value = append(value, map[string]any{
"id": f.Source,
Expand Down

0 comments on commit bdd43e5

Please sign in to comment.