fix: adding lan to existing natgateway, setting nat ip (#109)

* fix: adding lan to existing natgateway, setting nat ip

* test: updated test to check method arguments

* test: updated more tests

* test: added more tests

* fixed tests

* test: nat patch tests, improved coverage

internal/utils/client_service.go

@@ -15,6 +15,7 @@ type ClientService interface {
 	RemoveLan(datacenterId, lanId string) error
 
 	CreateNat(datacenterId, name string, publicIps, flowlogs, natRules []string, lansToGateways map[string][]string, sourceSubnet string, skipDefaultRules bool) (*ionoscloud.NatGateway, error)
+	PatchNat(datacenterId, natId, name string, publicIps []string, lansToGateways []ionoscloud.NatGatewayLanProperties) (*ionoscloud.NatGateway, error)
 	GetNat(datacenterId string, natId string) (*ionoscloud.NatGateway, error)
 	GetNats(datacenterId string) (*ionoscloud.NatGateways, error)
 	RemoveNat(datacenterId, natId string) error

internal/utils/nat.go

@@ -183,6 +183,22 @@ func keysOfMap[K comparable, V any](m map[K]V) []K {
 	return keys
 }
 
+func (c *Client) PatchNat(datacenterId, natId, name string, publicIps []string, lansToGateways []sdkgo.NatGatewayLanProperties) (*sdkgo.NatGateway, error) {
+	nat, resp, err := c.NATGatewaysApi.DatacentersNatgatewaysPatch(c.ctx, datacenterId, natId).NatGatewayProperties(
+		sdkgo.NatGatewayProperties{
+			Name:      &name,
+			PublicIps: &publicIps,
+			Lans:      &lansToGateways,
+		},
+	).Execute()
+	if err != nil {
+		return nil, err
+	}
+
+	err = c.waitTillProvisioned(resp.Header.Get("location"))
+	return &nat, err
+}
+
 func (c *Client) CreateNat(datacenterId, name string, publicIps, flowlogs, natRules []string, lansToGateways map[string][]string, sourceSubnet string, skipDefaultRules bool) (*sdkgo.NatGateway, error) {
 	var lans []sdkgo.NatGatewayLanProperties
 	publicIp := publicIps[0]

ionoscloud.go

@@ -570,7 +570,7 @@ func (d *Driver) PreCreateCheck() error {
 		return fmt.Errorf("error getting image/alias %s: %w", d.Image, err)
 	}
 
-	if d.NatId != "" && d.DatacenterId != "" {
+	if d.NatId == "" && d.DatacenterId != "" {
 		nats, err := d.client().GetNats(d.DatacenterId)
 		if err != nil {
 			return err
@@ -894,7 +894,9 @@ func (d *Driver) Create() (err error) {
 
 	nics := server.Entities.GetNics()
 	for _, nic := range *nics.Items {
+		log.Infof("%v", *nic.Properties.Name)
 		if *nic.Properties.Name == d.MachineName {
+			log.Infof("altceva")
 			d.NicId = *nic.Id
 			log.Debugf("Nic ID: %v", d.NicId)
 		} else {
@@ -918,10 +920,6 @@ func (d *Driver) Create() (err error) {
 	if nicProp, ok := nic.GetPropertiesOk(); ok && nicProp != nil {
 		nicIps = nicProp.GetIps()
 	}
-	if len(*nicIps) > 0 {
-		d.IPAddress = (*nicIps)[0]
-		log.Infof(d.IPAddress)
-	}
 
 	// --- NAT ---
 	if d.CreateNat {
@@ -943,6 +941,34 @@ func (d *Driver) Create() (err error) {
 		d.NatId = *nat.Id // NatId is used later to retrieve public IP, etc.
 		d.IPAddress = (*natPublicIps)[0]
 		log.Infof(d.IPAddress)
+	} else if d.NatId != "" {
+		nat, _ := d.client().GetNat(d.DatacenterId, d.NatId)
+
+		foundNatLan := false
+		lanIdInt, _ := strconv.Atoi(d.LanId)
+		for _, natLan := range *nat.Properties.Lans {
+			if *natLan.Id == int32(lanIdInt) {
+				foundNatLan = true
+				break
+			}
+		}
+		if !foundNatLan {
+			// connect lan to nat
+			natLans := append(*nat.Properties.Lans, sdkgo.NatGatewayLanProperties{Id: pointer.From(int32(lanIdInt)), GatewayIps: nil})
+			_, err = d.client().PatchNat(d.DatacenterId, d.NatId, *nat.Properties.Name, *nat.Properties.PublicIps, natLans)
+
+			if err != nil {
+				return err
+			}
+		}
+
+		d.IPAddress = (*nat.Properties.PublicIps)[0]
+		log.Infof(d.IPAddress)
+	} else {
+		if len(*nicIps) > 0 {
+			d.IPAddress = (*nicIps)[0]
+			log.Infof(d.IPAddress)
+		}
 	}
 
 	return nil