Skip to content

Commit 25cceec

Browse files
committed
Fix rendering order
1 parent a91692f commit 25cceec

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

run/services/service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,14 +574,14 @@ func (s *nativeService) Start(ctx context.Context) error {
574574
return err
575575
}
576576

577-
// Render configs
578-
err = s.renderConfigs()
577+
// Render certificates
578+
err = s.renderCertificates()
579579
if err != nil {
580580
return err
581581
}
582582

583-
// Render certificates
584-
err = s.renderCertificates()
583+
// Render configs
584+
err = s.renderConfigs()
585585
if err != nil {
586586
return err
587587
}

run/services/template/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (t *nativeTemplate) RenderToWriter(content string, params parameters.Parame
9797
}
9898
configs := t.service.EnvironmentConfigPaths()
9999
if configs == nil {
100-
return errors.Errorf("service configs are not set")
100+
configs = make(map[string]string)
101101
}
102102

103103
data := &Data{

run/services/template/template_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,19 @@ func Test_nativeTemplate_RenderToWriter(t *testing.T) {
250250
},
251251
expected: "Hello, inc:pk:pv!",
252252
},
253+
{
254+
name: "Config not set default",
255+
templateStr: "Hello",
256+
setupFunc: func(
257+
fm *appMocks.MockFoundation,
258+
sm *serviceMocks.MockTemplateService,
259+
st templates.Templates,
260+
) (parameters.Parameters, Services) {
261+
sm.On("EnvironmentConfigPaths").Return(nil)
262+
return nil, nil
263+
},
264+
expected: "Hello",
265+
},
253266
{
254267
name: "Error due to service private url",
255268
templateStr: "{{ .Service.PrivateUrl }};{{ .Service.Pid }}",
@@ -281,20 +294,6 @@ func Test_nativeTemplate_RenderToWriter(t *testing.T) {
281294
expectErr: true,
282295
errMsg: "can't evaluate field Wrong in type *template.Data",
283296
},
284-
{
285-
name: "Config error",
286-
templateStr: "Hello",
287-
setupFunc: func(
288-
fm *appMocks.MockFoundation,
289-
sm *serviceMocks.MockTemplateService,
290-
st templates.Templates,
291-
) (parameters.Parameters, Services) {
292-
sm.On("EnvironmentConfigPaths").Return(nil)
293-
return nil, nil
294-
},
295-
expectErr: true,
296-
errMsg: "configs are not set",
297-
},
298297
{
299298
name: "Parsing error",
300299
templateStr: "Hello, {{ .Wrong",

0 commit comments

Comments
 (0)