@@ -107,9 +107,7 @@ func listLoadBalancers(cloud fi.Cloud, clusterName string) ([]*resources.Resourc
107107 Name : loadBalancer .Name ,
108108 ID : loadBalancer .ID ,
109109 Type : resourceTypeLoadBalancer ,
110- Deleter : func (cloud fi.Cloud , tracker * resources.Resource ) error {
111- return deleteLoadBalancer (cloud , tracker )
112- },
110+ Deleter : deleteLoadBalancer ,
113111 Obj : loadBalancer ,
114112 }
115113 resourceTrackers = append (resourceTrackers , resourceTracker )
@@ -131,9 +129,7 @@ func listServers(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err
131129 Name : server .Name ,
132130 ID : server .ID ,
133131 Type : resourceTypeServer ,
134- Deleter : func (cloud fi.Cloud , tracker * resources.Resource ) error {
135- return deleteServer (cloud , tracker )
136- },
132+ Deleter : deleteServer ,
137133 Obj : server ,
138134 }
139135 resourceTrackers = append (resourceTrackers , resourceTracker )
@@ -159,9 +155,7 @@ func listServerIPs(cloud fi.Cloud, clusterName string) ([]*resources.Resource, e
159155 Name : ip .Address .String (),
160156 ID : ip .ID ,
161157 Type : resourceTypeServerIP ,
162- Deleter : func (cloud fi.Cloud , tracker * resources.Resource ) error {
163- return deleteServerIP (cloud , tracker )
164- },
158+ Deleter : deleteServerIP ,
165159 Obj : ip ,
166160 }
167161 resourceTrackers = append (resourceTrackers , resourceTracker )
@@ -183,9 +177,7 @@ func listSSHKeys(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err
183177 Name : sshkey .Name ,
184178 ID : sshkey .ID ,
185179 Type : resourceTypeSSHKey ,
186- Deleter : func (cloud fi.Cloud , tracker * resources.Resource ) error {
187- return deleteSSHKey (cloud , tracker )
188- },
180+ Deleter : deleteSSHKey ,
189181 Obj : sshkey ,
190182 }
191183 resourceTrackers = append (resourceTrackers , resourceTracker )
@@ -207,9 +199,7 @@ func listVolumes(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err
207199 Name : volume .Name ,
208200 ID : volume .ID ,
209201 Type : resourceTypeVolume ,
210- Deleter : func (cloud fi.Cloud , tracker * resources.Resource ) error {
211- return deleteVolume (cloud , tracker )
212- },
202+ Deleter : deleteVolume ,
213203 Obj : volume ,
214204 }
215205 if volume .Server != nil {
0 commit comments