Merge pull request #137 from OpenVPN/fix/network-application-import-network-id

Refactor application data handling in CloudConnexa resources

Author: arslanbekov

cloudconnexa/data_source_network_application.go

@@ -2,6 +2,7 @@ package cloudconnexa
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa"
@@ -67,6 +68,6 @@ func dataSourceNetworkApplicationRead(ctx context.Context, data *schema.Resource
 	if application == nil {
 		return append(diags, diag.Errorf("Application with id %s was not found", id)...)
 	}
-	setApplicationData(data, application)
+	setNetworkApplicationData(data, application)
 	return nil
 }

cloudconnexa/resource_network_application.go

@@ -66,7 +66,7 @@ func resourceNetworkApplicationUpdate(ctx context.Context, data *schema.Resource
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	setApplicationData(data, s)
+	setNetworkApplicationData(data, s)
 	return nil
 }
 
@@ -130,7 +130,7 @@ func resourceNetworkApplicationRead(ctx context.Context, data *schema.ResourceDa
 		data.SetId("")
 		return diags
 	}
-	setApplicationData(data, application)
+	setNetworkApplicationData(data, application)
 	return diags
 }
 
@@ -154,7 +154,7 @@ func resourceNetworkApplicationCreate(ctx context.Context, data *schema.Resource
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	setApplicationData(data, createdApplication)
+	setNetworkApplicationData(data, createdApplication)
 	return nil
 }
 
@@ -237,3 +237,13 @@ func resourceDataToNetworkApplication(data *schema.ResourceData) *cloudconnexa.A
 	}
 	return s
 }
+
+// setNetworkApplicationData sets the Terraform state data from a network application response
+func setNetworkApplicationData(data *schema.ResourceData, application *cloudconnexa.ApplicationResponse) {
+	data.SetId(application.ID)
+	_ = data.Set("name", application.Name)
+	_ = data.Set("description", application.Description)
+	_ = data.Set("routes", flattenApplicationRoutes(application.Routes))
+	_ = data.Set("config", flattenApplicationConfig(application.Config))
+	_ = data.Set("network_id", application.NetworkItemID)
+}