mirror of
https://github.com/letic/terraform-provider-proxmox.git
synced 2024-07-01 07:02:40 +00:00
Better import method and error message
This commit is contained in:
parent
24a4408337
commit
a6163cec93
|
@ -130,10 +130,10 @@ func resourceId(targetNode string, resType string, vmId int) string {
|
|||
var rxRsId = regexp.MustCompile("([^/]+)/([^/]+)/(\\d+)")
|
||||
|
||||
func parseResourceId(resId string) (targetNode string, resType string, vmId int, err error) {
|
||||
idMatch := rxRsId.FindStringSubmatch(resId)
|
||||
if idMatch == nil {
|
||||
err = fmt.Errorf("Invalid resource id: %s", resId)
|
||||
if !rxRsId.MatchString(resId) {
|
||||
return "", "", -1, fmt.Errorf("Invalid resource format: %s. Must be node/type/vmId", resId)
|
||||
}
|
||||
idMatch := rxRsId.FindStringSubmatch(resId)
|
||||
targetNode = idMatch[1]
|
||||
resType = idMatch[2]
|
||||
vmId, err = strconv.Atoi(idMatch[3])
|
||||
|
|
|
@ -22,7 +22,7 @@ func resourceVmQemu() *schema.Resource {
|
|||
Update: resourceVmQemuUpdate,
|
||||
Delete: resourceVmQemuDelete,
|
||||
Importer: &schema.ResourceImporter{
|
||||
State: resourceVmQemuImport,
|
||||
State: schema.ImportStatePassthrough,
|
||||
},
|
||||
|
||||
Schema: map[string]*schema.Schema{
|
||||
|
@ -577,6 +577,7 @@ func resourceVmQemuRead(d *schema.ResourceData, meta interface{}) error {
|
|||
_, _, vmID, err := parseResourceId(d.Id())
|
||||
if err != nil {
|
||||
pmParallelEnd(pconf)
|
||||
d.SetId("")
|
||||
return err
|
||||
}
|
||||
vmr := pxapi.NewVmRef(vmID)
|
||||
|
@ -630,12 +631,6 @@ func resourceVmQemuRead(d *schema.ResourceData, meta interface{}) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func resourceVmQemuImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
|
||||
// TODO: research proper import
|
||||
err := resourceVmQemuRead(d, meta)
|
||||
return []*schema.ResourceData{d}, err
|
||||
}
|
||||
|
||||
func resourceVmQemuDelete(d *schema.ResourceData, meta interface{}) error {
|
||||
pconf := meta.(*providerConfiguration)
|
||||
pmParallelBegin(pconf)
|
||||
|
|
Loading…
Reference in New Issue
Block a user