Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
k8s-crt-dnldr
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
k8s
k8s-crt-dnldr
Commits
caff6337
Commit
caff6337
authored
Jul 23, 2020
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix REST server mux for /v1/pems*.
parent
3475cc7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
handlers.go
pkg/rest/handlers.go
+2
-2
server.go
pkg/rest/server.go
+6
-3
No files found.
pkg/rest/handlers.go
View file @
caff6337
...
@@ -46,7 +46,7 @@ const (
...
@@ -46,7 +46,7 @@ const (
)
)
var
(
var
(
pemsRegex
=
regexp
.
MustCompile
(
"^"
+
pemsPfx
+
"
/
([^/]+)/([^/]+)$"
)
pemsRegex
=
regexp
.
MustCompile
(
"^"
+
pemsPfx
+
"([^/]+)/([^/]+)$"
)
allowedHealthz
=
map
[
string
]
struct
{}{
allowedHealthz
=
map
[
string
]
struct
{}{
http
.
MethodGet
:
struct
{}{},
http
.
MethodGet
:
struct
{}{},
...
@@ -130,7 +130,7 @@ func (h *pemsHndlr) allPems(
...
@@ -130,7 +130,7 @@ func (h *pemsHndlr) allPems(
func
(
h
*
pemsHndlr
)
ServeHTTP
(
resp
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
func
(
h
*
pemsHndlr
)
ServeHTTP
(
resp
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
now
:=
time
.
Now
()
now
:=
time
.
Now
()
if
req
.
URL
.
Path
==
pems
Pfx
{
if
req
.
URL
.
Path
==
pems
All
{
h
.
allPems
(
resp
,
req
,
now
)
h
.
allPems
(
resp
,
req
,
now
)
return
return
}
}
...
...
pkg/rest/server.go
View file @
caff6337
...
@@ -43,7 +43,8 @@ import (
...
@@ -43,7 +43,8 @@ import (
const
(
const
(
healthzPath
=
"/v1/healthz"
healthzPath
=
"/v1/healthz"
pemsPfx
=
"/v1/pems"
pemsPfx
=
"/v1/pems/"
pemsAll
=
"/v1/pems"
)
)
// Server encapsulates the HTTP server for the REST API.
// Server encapsulates the HTTP server for the REST API.
...
@@ -158,11 +159,13 @@ func (srv *Server) Start() error {
...
@@ -158,11 +159,13 @@ func (srv *Server) Start() error {
log
:
srv
.
log
,
log
:
srv
.
log
,
version
:
srv
.
version
,
version
:
srv
.
version
,
})
})
mux
.
Handle
(
pemsPfx
,
&
pemsHndlr
{
pemsHandler
:=
&
pemsHndlr
{
log
:
srv
.
log
,
log
:
srv
.
log
,
files
:
srv
.
files
,
files
:
srv
.
files
,
crtGetter
:
srv
.
crtGetter
,
crtGetter
:
srv
.
crtGetter
,
})
}
mux
.
Handle
(
pemsPfx
,
pemsHandler
)
mux
.
Handle
(
pemsAll
,
pemsHandler
)
srv
.
server
=
http
.
Server
{
Handler
:
mux
}
srv
.
server
=
http
.
Server
{
Handler
:
mux
}
go
func
()
{
go
func
()
{
if
err
:=
srv
.
server
.
Serve
(
lsnr
);
err
!=
nil
{
if
err
:=
srv
.
server
.
Serve
(
lsnr
);
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment