Choco install refinement

Author: phwissmann

cmd/openem-ingestor-app/main.go

@@ -71,7 +71,7 @@ func main() {
 	configFileReader := core.NewConfigReader()
 	var err error
 	if config, err = configFileReader.ReadConfig(core.DefaultConfigFileName()); err != nil {
-		slog.Info("Reading config", "file", configFileReader.GetCurrentConfigFilePath())
+		slog.Error("Reading config failed", "file", configFileReader.GetCurrentConfigFilePath(), "error", err)
 		panic(fmt.Errorf("failed to read config file: %w", err))
 	}
 

configs/openem-ingestor-config-template.yaml

@@ -51,10 +51,10 @@ WebServer:
       Scopes:
         - email
     OIDC:
-     IssuerURL: "${KEYCLOAK_HOST}/realms/awi"
+     IssuerURL: "${KEYCLOAK_HOST}/realms/${KEYCLOAK_REALM}"
     JWT:
       UseJWKS: true
-      JwksURL: "${KEYCLOAK_HOST}/realms/awi/protocol/openid-connect/certs"
+      JwksURL: "${KEYCLOAK_HOST}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/certs"
       JwksSignatureMethods:
         - RS256
     RBAC:

openem-ingestor.nuspec

@@ -12,24 +12,22 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>
 OpenEM Ingestor Package
-This package installs the ingestor as a windows network service. The config file is templated using the package parameters and saved
+This package installs the openem-ingestor. The config file is templated using the package parameters and saved
 at "$Env:ChocolateyInstall\lib\openem-ingestor-config.yaml", i.e. next to the binary. Any changes need to be done there.
-The service name "OpenEM-Ingestor" and needs to be stopped before making changes to the config file.
-
-The service depends on https://github.com/mtkennerly/shawl. Install with winget:
-
-`winget install --scope "machine" -e --id mtkennerly.shawl`
-
-The log file can be found in the directory of the shawl executable; using powershell this can be found by `get-command shawl`.
 
 #### Package Parameters
 The following package parameters can be set:
 
+  * `/Environment:` Deployment environement one of dev, qa, prod - example --params="'/Environment:dev'"
+  * `/CollectionLocations:` List of collection location name and path - example --params="'/CollectionLocations:storage1:\\\\path\\to\\storage1;storage2:\\\\path\\to\\storage2'"
+
+The parameter environment will set the following values that can be overridden:
+
   * `/Scicat.Host:` - Scicat backend URL - defaults to: "https://dacat.psi.ch"
   * `/Frontend.Host:` - Scicat Frontend URL - defaults to "https://discovery.psi.ch"
   * `/Keycloak.Host` - Keycloak URL - defaults to "https://kc.psi.ch"
+  * `/Keycloak.Realm` - Keycloak URL - defaults to "awi"
   * `/S3.Host:` - S3 host URL - defaults to "https://scopem-openem.ethz.ch"
-  * `/CollectionLocations:` List of collection location name and path - example --params="'/CollectionLocations:storage1:\\\\path\\to\\storage1;storage2:\\\\path\\to\\storage2'"
 
 To pass parameters, use `--params "''"` (e.g. `choco install openem-ingestor [other options] --params="'/ITEM:value /ITEM2:value2 /FLAG_BOOLEAN'"`).
 To have choco remember parameters on upgrade, be sure to set `choco feature enable -n=useRememberedArgumentsForUpgrades`.

tools/chocolateyInstall.ps1

@@ -2,32 +2,54 @@ $ErrorActionPreference = 'Stop';
 
 $package = Get-Package -Name 'Openem-Ingestor' -ErrorAction SilentlyContinue
 
-
-
 if ($package) {
     Write-Host "Package already installed. Uninstalling first."
     choco uninstall openem-ingestor -y
 }
 
-
 $packageName = 'openem-ingestor'
 
-
 $pp = Get-PackageParameters
 
-if (!$pp['Scicat.Host']) { $pp['Scicat.Host'] = 'https://dacat.psi.ch' }
-if (!$pp['Frontend.Host']) { $pp['Frontend.Host'] = 'https://discovery.psi.ch' }
-if (!$pp['Keycloak.Host']) { $pp['Keycloak.Host'] = 'https://kc.psi.ch' }
-if (!$pp['S3.Host']) { $pp['S3.Host'] = 'https://scopem-openem.ethz.ch' }
 
-# Copy the executable
+if (!$pp['environment']) { 
+    Write-Error -Message "No environment specified (dev, qa, prod)" 
+    Exit -1
+}
+
+$deployment_env = $pp['Environment']
 
 # Define the string to find and the string to replace it with
 $parameters = @{}; 
-$parameters["SCICAT_HOST"] = $pp['Scicat.Host']
-$parameters["FRONTEND_HOST"] = $pp['Frontend.Host']
-$parameters["KEYCLOAK_HOST"] = $pp['Keycloak.Host']
-$parameters["S3_HOST"] = $pp['S3.Host']
+
+if ($deployment_env -eq "dev"){
+    $parameters["SCICAT_HOST"] = "https://scopem-openem2.ethz.ch/scicat/backend"
+    $parameters["FRONTEND_HOST"] = "https://scopem-openem2.ethz.ch"
+    $parameters["KEYCLOAK_HOST"] = "https://scopem-openem2.ethz.ch/keycloak"
+    $parameters["KEYCLOAK_REALM"] = "facility"
+    $parameters["S3_HOST"] = "https://scopem-openem2.ethz.ch"
+} elseif ($deployment_env -eq "qa") {
+    $parameters["SCICAT_HOST"] = "https://dacat-qa.psi.ch"
+    $parameters["FRONTEND_HOST"] = "https://discovery-qa.psi.ch"
+    $parameters["KEYCLOAK_HOST"] = "https://kc.psi.ch"
+    $parameters["KEYCLOAK_REALM"] = "awi"
+    $parameters["S3_HOST"] = "https://scopem-openem.ethz.ch"
+} elseif ($deployment_env -eq "prod") {
+    $parameters["SCICAT_HOST"] = "https://dacat.psi.ch"
+    $parameters["FRONTEND_HOST"] = "https://discovery.psi.ch"
+    $parameters["KEYCLOAK_HOST"] = "https://kc.psi.ch"
+    $parameters["KEYCLOAK_REALM"] = "awi"
+    $parameters["S3_HOST"] = "https://scopem-openem.ethz.ch"
+}else{
+    Write-Error -Message "Unknown environment specified (allowed: dev, qa, prod)" 
+    Exit -1
+}
+
+if ($pp['Scicat.Host']) { $parameters['SCICAT_HOST'] = $pp['Scicat.Host'] }
+if ($pp['Frontend.Host']) { $parameters['FRONTEND_HOST'] = $pp['Frontend.Host'] }
+if ($pp['Keycloak.Host']) { $parameters['KEYCLOAK_HOST'] = $pp['Keycloak.Host'] }
+if ($pp['Keycloak.Realm']) { $parameters['KEYCLOAK_REALM'] = $pp['Keycloak.Realm'] }
+if ($pp['S3.Host']) { $parameters['S3_HOST'] = $pp['S3.Host'] }
 
 $locationPairs = $pp['CollectionLocations'] -split ';'
 for ($index = 0; $index -lt $locationPairs.Length; $index++) {