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

Add new redirect objects #226

Merged
merged 9 commits into from
May 31, 2024
Merged

Add new redirect objects #226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9aab86f
PENG-3135: add redirect, fixes
fformica Jan 29, 2024
27587a3
Change not found handling
fformica Jan 29, 2024
1e09b24
Merge remote-tracking branch 'origin/v2' into PENG-3135/add_redirect
fformica Mar 7, 2024
ca8c96d
PENG-3135: Update object definitions
fformica Mar 7, 2024
9918bc0
Merge branch 'v2' into PENG-3135/add_redirect
fformica Mar 8, 2024
a4a0819
Merge remote-tracking branch 'origin/v2' into PENG-3135/add_redirect
fformica May 23, 2024
d0cdbc6
Fix cert pagination, add links to docs
fformica May 23, 2024
15fdbce
Merge branch 'PENG-3135/add_redirect' of github.com:ns1/ns1-go into P…
fformica May 23, 2024
1bfb115
Use goimports in place of the old golint
fformica May 23, 2024
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
Prev Previous commit
Next Next commit
Change not found handling
  • Loading branch information
@fformica
fformica committed Jan 29, 2024
commit 27587a3a930b8457be9631b627f005b990d8c7c8
7 changes: 4 additions & 3 deletions rest/redirect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"net/http"
"strings"

"gopkg.in/ns1/ns1-go.v2/rest/model/redirect"
)
Expand Down Expand Up @@ -51,7 +52,7 @@ func (s *RedirectService) Get(cfgId string) (*redirect.Configuration, *http.Resp
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "configuration not found" {
if strings.HasSuffix(err.Message, " not found") {
return nil, resp, ErrRedirectNotFound
}
}
Expand Down Expand Up @@ -109,7 +110,7 @@ func (s *RedirectService) Update(cfg *redirect.Configuration) (*redirect.Configu
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "configuration not found" {
if strings.HasSuffix(err.Message, " not found") {
return nil, resp, ErrRedirectNotFound
}
}
Expand All @@ -134,7 +135,7 @@ func (s *RedirectService) Delete(cfgId string) (*http.Response, error) {
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "configuration not found" {
if strings.HasSuffix(err.Message, " not found") {
return resp, ErrRedirectNotFound
}
}
Expand Down
7 changes: 4 additions & 3 deletions rest/redirect_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"net/http"
"strings"

"gopkg.in/ns1/ns1-go.v2/rest/model/redirect"
)
Expand Down Expand Up @@ -51,7 +52,7 @@ func (s *RedirectCertificateService) Get(certId string) (*redirect.Certificate,
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "certificate not found" {
if strings.HasSuffix(err.Message, " not found") {
return nil, resp, ErrRedirectCertificateNotFound
}
}
Expand Down Expand Up @@ -104,7 +105,7 @@ func (s *RedirectCertificateService) Update(certId string) (*http.Response, erro
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "certificate not found" {
if strings.HasSuffix(err.Message, " not found") {
return resp, ErrRedirectCertificateNotFound
}
}
Expand All @@ -129,7 +130,7 @@ func (s *RedirectCertificateService) Delete(certId string) (*http.Response, erro
if err != nil {
switch err := err.(type) {
case *Error:
if err.Message == "certificate not found" {
if strings.HasSuffix(err.Message, " not found") {
return resp, ErrRedirectCertificateNotFound
}
}
Expand Down
Loading