Skip to content

Fix project-scoped VM lookup in port forward resource #356

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
dheeraj12347 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix project-scoped VM lookup in port forward resource #356

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
3 changes: 2 additions & 1 deletion cloudstack/resource_cloudstack_port_forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,10 @@ func createPortForward(d *schema.ResourceData, meta interface{}, forward map[str
return err
}

// Query VM without project filter - it will be found regardless of project
// Pass the project so account-level keys can resolve project-scoped VMs.
vm, _, err := cs.VirtualMachine.GetVirtualMachineByID(
forward["virtual_machine_id"].(string),
cloudstack.WithProject(d.Get("project").(string)),
)
if err != nil {
return err
Expand Down
57 changes: 57 additions & 0 deletions cloudstack/resource_cloudstack_port_forward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,28 @@ func TestAccCloudStackPortForward_projectInheritance(t *testing.T) {
})
}

func TestAccCloudStackPortForward_project(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckCloudStackPortForwardDestroy,
Steps: []resource.TestStep{
{
Config: testAccCloudStackPortForward_project,
Check: resource.ComposeTestCheckFunc(
testAccCheckCloudStackPortForwardsExist("cloudstack_port_forward.foo"),
resource.TestCheckResourceAttr(
"cloudstack_port_forward.foo", "project", "terraform"),
resource.TestCheckResourceAttr(
"cloudstack_port_forward.foo", "forward.#", "1"),
resource.TestCheckResourceAttrSet(
"cloudstack_port_forward.foo", "forward.0.uuid"),
),
},
},
})
}

func testAccCheckCloudStackPortForwardsExist(n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down Expand Up @@ -459,3 +481,38 @@ resource "cloudstack_port_forward" "foo" {
virtual_machine_id = cloudstack_instance.foobar.id
}
}`

const testAccCloudStackPortForward_project = `
resource "cloudstack_network" "foo" {
name = "terraform-port-forward-project-network"
display_text = "terraform-port-forward-project-network"
cidr = "10.1.3.0/24"
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
project = "terraform"
source_nat_ip = true
zone = "Sandbox-simulator"
}

resource "cloudstack_instance" "foobar" {
name = "terraform-port-forward-project-instance"
display_name = "terraform-port-forward-project-instance"
service_offering = "Medium Instance"
network_id = cloudstack_network.foo.id
template = "CentOS 5.6 (64-bit) no GUI (Simulator)"
zone = "Sandbox-simulator"
project = "terraform"
expunge = true
}

resource "cloudstack_port_forward" "foo" {
ip_address_id = cloudstack_network.foo.source_nat_ip_id
project = "terraform"

forward {
protocol = "tcp"
private_port = 443
public_port = 8443
virtual_machine_id = cloudstack_instance.foobar.id
}
}
`
Loading