TRANSIP: Fixed integration tests: Edge cases and TXT records fixed#2673
Merged
tlimoncelli merged 7 commits intoStackExchange:masterfrom Dec 4, 2023
Merged
Conversation
- Remove slashes on quoted strings - Add A records to integration tests which were missing a base record
Instead of deleting the whole record set first and recreating it after. Now the New and Old record set get's compared and only new records get created, old records get removed.
changes will not cause issues
blackshadev
changed the title
tlimoncelli
reviewed
Dec 4, 2023
models/slashes_test.go
Outdated
|
|
||
| data := [][]string{ | ||
| { | ||
| "quote\"d", "quote\"d", |
Contributor
There was a problem hiding this comment.
These would be more clear if they were quoted using backticks
Collaborator
Author
There was a problem hiding this comment.
fixed. I didn't know backticks would be literals (with backslash escape sequences). I did the same for the regex to make it more readable
models/slashes.go
Outdated
| ) | ||
|
|
||
| func RemoveSlashes(s string) string { | ||
| m := regexp.MustCompile("(?:\\\\(\\\\)+)|(?:\\\\)") |
Contributor
There was a problem hiding this comment.
MustCompile should be at the global level.
removeSlashesRE := regexp.MustCompile("(?:\\\\(\\\\)+)|(?:\\\\)")
func RemoveSlashes...
return removeSlashesRE.ReplaceAllStrings(s, "$1")
Collaborator
Author
There was a problem hiding this comment.
Ok, done. Go didn't accept removeSlashesRE := regexp.MustCompile("(?:\\\\(\\\\)+)|(?:\\\\)"). But did accept var removeSlashesRE = regexp.MustCompile("(?:\\\\(\\\\)+)|(?:\\\\)")
providers/transip/transipProvider.go
Outdated
| return fmt.Sprintf("%d %d %d %s", rc.SrvPriority, rc.SrvWeight, rc.SrvPort, rc.GetTargetField()) | ||
| default: | ||
| return models.StripQuotes(rc.GetTargetCombined()) | ||
| return models.RemoveSlashes(models.StripQuotes(rc.GetTargetCombined())) |
Contributor
There was a problem hiding this comment.
Is models.RemoveSlashes() only needed to TXT records? If so, move that to a case "TXT" statement.
Collaborator
Author
There was a problem hiding this comment.
I believe so... added it.
models/slashes.go
Outdated
| @@ -0,0 +1,10 @@ | |||
| package models | |||
Contributor
There was a problem hiding this comment.
Please move this to providers/transip. While this function seems re-usable by other providers, I'd rather have each provider be independent as much as possible.
Collaborator
Author
There was a problem hiding this comment.
My thinking was that I couldn't be the only one with these issues. But I made it local to transip as per request.
Contributor
|
All passed! Merging. |
tlimoncelli
changed the title
tlimoncelli
approved these changes
Dec 4, 2023
Contributor
|
Thanks! |
tlimoncelli
added a commit
that referenced
this pull request
Dec 4, 2023
…2673) Co-authored-by: Tom Limoncelli <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Fixes integration tests for trans IP. Fixes #2670 and fixes #2330