Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(registry): support all "managed" record types #4342

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(registry): support all "managed" record types #4342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion registry/dynamodb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func NewDynamoDBRegistry(provider provider.Provider, ownerID string, dynamodbAPI
return nil, errors.New("txt-prefix and txt-suffix are mutually exclusive")
}

mapper := newaffixNameMapper(txtPrefix, txtSuffix, txtWildcardReplacement)
mapper := newaffixNameMapper(txtPrefix, txtSuffix, txtWildcardReplacement, managedRecordTypes)

return &DynamoDBRegistry{
provider: provider,
Expand Down
26 changes: 14 additions & 12 deletions registry/txt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewTXTRegistry(provider provider.Provider, txtPrefix, txtSuffix, ownerID st
return nil, errors.New("txt-prefix and txt-suffix are mutual exclusive")
}

mapper := newaffixNameMapper(txtPrefix, txtSuffix, txtWildcardReplacement)
mapper := newaffixNameMapper(txtPrefix, txtSuffix, txtWildcardReplacement, managedRecordTypes)

return &TXTRegistry{
provider: provider,
Expand All @@ -91,10 +91,6 @@ func NewTXTRegistry(provider provider.Provider, txtPrefix, txtSuffix, ownerID st
}, nil
}

func getSupportedTypes() []string {
return []string{endpoint.RecordTypeA, endpoint.RecordTypeAAAA, endpoint.RecordTypeCNAME, endpoint.RecordTypeNS}
}

func (im *TXTRegistry) GetDomainFilter() endpoint.DomainFilter {
return im.provider.GetDomainFilter()
}
Expand Down Expand Up @@ -322,19 +318,25 @@ type affixNameMapper struct {
prefix string
suffix string
wildcardReplacement string
managedRecordTypes []string
}

var _ nameMapper = affixNameMapper{}

func newaffixNameMapper(prefix, suffix, wildcardReplacement string) affixNameMapper {
return affixNameMapper{prefix: strings.ToLower(prefix), suffix: strings.ToLower(suffix), wildcardReplacement: strings.ToLower(wildcardReplacement)}
func newaffixNameMapper(prefix, suffix, wildcardReplacement string, managedRecordTypes []string) affixNameMapper {
return affixNameMapper{
prefix: strings.ToLower(prefix),
suffix: strings.ToLower(suffix),
wildcardReplacement: strings.ToLower(wildcardReplacement),
managedRecordTypes: managedRecordTypes,
}
}

// extractRecordTypeDefaultPosition extracts record type from the default position
// when not using '%{record_type}' in the prefix/suffix
func extractRecordTypeDefaultPosition(name string) (baseName, recordType string) {
func (pr affixNameMapper) extractRecordTypeDefaultPosition(name string) (baseName, recordType string) {
nameS := strings.Split(name, "-")
for _, t := range getSupportedTypes() {
for _, t := range pr.managedRecordTypes {
if nameS[0] == strings.ToLower(t) {
return strings.TrimPrefix(name, nameS[0]+"-"), t
}
Expand All @@ -349,7 +351,7 @@ func (pr affixNameMapper) dropAffixExtractType(name string) (baseName, recordTyp
suffix := pr.suffix

if pr.recordTypeInAffix() {
for _, t := range getSupportedTypes() {
for _, t := range pr.managedRecordTypes {
tLower := strings.ToLower(t)
iPrefix := strings.ReplaceAll(prefix, recordTemplate, tLower)
iSuffix := strings.ReplaceAll(suffix, recordTemplate, tLower)
Expand All @@ -369,11 +371,11 @@ func (pr affixNameMapper) dropAffixExtractType(name string) (baseName, recordTyp
}

if pr.isPrefix() && strings.HasPrefix(name, prefix) {
return extractRecordTypeDefaultPosition(strings.TrimPrefix(name, prefix))
return pr.extractRecordTypeDefaultPosition(strings.TrimPrefix(name, prefix))
}

if pr.isSuffix() && strings.HasSuffix(name, suffix) {
return extractRecordTypeDefaultPosition(strings.TrimSuffix(name, suffix))
return pr.extractRecordTypeDefaultPosition(strings.TrimSuffix(name, suffix))
}

return "", ""
Expand Down
Loading