Merge remote-tracking branch 'origin' into 25578-api-session-not-up-w…

…hen-getting-monitoring-system-id

.github/workflows/schema-migration-reportdb-test-pgsql.yml

@@ -14,6 +14,8 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
       - id: files
         uses: Ana06/[email protected]
         with:

.github/workflows/yard-doc-test-framework.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.9'
+          ruby-version: '3.3'
 
       - name: Install dependencies
         run: |

.gitignore

@@ -82,6 +82,8 @@ reports/
 # VS Code
 java/.vscode/launch.json
 python/.vscode
+.vscode/launch.json
+*.code-workspace
 
 # Python
 venv/

.vscode/README.md

@@ -0,0 +1,21 @@
+# Why are these files here?
+
+We ship config files for VSCode out of the box for two main reasons:  
+
+1. for convenience, so linters, formatters, etc work right out of the box;  
+2. to reduce hit-and-run breaking changes in private repos where Github Actions are not available.  
+
+See [this Slack thread](https://suse.slack.com/archives/C02DDMY6R0R/p1724770544871309) for more context.
+
+# How do I manage my own settings?
+
+You can use a workspace file. VSCode allows you to store configuration, launch, etc settings in a workspace file which you can change independently from the directory settings. This is very similar to the regular `.vscode` directory setup.  
+
+There is a helper script provided at `scripts/generate-vscode-workspace.sh` which generates a new workspace file. After doing so, open the workspace file instead of the directory in VSCode and update the settings as needed.  
+
+```
+$ ./scripts/generate-vscode-workspace.sh
+Enter new workspace name [uyuni]: 
+Enter server hostname for launch configs [server.tf.local]: 
+$ open uyuni.code-workspace
+```

.vscode/launch.json.template

@@ -0,0 +1,32 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "Debug Taskomatic",
+      "request": "attach",
+      "hostName": "server.tf.local",
+      "port": 8001
+    },
+    {
+      "type": "java",
+      "name": "Debug Search Server",
+      "request": "attach",
+      "hostName": "server.tf.local",
+      "port": 8002
+    },
+    {
+      "type": "java",
+      "name": "Debug Tomcat",
+      "request": "attach",
+      "hostName": "server.tf.local",
+      "port": 8003
+    },
+    {
+      "type": "node-terminal",
+      "name": "Frontend Development Proxy",
+      "request": "launch",
+      "command": "yarn proxy server.tf.local"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,15 +1,35 @@
 {
-    "typescript.tsdk": "./web/html/src/node_modules/typescript/lib",
-    "[javascript][javascriptreact][typescript][typescriptreact][json][jsonc][css][less][scss][html]": {
-        "editor.tabSize": 2,
-        "files.insertFinalNewline": true,
-        "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "explicit"
-        },
+  "typescript.tsdk": "${workspaceFolder}/web/html/src/node_modules/typescript/lib",
+  "[javascript][javascriptreact][typescript][typescriptreact][json][jsonc][css][less][scss][html]": {
+    "editor.tabSize": 2,
+    "files.insertFinalNewline": true,
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
     },
-    "css.lint.emptyRules": "ignore",
-    "less.lint.emptyRules": "ignore",
-    "scss.lint.emptyRules": "ignore",
+  },
+  "css.lint.emptyRules": "ignore",
+  "less.lint.emptyRules": "ignore",
+  "scss.lint.emptyRules": "ignore",
+  "sonarlint.connectedMode.project": {
+    "connectionId": "uyuni-project",
+    "projectKey": "uyuni-project_uyuni"
+  },
+  "java.test.config": {
+    "vmArgs": [
+      "-Drhn.config.dir=${workspaceFolder}/java/buildconf/test",
+      "-Dlog4j2.configurationFile=${workspaceFolder}/java/buildconf/test/log4j2.properties"
+    ]
+  },
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx8G -Xms2G -Xlog:disable",
+  "java.checkstyle.configuration": "${workspaceFolder}/java/buildconf/checkstyle.xml",
+  "java.checkstyle.properties": {
+    "checkstyle.cache.file": "${workspaceFolder}/java/build/checkstyle.cache.src",
+    "checkstyle.header.file": "${workspaceFolder}/java/buildconf/LICENSE.txt",
+    "checkstyle.suppressions.file": "${workspaceFolder}/java/buildconf/checkstyle-suppressions.xml",
+    "javadoc.lazy": "false",
+    "javadoc.method.scope": "public",
+    "javadoc.type.scope": "package",
+    "javadoc.var.scope": "package"
+  }
 }

branding/spacewalk-branding.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 15:44:57 CEST 2024 - [email protected]
+
+- version 5.1.1-0
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Apr 04 23:20:43 CEST 2024 - [email protected]
 

branding/spacewalk-branding.spec

@@ -23,7 +23,7 @@
 %global tomcat_path %{wwwroot}/tomcat
 %global wwwdocroot %{wwwroot}/htdocs
 Name:           spacewalk-branding
-Version:        5.1.0
+Version:        5.1.1
 Release:        0
 Summary:        Spacewalk branding data
 License:        GPL-2.0-only AND OFL-1.1

client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 15:46:10 CEST 2024 - [email protected]
+
+- version 5.1.1-0
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Wed Jul 31 17:45:44 CEST 2024 - [email protected]
 

client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec

@@ -65,7 +65,7 @@
 %bcond_with    test
 
 Name:           spacewalk-client-tools
-Version:        5.1.0
+Version:        5.1.1
 Release:        0
 Summary:        Support programs and libraries for Spacewalk
 License:        GPL-2.0-only

client/tools/mgr-push/mgr-push.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 15:38:18 CEST 2024 - [email protected]
+
+- version 5.1.1-0
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Fri May 03 14:25:28 CEST 2024 - [email protected]
 

client/tools/mgr-push/mgr-push.spec

@@ -33,7 +33,7 @@
 
 %define pythonX %{?default_py3: python3}%{!?default_py3: python2}
 Name:           mgr-push
-Version:        5.1.0
+Version:        5.1.1
 Release:        0
 Summary:        Package uploader for the Spacewalk
 License:        GPL-2.0-only

containers/init-image/Dockerfile

@@ -52,7 +52,7 @@ LABEL org.opencontainers.image.description="This image initialize users, groups
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/init:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/init-image/init-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:21:55 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:02:35 CEST 2024 - [email protected]
 

containers/proxy-helm/Chart.yaml

@@ -6,4 +6,4 @@ description: Uyuni proxy containers.
 type: application
 home: https://www.uyuni-project.org/
 icon: https://www.uyuni-project.org/img/uyuni-logo.svg
-version: 5.1.0
+version: 5.1.1

containers/proxy-helm/proxy-helm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:22:28 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Remove the build tag with the release number
+  * Add registrySecret value to the Helm chart for authentication 
+    (bsc#1231157)
+  * Fix labels indentation (bsc#1231150)
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:04:20 CEST 2024 - [email protected]
 

containers/proxy-httpd-image/Dockerfile

@@ -50,7 +50,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-httpd-image
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-httpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/proxy-httpd-image/proxy-httpd-image.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:23:21 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Store proxy FQDN in rhn.conf for auth token use (bsc#1230255)
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:05:50 CEST 2024 - [email protected]
 

containers/proxy-salt-broker-image/Dockerfile

@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-salt-broker-image
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-salt-broker:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/proxy-salt-broker-image/proxy-salt-broker-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:24:06 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:07:03 CEST 2024 - [email protected]
 

containers/proxy-squid-image/Dockerfile

@@ -58,7 +58,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-squid-image
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-squid:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/proxy-squid-image/proxy-squid-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:24:21 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:08:05 CEST 2024 - [email protected]
 

containers/proxy-ssh-image/Dockerfile

@@ -46,7 +46,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-ssh-image
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-ssh:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/proxy-ssh-image/proxy-ssh-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:24:34 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:09:18 CEST 2024 - [email protected]
 

containers/proxy-tftpd-image/Dockerfile

@@ -45,7 +45,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-tftpd-image
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-tftpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/proxy-tftpd-image/proxy-tftpd-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:24:53 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:34:17 CEST 2024 - [email protected]
 

containers/server-attestation-image/Dockerfile

@@ -28,7 +28,7 @@ LABEL org.opencontainers.image.description="${PRODUCT} Confidential Computing at
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version=5.1.0
+LABEL org.opencontainers.image.version=5.1.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-attestation:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix

containers/server-attestation-image/server-attestation-image.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:25:18 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:36:32 CEST 2024 - [email protected]
 

containers/server-helm/Chart.yaml

@@ -6,4 +6,4 @@ description: Uyuni server containers.
 type: application
 home: https://www.uyuni-project.org/
 icon: https://www.uyuni-project.org/img/uyuni-logo.svg
-version: 5.1.0
+version: 5.1.1

containers/server-helm/server-helm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 14 17:25:54 CEST 2024 - [email protected]
+
+- version 5.1.1
+  * Remove the build tag with the release number
+  * Add registrySecret value to the Helm chart for authentication
+    (bsc#1231157)
+  * Fix labels indentation (bsc#1231150)
+  * Bump version to 5.1.0
+
 -------------------------------------------------------------------
 Thu Aug 01 18:37:36 CEST 2024 - [email protected]