Skip to content

Commit bcd4bd5

Browse files
committed
MINOR: log_targets: add defaults and global as parents
1 parent f7eac0c commit bcd4bd5

12 files changed

+172
-95
lines changed

embedded_spec.go

Lines changed: 40 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

handlers/log_target.go

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,22 @@ func (h *CreateLogTargetHandlerImpl) Handle(params log_target.CreateLogTargetPar
7474
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
7575
}
7676

77-
err := h.Client.Configuration.CreateLogTarget(params.ParentType, params.ParentName, params.Data, t, v)
77+
pName := ""
78+
if params.ParentType == "frontend" || params.ParentType == "backend" {
79+
if params.ParentName == nil {
80+
msg := "parent_name in query is required"
81+
c := misc.ErrHTTPBadRequest
82+
e := &models.Error{
83+
Message: &msg,
84+
Code: &c,
85+
}
86+
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
87+
} else {
88+
pName = *params.ParentName
89+
}
90+
}
91+
92+
err := h.Client.Configuration.CreateLogTarget(params.ParentType, pName, params.Data, t, v)
7893
if err != nil {
7994
e := misc.HandleError(err)
8095
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
@@ -116,7 +131,22 @@ func (h *DeleteLogTargetHandlerImpl) Handle(params log_target.DeleteLogTargetPar
116131
return log_target.NewDeleteLogTargetDefault(int(*e.Code)).WithPayload(e)
117132
}
118133

119-
err := h.Client.Configuration.DeleteLogTarget(params.Index, params.ParentType, params.ParentName, t, v)
134+
pName := ""
135+
if params.ParentType == "frontend" || params.ParentType == "backend" {
136+
if params.ParentName == nil {
137+
msg := "parent_name in query is required"
138+
c := misc.ErrHTTPBadRequest
139+
e := &models.Error{
140+
Message: &msg,
141+
Code: &c,
142+
}
143+
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
144+
} else {
145+
pName = *params.ParentName
146+
}
147+
}
148+
149+
err := h.Client.Configuration.DeleteLogTarget(params.Index, params.ParentType, pName, t, v)
120150
if err != nil {
121151
e := misc.HandleError(err)
122152
return log_target.NewDeleteLogTargetDefault(int(*e.Code)).WithPayload(e)
@@ -143,8 +173,22 @@ func (h *GetLogTargetHandlerImpl) Handle(params log_target.GetLogTargetParams, p
143173
if params.TransactionID != nil {
144174
t = *params.TransactionID
145175
}
176+
pName := ""
177+
if params.ParentType == "frontend" || params.ParentType == "backend" {
178+
if params.ParentName == nil {
179+
msg := "parent_name in query is required"
180+
c := misc.ErrHTTPBadRequest
181+
e := &models.Error{
182+
Message: &msg,
183+
Code: &c,
184+
}
185+
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
186+
} else {
187+
pName = *params.ParentName
188+
}
189+
}
146190

147-
v, logTarget, err := h.Client.Configuration.GetLogTarget(params.Index, params.ParentType, params.ParentName, t)
191+
v, logTarget, err := h.Client.Configuration.GetLogTarget(params.Index, params.ParentType, pName, t)
148192
if err != nil {
149193
e := misc.HandleError(err)
150194
return log_target.NewGetLogTargetDefault(int(*e.Code)).WithPayload(e).WithConfigurationVersion(v)
@@ -158,8 +202,22 @@ func (h *GetLogTargetsHandlerImpl) Handle(params log_target.GetLogTargetsParams,
158202
if params.TransactionID != nil {
159203
t = *params.TransactionID
160204
}
205+
pName := ""
206+
if params.ParentType == "frontend" || params.ParentType == "backend" {
207+
if params.ParentName == nil {
208+
msg := "parent_name in query is required"
209+
c := misc.ErrHTTPBadRequest
210+
e := &models.Error{
211+
Message: &msg,
212+
Code: &c,
213+
}
214+
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
215+
} else {
216+
pName = *params.ParentName
217+
}
218+
}
161219

162-
v, logTargets, err := h.Client.Configuration.GetLogTargets(params.ParentType, params.ParentName, t)
220+
v, logTargets, err := h.Client.Configuration.GetLogTargets(params.ParentType, pName, t)
163221
if err != nil {
164222
e := misc.HandleContainerGetError(err)
165223
if *e.Code == misc.ErrHTTPOk {
@@ -190,8 +248,22 @@ func (h *ReplaceLogTargetHandlerImpl) Handle(params log_target.ReplaceLogTargetP
190248
}
191249
return log_target.NewReplaceLogTargetDefault(int(*e.Code)).WithPayload(e)
192250
}
251+
pName := ""
252+
if params.ParentType == "frontend" || params.ParentType == "backend" {
253+
if params.ParentName == nil {
254+
msg := "parent_name in query is required"
255+
c := misc.ErrHTTPBadRequest
256+
e := &models.Error{
257+
Message: &msg,
258+
Code: &c,
259+
}
260+
return log_target.NewCreateLogTargetDefault(int(*e.Code)).WithPayload(e)
261+
} else {
262+
pName = *params.ParentName
263+
}
264+
}
193265

194-
err := h.Client.Configuration.EditLogTarget(params.Index, params.ParentType, params.ParentName, params.Data, t, v)
266+
err := h.Client.Configuration.EditLogTarget(params.Index, params.ParentType, pName, params.Data, t, v)
195267
if err != nil {
196268
e := misc.HandleError(err)
197269
return log_target.NewReplaceLogTargetDefault(int(*e.Code)).WithPayload(e)

operations/log_target/create_log_target_parameters.go

Lines changed: 6 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

operations/log_target/create_log_target_urlbuilder.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)