software/theia: Use new template options

Replace deprecated `slapos.recipe.template:jinja2` options: - `rendered = <path>` -> `output = <path>` - `template = <path>` -> `url = <path>` - `template = inline:...` -> `inline = ...` Favor `slapos.recipe.template` over `slapos.recipe.template:jinja2` now that they both have `inline` option.

software/theia: Use new template options
Replace deprecated `slapos.recipe.template:jinja2` options: - `rendered = <path>` -> `output = <path>` - `template = <path>` -> `url = <path>` - `template = inline:...` -> `inline = ...` Favor `slapos.recipe.template` over `slapos.recipe.template:jinja2` now that they both have `inline` option.
611c6f65 · Xavier Thompson · abe9e35c · 611c6f65 · 611c6f65 · 611c6f65
Commit 611c6f65 authored Mar 07, 2022 by Xavier Thompson
7 changed files
--- a/component/theia/buildout.cfg
+++ b/component/theia/buildout.cfg
@@ -46,19 +46,17 @@ post-install =
    keytar.node

 [theia-wrapper]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
  #!/bin/sh
  cd ${theia:location}
  exec ${yarn:location}/bin/yarn theia start "$@"

 [theia-open]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
  #!/bin/sh
  exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@"


--- a/software/theia/buildout.hash.cfg
+++ b/software/theia/buildout.hash.cfg
@@ -15,19 +15,19 @@

 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 4df9f0d76a134a8abec9060a0c1be50b
+md5sum = 898ada9e42d8aafae571eba230708cc3

 [instance]
 _update_hash_filename_ = instance.cfg.in
-md5sum = f2f01a47d98a980177dc1755e618bbb7
+md5sum = 313eb380fdd2d0882f329af4a1157259

 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in
-md5sum = 74b9b46769a25add50f9f63365de58ad
+md5sum = 29bc1c5b76d20fd46430dff5c72d192b

 [instance-export]
 _update_hash_filename_ = instance-export.cfg.jinja.in
-md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
+md5sum = e2630148998c3cdf6d03b5e884d7f464

 [instance-resilient]
 _update_hash_filename_ = instance-resilient.cfg.jinja

--- a/software/theia/instance-export.cfg.jinja.in
+++ b/software/theia/instance-export.cfg.jinja.in
@@ -24,12 +24,11 @@ namebase = {{ parameter_dict['namebase'] }}
 # to be pulled from the export instance.
 # All it expects is that a script be available in exporter:wrapper.
 [exporter]
-wrapper = $${theia-export-script:rendered}
+wrapper = $${theia-export-script:output}

 [theia-export-script]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/theia-export-script
-mode = 0700
+output = $${directory:bin}/theia-export-script
 exitcode-file = $${directory:srv}/export-exitcode-file
 error-file = $${directory:srv}/export-errormessage-file
 context =
@@ -46,8 +45,8 @@ context =
  key exitfile :exitcode-file
  key errorfile :error-file
 {%- raw %}
-template =
-  inline:#!{{ bash }}
+inline =
+  #!{{ bash }}
  {{ python }} {{ theia_export }} \
  --rsync {{ rsync }} \
  --sqlite3 {{ sqlite3 }} \
@@ -71,24 +70,24 @@ export-promises =
 <= monitor-promise-base
 promise = check_command_execute
 name = resiliency-export-promise.py
-config-command = $${export-promise-script:rendered}
+config-command = $${export-promise-script:output}

 [initial-export-exitcode-file]
 recipe = slapos.recipe.template:jinja2
-rendered = $${theia-export-script:exitcode-file}
-template = inline:0
-once = $${:rendered}
+output = $${theia-export-script:exitcode-file}
+inline = 0
+once = $${:output}

 [export-promise-script]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/export-promise-script
-exitcode-file = $${initial-export-exitcode-file:rendered}
+output = $${directory:bin}/export-promise-script
+exitcode-file = $${initial-export-exitcode-file:output}
 context =
  key exitcodefile :exitcode-file
  key errorfile theia-export-script:error-file
 {%- raw %}
-template =
-  inline:#!/bin/sh
+inline =
+  #!/bin/sh
  if [ -z $(find {{ repr(exitcodefile) }} -mtime -2) ]
  then
    echo "ERROR export script last ran on " $(date -r {{ repr(exitcodefile) }})

--- a/software/theia/instance-import.cfg.jinja.in
+++ b/software/theia/instance-import.cfg.jinja.in
@@ -74,12 +74,11 @@ install =
  os.symlink("/bin/true", location)

 [importer]
-wrapper = $${theia-import-script:rendered}
+wrapper = $${theia-import-script:output}

 [theia-import-script]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/theia-import-script
-mode = 0700
+output = $${directory:bin}/theia-import-script
 exitcode-file = $${directory:srv}/import-exitcode-file
 error-file = $${directory:srv}/import-errormessage-file
 context =
@@ -101,10 +100,10 @@ context =
  key exitfile :exitcode-file
  key errorfile :error-file
 {%- raw %}
-template =
-  inline:#!{{ bash }}
-  . $${common-environment:rendered}
-  . $${slapos-standalone-activate:rendered}
+inline =
+  #!{{ bash }}
+  . $${common-environment:output}
+  . $${slapos-standalone-activate:output}
  {{ python }} {{ theia_import }} \
  --rsync {{ rsync }} \
  --sqlite3 {{ sqlite3 }} \
@@ -133,24 +132,24 @@ import-promises =
 <= monitor-promise-base
 promise = check_command_execute
 name = resiliency-import-promise.py
-config-command = $${import-promise-script:rendered}
+config-command = $${import-promise-script:output}

 [initial-import-exitcode-file]
 recipe = slapos.recipe.template:jinja2
-rendered = $${theia-import-script:exitcode-file}
-template = inline:0
-once = $${:rendered}
+output = $${theia-import-script:exitcode-file}
+inline = 0
+once = $${:output}

 [import-promise-script]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/import-promise-script
-exitcode-file = $${initial-import-exitcode-file:rendered}
+output = $${directory:bin}/import-promise-script
+exitcode-file = $${initial-import-exitcode-file:output}
 context =
  key exitcodefile :exitcode-file
  key errorfile theia-import-script:error-file
 {%- raw %}
-template =
-  inline:#!/bin/sh
+inline =
+  #!/bin/sh
  if [ -z $(find {{ repr(exitcodefile) }} -mtime -2) ]
  then
    echo "ERROR import script last ran on " $(date -r {{ repr(exitcodefile) }})

--- a/software/theia/instance-theia.cfg.jinja.in
+++ b/software/theia/instance-theia.cfg.jinja.in
@@ -229,10 +229,9 @@ location =
  $${:cert-file}

 [frontend-instance-config]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:etc}/$${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = $${directory:etc}/$${:_buildout_section_name_}
+inline =
  :$${:port} {
    bind $${:ip}
    tls $${frontend-instance-certificate:cert-file} $${frontend-instance-certificate:key-file}
@@ -268,7 +267,7 @@ port = $${frontend-instance-port:port}
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
 command-line =
-  ${caddy:output} -conf $${frontend-instance-config:rendered} -pidfile $${:pidfile}
+  ${caddy:output} -conf $${frontend-instance-config:output} -pidfile $${:pidfile}

 ip = $${frontend-instance-config:ip}
 hostname = $${frontend-instance-config:hostname}
@@ -298,8 +297,8 @@ stop-on-error = true

 [frontend-instance-slapos.css]
 recipe = slapos.recipe.template:jinja2
-template = ${slapos.css.in:output}
-rendered = $${directory:frontend-static}/$${:folder-name}/slapos.css
+url = ${slapos.css.in:output}
+output = $${directory:frontend-static}/$${:folder-name}/slapos.css
 folder-name = css
 context =
  key logo_image frontend-instance-logo:filename
@@ -312,7 +311,7 @@ command-line =
  "kill -s USR1 $$(${coreutils:location}/bin/cat $${frontend-instance:pidfile}) \
    && ${coreutils:location}/bin/sleep infinity"
 hash-files =
-  $${frontend-instance-config:rendered}
+  $${frontend-instance-config:output}
  $${frontend-instance:wrapper-path}
 wait-for-files = $${frontend-instance:pidfile}

@@ -345,11 +344,9 @@ filename = $${:_buildout_section_name_}
 # ------------------

 [common-environment]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0700
-template =
-  inline:
+recipe = slapos.recipe.template
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
  #!/bin/sh
  export HOME=$${directory:home}
  export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
@@ -365,11 +362,10 @@ maximum = 3600
 ip = {{ ipv4_random }}

 [theia-service]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0700
-template =
-  inline:#!/bin/sh
+recipe = slapos.recipe.template
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
+  #!/bin/sh
  {{ "{% raw %}" }}
  {% raw %}
  export THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}'
@@ -378,15 +374,15 @@ template =
  {{ "{% endraw %}" }}
  export THEIA_OPEN_EDITOR_TOKEN=$(${openssl:location}/bin/openssl rand -hex 32)
  export THEIA_URL=$${:base-url}
-  export THEIA_SHELL=$${theia-shell:rendered}
+  export THEIA_SHELL=$${theia-shell:output}
  export TMP=$${directory:tmp}
  export TEMP=$TMP
  export LC_ALL=C.UTF-8
  export TERMINFO=${ncurses:location}/lib/terminfo/
-  export EDITOR="${theia-open:rendered} --wait"
+  export EDITOR="${theia-open:output} --wait"
  export THEIA_DEFAULT_PLUGINS="local-dir:${theia-plugins:location}"
-  . $${common-environment:rendered}
-  exec ${theia-wrapper:rendered} "$@"
+  . $${common-environment:output}
+  exec ${theia-wrapper:output} "$@"
 ip =  $${theia-service-port:ip}
 port = $${theia-service-port:port}
 base-url = http://$${:ip}:$${:port}/
@@ -394,10 +390,10 @@ base-url = http://$${:ip}:$${:port}/
 [theia-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
-command-line = $${theia-service:rendered}  --hostname=$${:hostname} --port=$${:port} $${directory:project}
+command-line = $${theia-service:output}  --hostname=$${:hostname} --port=$${:port} $${directory:project}
 hash-existing-files =
  ${yarn.lock:target}
-  ${theia-wrapper:rendered}
+  ${theia-wrapper:output}
 ip =  {{ ipv4_random }}
 hostname = $${:ip}
 port = $${theia-service:port}
@@ -405,11 +401,10 @@ base-url = $${theia-service:base-url}

 [theia-shell]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0700
-template =
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
  {% raw %}
-  inline:#!{{ bash }}
+  #!{{ bash }}
  SHELL=$BASH
  # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
  if [ $# = 0 ]; then
@@ -421,14 +416,13 @@ template =
  {% endraw %}
 context =
  raw bash ${bash:location}/bin/bash
-  key activate slapos-standalone-activate:rendered
-  key bashrc theia-bashrc:rendered
+  key activate slapos-standalone-activate:output
+  key bashrc theia-bashrc:output

 [theia-bashrc]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:etc}/$${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = $${directory:etc}/$${:_buildout_section_name_}
+inline =
  # enable bash completion
  . ${bash-completion:location}/etc/profile.d/bash_completion.sh
  # source user's .bashrc
@@ -456,23 +450,22 @@ command =
 {%-     set embedded_sr = os_module.path.normpath(embedded_sr) %}
 {%-   endif %}
 [request-embedded-instance-script]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:project}/request_embedded.sh
-mode = 0700
-template =
-  inline:#!/bin/sh
+recipe = slapos.recipe.template
+output = $${directory:project}/request_embedded.sh
+inline =
+  #!/bin/sh

  slapos supply {{ embedded_sr }} slaprunner

  slapos request "embedded_instance" {{ embedded_sr }}
 {%-   if embedded_sr_type %} --type {{ embedded_sr_type }} {%- endif %}
-{%-   if embedded_instance_parameters %} --parameters-file $${embedded-instance-parameters:rendered}
+{%-   if embedded_instance_parameters %} --parameters-file $${embedded-instance-parameters:output}

 [embedded-instance-parameters]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:project}/$${:_buildout_section_name_}.json
-template =
-  inline:{{ embedded_instance_parameters | indent(2) }}
+recipe = slapos.recipe.template
+output = $${directory:project}/$${:_buildout_section_name_}.json
+inline =
+  {{ embedded_instance_parameters | indent(2) }}
 {%-   endif %}
 {%- endif %}

@@ -499,20 +492,19 @@ computer-id = slaprunner
 abstract-socket-path = $${directory:home}/standalone-{{ embedded_digest_hash[:16] }}

 [slapos-standalone-activate]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
  export PATH=${buildout:bin-directory}:$PATH
  export SLAPOS_CONFIGURATION=$${slapos-standalone-config:slapos-configuration}
  export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
  echo 'Standalone SlapOS for computer `$${slapos-standalone-config:computer-id}` activated'

 [slapos-standalone-script]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-template =
-  inline:#!${python-for-standalone:executable}
+recipe = slapos.recipe.template
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
+  #!${python-for-standalone:executable}
  import glob
  import json
  import os
@@ -583,13 +575,13 @@ template =
      print("Exception in compatibility layer, printing and moving on")
      traceback.print_exc()
    # Run request script
-    print("Running SlapOS script $${request-embedded-instance-script:rendered}")
+    print("Running SlapOS script $${request-embedded-instance-script:output}")
    slapos_env = {
      'PATH': os.path.dirname(standalone._slapos_bin),
      'SLAPOS_CONFIGURATION': standalone._slapos_config,
      'SLAPOS_CLIENT_CONFIGURATION': standalone._slapos_config
    }
-    subprocess.call(("$${request-embedded-instance-script:rendered}",), env=slapos_env)
+    subprocess.call(("$${request-embedded-instance-script:output}",), env=slapos_env)
 {%- endif %}
    s = socket.socket(socket.AF_UNIX)
    s.bind("\0$${slapos-standalone-config:abstract-socket-path}")
@@ -603,24 +595,23 @@ template =
    print("Exiting")

 [slapos-standalone]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0700
-template =
-  inline:#!/bin/sh
-  . $${common-environment:rendered}
+recipe = slapos.recipe.template
+output = $${directory:bin}/$${:_buildout_section_name_}
+inline =
+  #!/bin/sh
+  . $${common-environment:output}
  #XXX find out where the extra nodejs in theia's PATH comes from
  export PATH=${nodejs:location}/bin/:$PATH
-  . $${slapos-standalone-activate:rendered}
-  exec $${slapos-standalone-script:rendered}
+  . $${slapos-standalone-activate:output}
+  exec $${slapos-standalone-script:output}

 [slapos-standalone-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
-command-line = $${slapos-standalone:rendered}
+command-line = $${slapos-standalone:output}
 hash-files =
-  $${slapos-standalone:rendered}
-  $${slapos-standalone-script:rendered}
+  $${slapos-standalone:output}
+  $${slapos-standalone-script:output}
 hostname = $${slapos-standalone-config:ipv4}
 port = $${slapos-standalone-config:port}

@@ -645,10 +636,9 @@ autorun = {{ parameter_dict['autorun'] }}
 # -----------------------------

 [tasks.json]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:dot-theia}/tasks.json
-template =
-  inline:
+recipe = slapos.recipe.template
+output = $${directory:dot-theia}/tasks.json
+inline =
  {
    // See https://go.microsoft.com/fwlink/?LinkId=733558
    // for the documentation about the tasks.json format
@@ -715,10 +705,9 @@ git-executable = ${git:location}/bin/git

 [settings.json]
 recipe = slapos.recipe.template:jinja2
-rendered = $${directory:dot-theia}$${:_buildout_section_name_}
-once = $${:rendered}
-template =
-  inline:
+output = $${directory:dot-theia}$${:_buildout_section_name_}
+once = $${:output}
+inline =
  {
    "files.watcherExclude": {
      "**/.eggs/**": true,
@@ -737,11 +726,10 @@ target-directory = $${directory:project}
 link-binary = $${directory:runner}

 [request-script-template]
-recipe = slapos.recipe.template:jinja2
-rendered = $${directory:project}/$${:_buildout_section_name_}.sh
-mode = 0700
-template =
-  inline:#!/bin/sh
+recipe = slapos.recipe.template
+output = $${directory:project}/$${:_buildout_section_name_}.sh
+inline =
+  #!/bin/sh
  # This template is generated automatically, copy it in order to supply and request.
  # Any manual change to this file may be lost.
  software_name=html5as-base #replace the software name writen in ~/srv/project/slapos/software/

--- a/software/theia/instance.cfg.in
+++ b/software/theia/instance.cfg.in
@@ -20,18 +20,17 @@ cert = $${slap-connection:cert-file}
 recipe = slapos.cookbook:switch-softwaretype
 RootSoftwareInstance = $${:default}
 default = $${:theia}
-theia = theia:rendered
-export = export:rendered
-import = import:rendered
-resilient = resilient:rendered
+theia = theia:output
+export = export:output
+import = import:output
+resilient = resilient:output
 frozen = instance-frozen:rendered
 pull-backup = template-pull-backup:rendered

 [theia]
 recipe = slapos.recipe.template:jinja2
-template = ${instance-theia:output}
-rendered = $${buildout:directory}/instance-theia.cfg
-mode = 0644
+url = ${instance-theia:output}
+output = $${buildout:directory}/instance-theia.cfg
 context =
  jsonkey default_parameter_dict :default-parameters
  key parameter_dict slap-configuration:configuration
@@ -61,32 +60,29 @@ frontend-sr = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/ap

 [import]
 recipe = slapos.recipe.template:jinja2
-template = ${instance-import:output}
-rendered = $${buildout:directory}/instance-import.cfg
-mode = 0644
+url = ${instance-import:output}
+output = $${buildout:directory}/instance-import.cfg
 context =
  jsonkey default_parameter_dict theia:default-parameters
  key parameter_dict slap-configuration:configuration
-  key theia_instance_cfg theia:rendered
+  key theia_instance_cfg theia:output
  key pbsready_import_cfg template-pbsready-import:rendered
  key root_title slap-configuration:root-instance-title

 [export]
 recipe = slapos.recipe.template:jinja2
-template = ${instance-export:output}
-rendered = $${buildout:directory}/instance-export.cfg
-mode = 0644
+url = ${instance-export:output}
+output = $${buildout:directory}/instance-export.cfg
 context =
  jsonkey default_parameter_dict theia:default-parameters
  key parameter_dict slap-configuration:configuration
-  key theia_instance_cfg theia:rendered
+  key theia_instance_cfg theia:output
  key pbsready_export_cfg template-pbsready-export:rendered

 [resilient]
 recipe = slapos.recipe.template:jinja2
-template = ${instance-resilient:output}
-rendered = $${buildout:directory}/instance-resilient.cfg
-mode = 0644
+url = ${instance-resilient:output}
+output = $${buildout:directory}/instance-resilient.cfg
 extensions = jinja2.ext.do
 context =
  key buildout buildout:bin-directory

--- a/software/theia/test/resilience_dummy/instance.cfg.in
+++ b/software/theia/test/resilience_dummy/instance.cfg.in
@@ -18,30 +18,33 @@ run = $${:etc}/run
 command = mkdir -p $${:run} $${:srv}

 [log-writer]
-recipe = slapos.recipe.template:jinja2
-template = inline:#!/bin/sh
+recipe = slapos.recipe.template
+inline =
+  #!/bin/sh
  echo "Hello : $(date)" >> $${directory:home}/log.log
-rendered = $${directory:run}/log-writer
+output = $${directory:run}/log-writer

 [exporter.exclude]
-recipe = slapos.recipe.template:jinja2
-template = inline:$${directory:home}/exclude
-rendered = $${directory:srv}/exporter.exclude
+recipe = slapos.recipe.template
+inline = $${directory:home}/exclude
+output = $${directory:srv}/exporter.exclude

 [runner-import-restore]
-recipe = slapos.recipe.template:jinja2
-template = inline:#!/bin/sh
+recipe = slapos.recipe.template
+inline =
+  #!/bin/sh
  echo "Hello : $(date)" >> $${directory:home}/runner-import-restore.log
  exit $TEST_RESTORE_STATUS
-rendered = $${directory:srv}/runner-import-restore
+output = $${directory:srv}/runner-import-restore

 [backup-identity-script]
-recipe = slapos.recipe.template:jinja2
-template = inline:#!/bin/sh
+recipe = slapos.recipe.template
+inline =
+  #!/bin/sh
  echo "Custom script"
  for i in "$@"
  do
    echo $(sha256sum $i)
  done
  exit $TEST_BACKUP_STATUS
-rendered = $${directory:srv}/.backup_identity_script
+output = $${directory:srv}/.backup_identity_script