Merge pull request #333 from kthcloud/dev

fix ssh bug that caused same conn string for all vms in list
kthcloud · Dec 14, 2023 · c6231fa · c6231fa
2 parents ee6a72a + c9e371b
commit c6231fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/service/deployment_service/client/client.go b/service/deployment_service/client/client.go
@@ -95,7 +95,8 @@ func (c *BaseClient[parent]) fetchDeployments(dmc *deploymentModel.Client) ([]de
 	}
 
 	for _, deployment := range deployments {
-		c.StoreDeployment(&deployment)
+		d := deployment
+		c.StoreDeployment(&d)
 	}
 
 	return deployments, nil

diff --git a/service/vm_service/client/client.go b/service/vm_service/client/client.go
@@ -109,7 +109,8 @@ func (c *BaseClient[parent]) fetchVMs(vmc *vmModel.Client) ([]vmModel.VM, error)
 	}
 
 	for _, vm := range vms {
-		c.StoreVM(&vm)
+		v := vm
+		c.StoreVM(&v)
 	}
 
 	return vms, nil

diff --git a/service/vm_service/vm_service.go b/service/vm_service/vm_service.go
@@ -466,13 +466,16 @@ func (c *Client) GetConnectionString(id string) (*string, error) {
 	}
 
 	domainName := zone.ParentDomain
-	port := vm.Subsystems.CS.PortForwardingRuleMap["__ssh"].PublicPort
+	rule := vm.Subsystems.CS.GetPortForwardingRule("__ssh")
+	if rule == nil {
+		return nil, nil
+	}
 
-	if domainName == "" || port == 0 {
+	if domainName == "" || rule.PublicPort == 0 {
 		return nil, nil
 	}
 
-	connectionString := fmt.Sprintf("ssh root@%s -p %d", domainName, port)
+	connectionString := fmt.Sprintf("ssh root@%s -p %d", domainName, rule.PublicPort)
 
 	return &connectionString, nil
 }