opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

dnsrecords: allow updating only description

Browse Source 
This commit includes the following changes

 - Eliminate unused arguments from validateModelData()
 - Remove "records" member of input data unconditionally
 - Allow updates to not include records related parameters, to allow
   updating only "description" without emitting "Empty record" error
This commit is contained in:
Yousong Zhou
2020-05-06 18:39:39 +08:00
parent 06abfccbbc
commit 2f056b9ef0
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dnsrecords.go
+24 -24
View File
@@ -284,35 +284,38 @@ func (man *SDnsRecordManager) checkRecordValue(typ, val string) error {
func (man *SDnsRecordManager) validateModelData(
ctx context.Context,
userCred mcclient.TokenCredential,
ownerId mcclient.IIdentityProvider,
query jsonutils.JSONObject,
data *jsonutils.JSONDict,
) (*jsonutils.JSONDict, error) {
records, err := man.ParseInputInfo(data)
isCreate bool,
) (records []string, err error) {
data.Remove("records")
records, err = man.ParseInputInfo(data)
if err != nil {
return nil, err
return
}
if len(records) == 0 {
return nil, httperrors.NewInputParameterError("Empty record")
if isCreate {
err = httperrors.NewInputParameterError("Empty record")
return
}
return
}
recType := man.getRecordsType(records)
name, err := data.GetString("name")
if err != nil {
return nil, err
return
}
err = man.checkRecordName(recType, name)
if err != nil {
return nil, err
return
}
if data.Contains("ttl") {
jo, err := data.Get("ttl")
var (
ttl int64
)
ttl, err = data.Int("ttl")
if err != nil {
return nil, err
}
ttl, err := jo.Int()
if err != nil {
return nil, httperrors.NewInputParameterError("invalid ttl: %s", err)
err = httperrors.NewInputParameterError("invalid ttl: %s", err)
return
}
if ttl == 0 {
// - Create: use the database default
@@ -320,10 +323,11 @@ func (man *SDnsRecordManager) validateModelData(
data.Remove("ttl")
} else if ttl < 0 || ttl > 0x7fffffff {
// positive values of a signed 32 bit number.
return nil, httperrors.NewInputParameterError("invalid ttl: %d", ttl)
err = httperrors.NewInputParameterError("invalid ttl: %d", ttl)
return
}
}
return data, err
return records, nil
}
func (man *SDnsRecordManager) ValidateCreateData(
@@ -333,7 +337,7 @@ func (man *SDnsRecordManager) ValidateCreateData(
query jsonutils.JSONObject,
data *jsonutils.JSONDict,
) (*jsonutils.JSONDict, error) {
data, err := man.validateModelData(ctx, userCred, ownerId, query, data)
_, err := man.validateModelData(ctx, data, true)
if err != nil {
return nil, err
}
@@ -410,15 +414,11 @@ func (rec *SDnsRecord) GetInfo() []string {
func (rec *SDnsRecord) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
data.UpdateDefault(jsonutils.Marshal(rec))
data, err := DnsRecordManager.validateModelData(ctx, userCred, rec.GetOwnerId(), query, data)
records, err := DnsRecordManager.validateModelData(ctx, data, false)
if err != nil {
return nil, err
}
{
records, err := DnsRecordManager.ParseInputInfo(data)
if err != nil {
return nil, err
}
if len(records) > 0 {
data.Set("records", jsonutils.NewString(strings.Join(records, DNS_RECORDS_SEPARATOR)))
}
input := apis.AdminSharableVirtualResourceBaseUpdateInput{}