Skip to content

Commit

Permalink
fix(instance): server private_network with deleted pnic (#2552)
Browse files Browse the repository at this point in the history 
* tests(instance): test server private_network support with a deleted private_nic

* fix(instance): server private_network with deleted pnic

* add cassette
  • Loading branch information
@Codelax
Codelax authored Apr 24, 2024
1 parent 157066b commit cd9a7fe
Show file tree
Hide file tree
Showing 4 changed files with 4,546 additions and 1 deletion.
3 changes: 2 additions & 1 deletion internal/services/instance/helpers_instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func (ph *privateNICsHandler) set(d *schema.ResourceData) error {
keyValue := d.Get(pnKey)
keyRaw, err := ph.get(keyValue.(string))
if err != nil {
return err
continue
}
privateNetworks = append(privateNetworks, keyRaw.(map[string]interface{}))
}
Expand All @@ -448,6 +448,7 @@ func (ph *privateNICsHandler) get(key string) (interface{}, error) {
"mac_address": pn.MacAddress,
"status": pn.State.String(),
"zone": loc,
"pnic_id": pn.ID,
}, nil
}

Expand Down
5 changes: 5 additions & 0 deletions internal/services/instance/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ func ResourceServer() *schema.Resource {
Computed: true,
Description: "The private NIC state",
},
"pnic_id": {
Type: schema.TypeString,
Computed: true,
Description: "The ID of the NIC",
},
"zone": zonal.Schema(),
},
},
Expand Down
164 changes: 164 additions & 0 deletions internal/services/instance/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/provider"
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
Expand Down Expand Up @@ -1957,3 +1958,166 @@ func TestAccServer_BlockExternal(t *testing.T) {
},
})
}

func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: instancechecks.IsServerDestroyed(tt),
Steps: []resource.TestStep{
{
Config: `
resource scaleway_vpc_private_network pn {}
resource "scaleway_instance_server" "main" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
private_network {
pn_id = scaleway_vpc_private_network.pn.id
}
}
`,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
resource.TestCheckResourceAttr("scaleway_instance_server.main", "private_network.#", "1"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pn_id"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.mac_address"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.status"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.zone"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pnic_id"),
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "private_network.0.pn_id",
"scaleway_vpc_private_network.pn", "id"),
),
},
{
Config: `
resource scaleway_vpc_private_network pn {}
resource "scaleway_instance_server" "main" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
private_network {
pn_id = scaleway_vpc_private_network.pn.id
}
}
resource scaleway_instance_private_nic pnic {
private_network_id = scaleway_vpc_private_network.pn.id
server_id = scaleway_instance_server.main.id
}
`,
ResourceName: "scaleway_instance_private_nic.pnic",
ImportState: true,
ImportStateIdFunc: func(state *terraform.State) (string, error) {
serverID := state.RootModule().Resources["scaleway_instance_server.main"].Primary.ID
pnicID, exists := state.RootModule().Resources["scaleway_instance_server.main"].Primary.Attributes["private_network.0.pnic_id"]
if !exists {
return "", errors.New("private_network.0.pnic_id not found")
}

id := serverID + "/" + pnicID

return id, nil
},
ImportStatePersist: true,
},
{ // We import private nic as a separate resource to trigger its deletion.
Config: `
resource scaleway_vpc_private_network pn {}
resource "scaleway_instance_server" "main" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
private_network {
pn_id = scaleway_vpc_private_network.pn.id
}
}
resource scaleway_instance_private_nic pnic {
private_network_id = scaleway_vpc_private_network.pn.id
server_id = scaleway_instance_server.main.id
}
`,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
resource.TestCheckResourceAttr("scaleway_instance_server.main", "private_network.#", "1"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pn_id"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.mac_address"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.status"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.zone"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pnic_id"),
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "private_network.0.pn_id",
"scaleway_vpc_private_network.pn", "id"),
func(state *terraform.State) error {
serverPNICID, exists := state.RootModule().Resources["scaleway_instance_server.main"].Primary.Attributes["private_network.0.pnic_id"]
if !exists {
return errors.New("private_network.0.pnic_id not found")
}
localizedPNICID := state.RootModule().Resources["scaleway_instance_private_nic.pnic"].Primary.ID
_, pnicID, _, err := zonal.ParseNestedID(localizedPNICID)
if err != nil {
return err
}

if serverPNICID != pnicID {
return fmt.Errorf("expected server pnic (%s) to equal standalone pnic id (%s)", serverPNICID, pnicID)
}

return nil
},
),
},
{
Config: `
resource scaleway_vpc_private_network pn {}
resource "scaleway_instance_server" "main" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
private_network {
pn_id = scaleway_vpc_private_network.pn.id
}
}
`,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
resource.TestCheckResourceAttr("scaleway_instance_server.main", "private_network.#", "1"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pn_id"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.mac_address"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.status"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.zone"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pnic_id"),
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "private_network.0.pn_id",
"scaleway_vpc_private_network.pn", "id"),
),
ExpectNonEmptyPlan: true, // pnic get deleted and the plan is not empty after the apply as private_network is now missing
},
{
Config: `
resource scaleway_vpc_private_network pn {}
resource "scaleway_instance_server" "main" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
private_network {
pn_id = scaleway_vpc_private_network.pn.id
}
}
`,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("scaleway_instance_server.main", "type", "PLAY2-PICO"),
resource.TestCheckResourceAttr("scaleway_instance_server.main", "private_network.#", "1"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pn_id"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.mac_address"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.status"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.zone"),
resource.TestCheckResourceAttrSet("scaleway_instance_server.main", "private_network.0.pnic_id"),
resource.TestCheckResourceAttrPair("scaleway_instance_server.main", "private_network.0.pn_id",
"scaleway_vpc_private_network.pn", "id"),
),
},
},
})
}
4,375 changes: 4,375 additions & 0 deletions internal/services/instance/testdata/server-private-network-missing-pnic.cassette.yaml
View file

Large diffs are not rendered by default.

0 comments on commit cd9a7fe

Please sign in to comment.