mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-11-04 04:31:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify GetProviderSpecificProperty

Browse Source
This commit is contained in:
John Gardiner Myers 2023-06-08 14:32:30 -07:00
parent 35f9a4602a
commit 4b15f20e76
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
endpoint/endpoint.go
View File

@ -230,14 +230,14 @@ func (e *Endpoint) WithProviderSpecific(key, value string) *Endpoint {
return e return e
} }
// GetProviderSpecificProperty returns a ProviderSpecificProperty if the property exists. // GetProviderSpecificProperty returns the value of a ProviderSpecificProperty if the property exists.
func (e *Endpoint) GetProviderSpecificProperty(key string) (ProviderSpecificProperty, bool) { func (e *Endpoint) GetProviderSpecificProperty(key string) (string, bool) {
for _, providerSpecific := range e.ProviderSpecific { for _, providerSpecific := range e.ProviderSpecific {
if providerSpecific.Name == key { if providerSpecific.Name == key {
return providerSpecific, true return providerSpecific.Value, true
} }
} }
return ProviderSpecificProperty{}, false return "", false
} }
func (e *Endpoint) String() string { func (e *Endpoint) String() string {

26
provider/aws/aws.go
View File

@ -668,7 +668,7 @@ func (p *AWSProvider) AdjustEndpoints(endpoints []*endpoint.Endpoint) []*endpoin
for _, ep := range endpoints { for _, ep := range endpoints {
alias := false alias := false
if aliasString, ok := ep.GetProviderSpecificProperty(providerSpecificAlias); ok { if aliasString, ok := ep.GetProviderSpecificProperty(providerSpecificAlias); ok {
alias = aliasString.Value == "true" alias = aliasString == "true"
} else if useAlias(ep, p.preferCNAME) { } else if useAlias(ep, p.preferCNAME) {
alias = true alias = true
log.Debugf("Modifying endpoint: %v, setting %s=true", ep, providerSpecificAlias) log.Debugf("Modifying endpoint: %v, setting %s=true", ep, providerSpecificAlias)
@ -706,7 +706,7 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C
if targetHostedZone := isAWSAlias(ep); targetHostedZone != "" { if targetHostedZone := isAWSAlias(ep); targetHostedZone != "" {
evalTargetHealth := p.evaluateTargetHealth evalTargetHealth := p.evaluateTargetHealth
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificEvaluateTargetHealth); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificEvaluateTargetHealth); ok {
evalTargetHealth = prop.Value == "true" evalTargetHealth = prop == "true"
} }
// If the endpoint has a Dualstack label, append a change for AAAA record as well. // If the endpoint has a Dualstack label, append a change for AAAA record as well.
if val, ok := ep.Labels[endpoint.DualstackLabelKey]; ok { if val, ok := ep.Labels[endpoint.DualstackLabelKey]; ok {
@ -737,18 +737,18 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C
if setIdentifier != "" { if setIdentifier != "" {
change.ResourceRecordSet.SetIdentifier = aws.String(setIdentifier) change.ResourceRecordSet.SetIdentifier = aws.String(setIdentifier)
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificWeight); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificWeight); ok {
weight, err := strconv.ParseInt(prop.Value, 10, 64) weight, err := strconv.ParseInt(prop, 10, 64)
if err != nil { if err != nil {
log.Errorf("Failed parsing value of %s: %s: %v; using weight of 0", providerSpecificWeight, prop.Value, err) log.Errorf("Failed parsing value of %s: %s: %v; using weight of 0", providerSpecificWeight, prop, err)
weight = 0 weight = 0
} }
change.ResourceRecordSet.Weight = aws.Int64(weight) change.ResourceRecordSet.Weight = aws.Int64(weight)
} }
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificRegion); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificRegion); ok {
change.ResourceRecordSet.Region = aws.String(prop.Value) change.ResourceRecordSet.Region = aws.String(prop)
} }
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificFailover); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificFailover); ok {
change.ResourceRecordSet.Failover = aws.String(prop.Value) change.ResourceRecordSet.Failover = aws.String(prop)
} }
if _, ok := ep.GetProviderSpecificProperty(providerSpecificMultiValueAnswer); ok { if _, ok := ep.GetProviderSpecificProperty(providerSpecificMultiValueAnswer); ok {
change.ResourceRecordSet.MultiValueAnswer = aws.Bool(true) change.ResourceRecordSet.MultiValueAnswer = aws.Bool(true)
@ -757,15 +757,15 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C
geolocation := &route53.GeoLocation{} geolocation := &route53.GeoLocation{}
useGeolocation := false useGeolocation := false
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationContinentCode); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationContinentCode); ok {
geolocation.ContinentCode = aws.String(prop.Value) geolocation.ContinentCode = aws.String(prop)
useGeolocation = true useGeolocation = true
} else { } else {
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationCountryCode); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationCountryCode); ok {
geolocation.CountryCode = aws.String(prop.Value) geolocation.CountryCode = aws.String(prop)
useGeolocation = true useGeolocation = true
} }
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationSubdivisionCode); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationSubdivisionCode); ok {
geolocation.SubdivisionCode = aws.String(prop.Value) geolocation.SubdivisionCode = aws.String(prop)
useGeolocation = true useGeolocation = true
} }
} }
@ -775,7 +775,7 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C
} }
if prop, ok := ep.GetProviderSpecificProperty(providerSpecificHealthCheckID); ok { if prop, ok := ep.GetProviderSpecificProperty(providerSpecificHealthCheckID); ok {
change.ResourceRecordSet.HealthCheckId = aws.String(prop.Value) change.ResourceRecordSet.HealthCheckId = aws.String(prop)
} }
if ownedRecord, ok := ep.Labels[endpoint.OwnedRecordLabelKey]; ok { if ownedRecord, ok := ep.Labels[endpoint.OwnedRecordLabelKey]; ok {
@ -989,13 +989,13 @@ func useAlias(ep *endpoint.Endpoint, preferCNAME bool) bool {
// isAWSAlias determines if a given endpoint is supposed to create an AWS Alias record // isAWSAlias determines if a given endpoint is supposed to create an AWS Alias record
// and (if so) returns the target hosted zone ID // and (if so) returns the target hosted zone ID
func isAWSAlias(ep *endpoint.Endpoint) string { func isAWSAlias(ep *endpoint.Endpoint) string {
prop, exists := ep.GetProviderSpecificProperty(providerSpecificAlias) isAlias, exists := ep.GetProviderSpecificProperty(providerSpecificAlias)
if exists && prop.Value == "true" && ep.RecordType == endpoint.RecordTypeCNAME && len(ep.Targets) > 0 { if exists && isAlias == "true" && ep.RecordType == endpoint.RecordTypeCNAME && len(ep.Targets) > 0 {
// alias records can only point to canonical hosted zones (e.g. to ELBs) or other records in the same zone // alias records can only point to canonical hosted zones (e.g. to ELBs) or other records in the same zone
if hostedZoneID, ok := ep.GetProviderSpecificProperty(providerSpecificTargetHostedZone); ok { if hostedZoneID, ok := ep.GetProviderSpecificProperty(providerSpecificTargetHostedZone); ok {
// existing Endpoint where we got the target hosted zone from the Route53 data // existing Endpoint where we got the target hosted zone from the Route53 data
return hostedZoneID.Value return hostedZoneID
} }
// check if the target is in a canonical hosted zone // check if the target is in a canonical hosted zone

4
provider/scaleway/scaleway.go
View File

@ -278,9 +278,9 @@ func endpointToScalewayRecords(zoneName string, ep *endpoint.Endpoint) []*domain
} }
priority := scalewayDefaultPriority priority := scalewayDefaultPriority
if prop, ok := ep.GetProviderSpecificProperty(scalewayPriorityKey); ok { if prop, ok := ep.GetProviderSpecificProperty(scalewayPriorityKey); ok {
prio, err := strconv.ParseUint(prop.Value, 10, 32) prio, err := strconv.ParseUint(prop, 10, 32)
if err != nil { if err != nil {
log.Errorf("Failed parsing value of %s: %s: %v; using priority of %d", scalewayPriorityKey, prop.Value, err, scalewayDefaultPriority) log.Errorf("Failed parsing value of %s: %s: %v; using priority of %d", scalewayPriorityKey, prop, err, scalewayDefaultPriority)
} else { } else {
priority = uint32(prio) priority = uint32(prio)
} }