Merge pull request #1741 from ioito/automated-cherry-pick-of-#1738-upstream-release-4.0.2

Automated cherry pick of #1738: fix(aws): dns record create with id

Author: ioito

pkg/multicloud/aws/dnsrecord.go

@@ -33,16 +33,18 @@ type SAliasTarget struct {
 	HostedZoneId         string `xml:"HostedZoneId"`
 }
 
+type SResourceRecord struct {
+	Value string `xml:"Value"`
+}
+
 type SDnsRecord struct {
 	multicloud.SDnsRecordBase
 	zone *SDnsZone
 
-	Name            string `xml:"Name"`
-	Type            string `xml:"Type"`
-	TTL             int64  `xml:"TTL"`
-	ResourceRecords []struct {
-		Value string `xml:"Value"`
-	} `xml:"ResourceRecords>ResourceRecord"`
+	Name            string            `xml:"Name"`
+	Type            string            `xml:"Type"`
+	TTL             int64             `xml:"TTL"`
+	ResourceRecords []SResourceRecord `xml:"ResourceRecords>ResourceRecord"`
 
 	AliasTarget             SAliasTarget       `xml:"AliasTarget"`
 	GeoLocation             GeoLocationDetails `xml:"GeoLocation"`
@@ -113,14 +115,13 @@ func (self *SDnsRecord) Delete() error {
 	for _, r := range self.ResourceRecords {
 		values = append(values, r.Value)
 	}
-	_, err := self.zone.client.ChangeResourceRecordSets("DELETE", self.zone.Id, self.Name, self.SetIdentifier, cloudprovider.DnsRecord{
+	return self.zone.client.ChangeResourceRecordSets("DELETE", self.zone.Id, self.Name, self.SetIdentifier, cloudprovider.DnsRecord{
 		DnsType:     cloudprovider.TDnsType(self.Type),
 		Ttl:         self.TTL,
 		DnsValue:    strings.Join(values, "\n"),
 		PolicyType:  self.GetPolicyType(),
 		PolicyValue: self.GetPolicyValue(),
 	})
-	return err
 }
 
 func (self *SDnsRecord) GetDnsType() cloudprovider.TDnsType {
@@ -199,7 +200,7 @@ func (self *SDnsRecord) GetMxPriority() int64 {
 	return 0
 }
 
-func (self *SAwsClient) ChangeResourceRecordSets(action, zoneId, name, id string, opts cloudprovider.DnsRecord) (string, error) {
+func (self *SAwsClient) ChangeResourceRecordSets(action, zoneId, name, id string, opts cloudprovider.DnsRecord) error {
 	record := &SDnsRecord{Name: id, Type: string(opts.DnsType)}
 	params := map[string]string{
 		"Id":                                  zoneId,
@@ -234,7 +235,7 @@ func (self *SAwsClient) ChangeResourceRecordSets(action, zoneId, name, id string
 	case cloudprovider.DnsPolicyTypeByGeoLocation:
 		locations, err := self.ListGeoLocations()
 		if err != nil {
-			return "", errors.Wrapf(err, "ListGeoLocations")
+			return errors.Wrapf(err, "ListGeoLocations")
 		}
 		find := false
 		for i := range locations {
@@ -252,27 +253,18 @@ func (self *SAwsClient) ChangeResourceRecordSets(action, zoneId, name, id string
 			}
 		}
 		if !find {
-			return "", errors.Errorf("invalid policy value %s %s", opts.PolicyType, opts.PolicyValue)
+			return errors.Errorf("invalid policy value %s %s", opts.PolicyType, opts.PolicyValue)
 		}
 	case cloudprovider.DnsPolicyTypeFailover:
-		return "", cloudprovider.ErrNotImplemented
+		return cloudprovider.ErrNotImplemented
 	case cloudprovider.DnsPolicyTypeWeighted:
 		params["ChangeBatch.Changes.0.Change.ResourceRecordSet.Weight"] = string(opts.PolicyValue)
 	case cloudprovider.DnsPolicyTypeMultiValueAnswer:
 		params["ChangeBatch.Changes.0.Change.ResourceRecordSet.MultiValueAnswer"] = "true"
 	case cloudprovider.DnsPolicyTypeLatency:
 		params["ChangeBatch.Changes.0.Change.ResourceRecordSet.Region"] = string(opts.PolicyValue)
 	}
-	ret := struct {
-		ChangeInfo struct {
-			Id string `xml:"Id"`
-		} `xml:"ChangeInfo"`
-	}{}
-	err := self.dnsRequest("ChangeResourceRecordSets", params, &ret)
-	if err != nil {
-		return "", err
-	}
-	return record.GetGlobalId(), nil
+	return self.dnsRequest("ChangeResourceRecordSets", params, nil)
 }
 
 // trafficpolicy 信息
@@ -339,6 +331,5 @@ func (self *SDnsRecord) Disable() error {
 }
 
 func (self *SDnsRecord) Update(opts *cloudprovider.DnsRecord) error {
-	_, err := self.zone.client.ChangeResourceRecordSets("UPSERT", self.zone.Id, self.Name, self.SetIdentifier, *opts)
-	return err
+	return self.zone.client.ChangeResourceRecordSets("UPSERT", self.zone.Id, self.Name, self.SetIdentifier, *opts)
 }

pkg/multicloud/aws/dnszone.go

@@ -340,8 +340,20 @@ func (self *SDnsZone) AddDnsRecord(opts *cloudprovider.DnsRecord) (string, error
 	if len(opts.DnsName) > 1 && opts.DnsName != "@" {
 		name = opts.DnsName + "." + self.Name
 	}
-	id := stringutils.UUID4()
-	return self.client.ChangeResourceRecordSets("CREATE", self.Id, name, id, *opts)
+	id := ""
+	if opts.PolicyType != cloudprovider.DnsPolicyTypeSimple {
+		id = stringutils.UUID4()
+	}
+	err := self.client.ChangeResourceRecordSets("CREATE", self.Id, name, id, *opts)
+	if err != nil {
+		return "", errors.Wrapf(err, "ChangeResourceRecordSets")
+	}
+	record := &SDnsRecord{Name: name, Type: string(opts.DnsType), SetIdentifier: id}
+	record.ResourceRecords = []SResourceRecord{
+		{Value: opts.DnsValue},
+	}
+	record.zone = self
+	return record.GetGlobalId(), nil
 }
 
 func (self *SDnsZone) GetDnsProductType() cloudprovider.TDnsProductType {

pkg/multicloud/aws/shell/dnszone.go

@@ -142,8 +142,7 @@ func init() {
 		opts.DnsType = cloudprovider.TDnsType(args.TYPE)
 		opts.DnsValue = args.VALUE
 		opts.Ttl = args.TTL
-		_, err := cli.GetClient().ChangeResourceRecordSets("CREATE", args.HOSTEDZONEID, args.NAME, args.Id, opts)
-		return err
+		return cli.GetClient().ChangeResourceRecordSets("CREATE", args.HOSTEDZONEID, args.NAME, args.Id, opts)
 	})
 
 	type DnsRecordSetupdateOptions struct {
@@ -160,8 +159,7 @@ func init() {
 		opts.DnsType = cloudprovider.TDnsType(args.TYPE)
 		opts.DnsValue = args.VALUE
 		opts.Ttl = args.TTL
-		_, err := cli.GetClient().ChangeResourceRecordSets("UPSERT", args.HOSTEDZONEID, args.NAME, args.Identify, opts)
-		return err
+		return cli.GetClient().ChangeResourceRecordSets("UPSERT", args.HOSTEDZONEID, args.NAME, args.Identify, opts)
 	})
 
 	type DnsRecordDeleteOptions struct {
@@ -170,8 +168,7 @@ func init() {
 		cloudprovider.DnsRecord
 	}
 	shellutils.R(&DnsRecordDeleteOptions{}, "dns-record-delete", "delete dnsrecordset", func(cli *aws.SRegion, args *DnsRecordDeleteOptions) error {
-		_, err := cli.GetClient().ChangeResourceRecordSets("DELETE", args.HOSTEDZONEID, args.DnsName, args.ID, args.DnsRecord)
-		return err
+		return cli.GetClient().ChangeResourceRecordSets("DELETE", args.HOSTEDZONEID, args.DnsName, args.ID, args.DnsRecord)
 	})
 
 }