fix: wait has wrong order of error message params
[skip ci]
This commit is contained in:
parent
e8c6d0b42d
commit
d1267260cb
2 changed files with 4 additions and 4 deletions
|
|
@ -636,7 +636,7 @@ func defaultEncInstanceTestChecks(testItemID string, data resData) resource.Test
|
||||||
resource.TestCheckResourceAttrSet(testItemID, "network.router_address"),
|
resource.TestCheckResourceAttrSet(testItemID, "network.router_address"),
|
||||||
|
|
||||||
// check absent attr
|
// check absent attr
|
||||||
resource.TestCheckResourceAttrSet(testItemID, "encryption"),
|
resource.TestCheckResourceAttr(testItemID, "encryption.%", "4"),
|
||||||
resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_id"),
|
resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_id"),
|
||||||
resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_id", data.KekKeyID),
|
resource.TestCheckResourceAttr(testItemID, "encryption.kek_key_id", data.KekKeyID),
|
||||||
resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_ring_id"),
|
resource.TestCheckResourceAttrSet(testItemID, "encryption.kek_key_ring_id"),
|
||||||
|
|
|
||||||
|
|
@ -147,8 +147,8 @@ func CreateInstanceWaitHandler(
|
||||||
}
|
}
|
||||||
return true, s, fmt.Errorf(
|
return true, s, fmt.Errorf(
|
||||||
"update got status FAILURE for instance with id %s after %d retries",
|
"update got status FAILURE for instance with id %s after %d retries",
|
||||||
failedCount,
|
|
||||||
instanceId,
|
instanceId,
|
||||||
|
failedCount,
|
||||||
)
|
)
|
||||||
// API responds with FAILURE for some seconds and then the instance goes to READY
|
// API responds with FAILURE for some seconds and then the instance goes to READY
|
||||||
// return true, s, fmt.Errorf("create failed for instance with id %s", instanceId)
|
// return true, s, fmt.Errorf("create failed for instance with id %s", instanceId)
|
||||||
|
|
@ -223,8 +223,8 @@ func PartialUpdateInstanceWaitHandler(
|
||||||
}
|
}
|
||||||
return true, s, fmt.Errorf(
|
return true, s, fmt.Errorf(
|
||||||
"update got status FAILURE for instance with id %s after %d retries",
|
"update got status FAILURE for instance with id %s after %d retries",
|
||||||
failedCount,
|
|
||||||
instanceID,
|
instanceID,
|
||||||
|
failedCount,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -352,7 +352,7 @@ func DeleteInstanceWaitHandler(
|
||||||
"failedCount": failedCount,
|
"failedCount": failedCount,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
time.Sleep(5 * time.Second)
|
time.Sleep(time.Duration(rand.IntN(120)) * time.Second) //nolint:gosec // not that important and temporary
|
||||||
return false, nil, nil
|
return false, nil, nil
|
||||||
}
|
}
|
||||||
return true, nil, fmt.Errorf("wait handler got status FAILURE for instance: %s", instanceID)
|
return true, nil, fmt.Errorf("wait handler got status FAILURE for instance: %s", instanceID)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue