rename firewall

civo/network/resource_network.go

@@ -135,13 +135,12 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
 			return err
 		}
 		d.SetId(network.ID)
-		// Check if a default firewall needs to be created
-		if _, ok := d.GetOk("firewall_id"); !ok {
-			log.Printf("[INFO] Creating default firewall for the network %s", d.Get("label").(string))
-			err := createDefaultFirewall(apiClient, network.ID)
-			if err != nil {
-				return err
-			}
+
+		// Create a default firewall for the network
+		log.Printf("[INFO] Creating default firewall for the network %s", d.Get("label").(string))
+		err = createDefaultFirewall(apiClient, network.ID, network.Label)
+		if err != nil {
+			return err
 		}
 
 		return nil
@@ -268,10 +267,10 @@ func expandStringList(input interface{}) []string {
 }
 
 // createDefaultFirewall function to create a default firewall
-func createDefaultFirewall(apiClient *civogo.Client, networkID string) error {
+func createDefaultFirewall(apiClient *civogo.Client, networkID string, networkName string) error {
 
 	firewallConfig := civogo.FirewallConfig{
-		Name:      fmt.Sprintf("default-firewall-%s", networkID),
+		Name:      fmt.Sprintf("%s-default", networkName),
 		NetworkID: networkID,
 		Region:    apiClient.Region,
 	}