Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
202422d9
Unverified
Commit
202422d9
authored
3 years ago
by
Charlie Voiselle
Browse files
Options
Download
Email Patches
Plain Diff
Fixup: Make SecureVariables RPC endpoint static
parent
ed2dbe9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
nomad/server.go
+1
-3
nomad/server.go
with
1 addition
and
3 deletions
+1
-3
nomad/server.go
+
1
-
3
View file @
202422d9
...
...
@@ -1171,6 +1171,7 @@ func (s *Server) setupRpcServer(server *rpc.Server, ctx *RPCContext) error {
s
.
staticEndpoints
.
System
=
&
System
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"system"
)}
s
.
staticEndpoints
.
Search
=
&
Search
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"search"
)}
s
.
staticEndpoints
.
Namespace
=
&
Namespace
{
srv
:
s
}
s
.
staticEndpoints
.
SecureVariables
=
&
SecureVariables
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"secure_variables"
),
encrypter
:
encrypter
}
s
.
staticEndpoints
.
Enterprise
=
NewEnterpriseEndpoints
(
s
)
...
...
@@ -1181,7 +1182,6 @@ func (s *Server) setupRpcServer(server *rpc.Server, ctx *RPCContext) error {
s
.
staticEndpoints
.
Deployment
=
&
Deployment
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"deployment"
)}
s
.
staticEndpoints
.
Node
=
&
Node
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"client"
)}
s
.
staticEndpoints
.
ServiceRegistration
=
&
ServiceRegistration
{
srv
:
s
}
s
.
staticEndpoints
.
SecureVariables
=
&
SecureVariables
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"secure_variables"
),
encrypter
:
encrypter
}
// Client endpoints
s
.
staticEndpoints
.
ClientStats
=
&
ClientStats
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"client_stats"
)}
...
...
@@ -1229,7 +1229,6 @@ func (s *Server) setupRpcServer(server *rpc.Server, ctx *RPCContext) error {
node
:=
&
Node
{
srv
:
s
,
ctx
:
ctx
,
logger
:
s
.
logger
.
Named
(
"client"
)}
plan
:=
&
Plan
{
srv
:
s
,
ctx
:
ctx
,
logger
:
s
.
logger
.
Named
(
"plan"
)}
serviceReg
:=
&
ServiceRegistration
{
srv
:
s
,
ctx
:
ctx
}
variablesReg
:=
&
SecureVariables
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"secure_variables"
),
encrypter
:
encrypter
,
ctx
:
ctx
}
keyringReg
:=
&
Keyring
{
srv
:
s
,
logger
:
s
.
logger
.
Named
(
"keyring"
),
encrypter
:
encrypter
}
// Register the dynamic endpoints
...
...
@@ -1239,7 +1238,6 @@ func (s *Server) setupRpcServer(server *rpc.Server, ctx *RPCContext) error {
server
.
Register
(
node
)
server
.
Register
(
plan
)
_
=
server
.
Register
(
serviceReg
)
_
=
server
.
Register
(
variablesReg
)
_
=
server
.
Register
(
keyringReg
)
return
nil
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help