Merge pull request #5730 from chrisburr/cherry-pick-2-981776903-integration

[sweep:integration] Add URLs to CS when installing HTTPS services

Author: fstagni

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

@@ -864,12 +864,22 @@ def getComponentCfg(
         # Add the service URL
         if componentType == "service":
             port = compCfg.getOption("Port", 0)
-            if port and self.host:
+            protocol = compCfg.getOption("Protocol", "dips")
+            if (port or protocol == "https") and self.host:
                 urlsPath = cfgPath("Systems", system, compInstance, "URLs")
                 cfg.createNewSection(urlsPath)
                 failoverUrlsPath = cfgPath("Systems", system, compInstance, "FailoverURLs")
                 cfg.createNewSection(failoverUrlsPath)
-                cfg.setOption(cfgPath(urlsPath, component), "dips://%s:%d/%s/%s" % (self.host, port, system, component))
+                if protocol == "https":
+                    cfg.setOption(
+                        # Strip "Tornado" from the beginning of component name if present
+                        cfgPath(urlsPath, component[len("Tornado") if component.startswith("Tornado") else 0 :]),
+                        "https://%s:8443/%s/%s" % (self.host, system, component),
+                    )
+                else:
+                    cfg.setOption(
+                        cfgPath(urlsPath, component), "dips://%s:%d/%s/%s" % (self.host, port, system, component)
+                    )
 
         return S_OK(cfg)
 

tests/CI/install_server.sh

@@ -89,20 +89,12 @@ then
   # We ignore the Configuration for now because it is a bit special (the master needs to run in a separate process)
   # system_component is a space separated System (without the word System), and Component, without the 'Handler.py'.
   # For example "DataManagement TornadoFileCatalog"
-
-  find "/home/dirac/LocalRepo/ALTERNATIVE_MODULES/DIRAC" -name 'Tornado*Handler.py' | grep -v Configuration | sed -e 's/Handler.py//g' -e 's/System//g'| awk -F '/' '{print $(NF-2), $NF}' > tornadoServices
-  cfgProdFile="${SERVERINSTALLDIR}"/diracos/etc/Production.cfg
-
   while read -r system_component; do
     echo -e "*** $(date -u) **** Installing Tornado service ${system_component}"
     # do NOT put quotes around ${system_component} since
     # we want it to be seen as two arguments
     # shellcheck disable=SC2086
     dirac-install-tornado-service -ddd ${system_component};
-    # origin_component is the original service before Tornado (FileCatalog vs TornadoFileCatalog for example)
-    orig_component=$(echo "${system_component}" | sed 's/Tornado//g' | awk '{print $2}');
-    # Replace the dips url with the https url in the cs, assuming port 8443
-    sed -E "s|( +${orig_component} = )dips://([a-z]+)(:[0-9]+)(/.*/)(.*)|\1https://\2:8443\4Tornado\5|g" -i "$cfgProdFile"
     # Restart the CS to take all that into account
     sleep 1
     dirac-restart-component Configuration Server "$DEBUG"