@@ -698,16 +698,19 @@ generate_controller(Name, _Flags) ->
698698
699699generate_dev_sys_config (Name , Flags ) ->
700700 Path = filename :join ([Name , " config" , " dev_sys.config.src" ]),
701- Content = [
702- " %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-\n\n " ,
703- " [\n " ,
701+ Sections = [S || S <- [
704702 sys_config_kernel (dev , Flags ),
705703 sys_config_nova (Name , dev , Flags ),
706704 sys_config_app (Name , dev , Flags ),
707705 sys_config_pgo (Name , dev , Flags ),
708706 sys_config_arizona (Name , dev , Flags ),
709- sys_config_otel (dev , Flags ),
710- " ].\n "
707+ sys_config_otel (dev , Flags )
708+ ], S =/= []],
709+ Content = [
710+ " %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-\n\n " ,
711+ " [\n " ,
712+ lists :join (" ,\n " , Sections ),
713+ " \n ].\n "
711714 ],
712715 rebar3_nova_utils :write_file (Path , Content ).
713716
@@ -717,16 +720,19 @@ generate_dev_sys_config(Name, Flags) ->
717720
718721generate_prod_sys_config (Name , Flags ) ->
719722 Path = filename :join ([Name , " config" , " prod_sys.config.src" ]),
720- Content = [
721- " %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-\n\n " ,
722- " [\n " ,
723+ Sections = [S || S <- [
723724 sys_config_kernel (prod , Flags ),
724725 sys_config_app (Name , prod , Flags ),
725726 sys_config_nova (Name , prod , Flags ),
726727 sys_config_pgo (Name , prod , Flags ),
727728 sys_config_arizona (Name , prod , Flags ),
728- sys_config_otel (prod , Flags ),
729- " ].\n "
729+ sys_config_otel (prod , Flags )
730+ ], S =/= []],
731+ Content = [
732+ " %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-\n\n " ,
733+ " [\n " ,
734+ lists :join (" ,\n " , Sections ),
735+ " \n ].\n "
730736 ],
731737 rebar3_nova_utils :write_file (Path , Content ).
732738
@@ -752,7 +758,7 @@ sys_config_kernel(dev, #{lfe := true}) ->
752758 " }\n " ,
753759 " }\n " ,
754760 " ]}\n " ,
755- " ]}, \n "
761+ " ]}"
756762 ];
757763sys_config_kernel (dev , _Flags ) ->
758764 [
@@ -765,7 +771,7 @@ sys_config_kernel(dev, _Flags) ->
765771 " template => [colored_start, \" [\\ 033[1m\" , level, \"\\ 033[0m\" , colored_start,\" ] [\" , time, \" ]\" ,\n " ,
766772 " colored_end, \" \" , msg, \" (\" , mfa, \" )\\ n\" ]\n " ,
767773 " }}}\n " ,
768- " ]}, \n "
774+ " ]}"
769775 ];
770776sys_config_kernel (prod , _Flags ) ->
771777 [
@@ -776,7 +782,7 @@ sys_config_kernel(prod, _Flags) ->
776782 " #{level => error,\n " ,
777783 " config => #{file => \" log/erlang.log\" }}}\n " ,
778784 " ]}\n " ,
779- " ]}, \n "
785+ " ]}"
780786 ].
781787
782788sys_config_nova (Name , dev , _Flags ) ->
@@ -794,7 +800,7 @@ sys_config_nova(Name, dev, _Flags) ->
794800 " {plugins, [\n " ,
795801 " {pre_request, nova_request_plugin, #{decode_json_body => true}}\n " ,
796802 " ]}\n " ,
797- " ]}, \n "
803+ " ]}"
798804 ];
799805sys_config_nova (Name , prod , _Flags ) ->
800806 [
@@ -811,7 +817,7 @@ sys_config_nova(Name, prod, _Flags) ->
811817 " {plugins, [\n " ,
812818 " {pre_request, nova_request_plugin, #{decode_json_body => true}}\n " ,
813819 " ]}\n " ,
814- " ]}, \n "
820+ " ]}"
815821 ].
816822
817823sys_config_app (Name , dev , #{kura := true }) ->
@@ -831,7 +837,7 @@ sys_config_app(Name, dev, #{kura := true}) ->
831837 " password => <<\" postgres\" >>,\n " ,
832838 " pool_size => 10\n " ,
833839 " }}\n " ,
834- " ]}, \n "
840+ " ]}"
835841 ];
836842sys_config_app (Name , prod , #{kura := true }) ->
837843 [
@@ -848,7 +854,7 @@ sys_config_app(Name, prod, #{kura := true}) ->
848854 " password => <<\" ${DATABASE_PASSWORD}\" >>,\n " ,
849855 " pool_size => ${PGO_POOL_SIZE}\n " ,
850856 " }}\n " ,
851- " ]}, \n "
857+ " ]}"
852858 ];
853859sys_config_app (_Name , _Env , _Flags ) ->
854860 [].
@@ -868,7 +874,7 @@ sys_config_pgo(Name, dev, #{kura := true}) ->
868874 " password => \" postgres\"\n " ,
869875 " }}\n " ,
870876 " ]}\n " ,
871- " ]}, \n "
877+ " ]}"
872878 ];
873879sys_config_pgo (Name , dev , #{pgo := true }) ->
874880 [
@@ -885,7 +891,7 @@ sys_config_pgo(Name, dev, #{pgo := true}) ->
885891 " password => \" postgres\"\n " ,
886892 " }}\n " ,
887893 " ]}\n " ,
888- " ]}, \n "
894+ " ]}"
889895 ];
890896sys_config_pgo (Name , prod , #{kura := true }) ->
891897 [
@@ -902,7 +908,7 @@ sys_config_pgo(Name, prod, #{kura := true}) ->
902908 " password => \" ${DATABASE_PASSWORD}\"\n " ,
903909 " }}\n " ,
904910 " ]}\n " ,
905- " ]}, \n "
911+ " ]}"
906912 ];
907913sys_config_pgo (Name , prod , #{pgo := true }) ->
908914 [
@@ -919,7 +925,7 @@ sys_config_pgo(Name, prod, #{pgo := true}) ->
919925 " password => \" ${DATABASE_PASSWORD}\"\n " ,
920926 " }}\n " ,
921927 " ]}\n " ,
922- " ]}, \n "
928+ " ]}"
923929 ];
924930sys_config_pgo (_Name , _Env , _Flags ) ->
925931 [].
@@ -933,7 +939,7 @@ sys_config_arizona(Name, _Env, #{arizona := true}) ->
933939 " {endpoint, #{\n " ,
934940 " live_reload => true\n " ,
935941 " }}\n " ,
936- " ]}, \n "
942+ " ]}"
937943 ];
938944sys_config_arizona (_Name , _Env , _Flags ) ->
939945 [].
@@ -943,14 +949,14 @@ sys_config_otel(dev, #{otel := true}) ->
943949 " {opentelemetry, [\n " ,
944950 " {span_processor, simple},\n " ,
945951 " {traces_exporter, {otel_exporter_stdout, []}}\n " ,
946- " ]}, \n "
952+ " ]}"
947953 ];
948954sys_config_otel (prod , #{otel := true }) ->
949955 [
950956 " {opentelemetry, [\n " ,
951957 " {span_processor, batch},\n " ,
952958 " {traces_exporter, {opentelemetry_exporter, #{endpoints => [\" ${OTEL_ENDPOINT}\" ]}}}\n " ,
953- " ]}, \n "
959+ " ]}"
954960 ];
955961sys_config_otel (_Env , _Flags ) ->
956962 [].
0 commit comments