NAS-130884 / 24.10.0 / Fix data-source (by stavros-k)

[bugclerk]

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 114c677c1f8bd53d1d713924e12ccc9e1314db8e
git cherry-pick -x 1f46a9c111b4eb5b22337c6525568f68ed90d94c
git cherry-pick -x a3c1ec9b1f96524581b887d661849a7e0031d8c2

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x d2f61c109fcdd118ad23351346ca13a02e68ae3a

Changes:

➡️ Feel free to take over and do any changes as you see fit!

Fixing the data-source of the 2 fields, the payload now should include the actual data

Original PR #10673

Example Payload

{
  "id": "9342af35-5bf4-8aba-fd45-793026e5359a",
  "msg": "result",
  "result": [
    {
      "catalog": "TRUENAS",
      "installed": false,
      "train": "stable",
      "app_readme": "<h1>Pi-hole</h1> <p><a href=\"https://pi-hole.net/\">Pi-hole</a> is a black hole for Internet advertisements</p>",
      "categories": ["networking"],
      "description": "DNS and Ad-filtering for your network.",
      "healthy": true,
      "healthy_error": null,
      "home": "https://pi-hole.net",
      "location": "/mnt/.ix-apps/truenas_catalog/trains/stable/pihole",
      "latest_version": "1.1.6",
      "latest_app_version": "2024.07.0",
      "latest_human_version": "2024.07.0_1.1.6",
      "last_update": {
        "$date": 1726939188000
      },
      "name": "pihole",
      "recommended": false,
      "title": "Pihole",
      "maintainers": [
        {
          "email": "[email protected]",
          "name": "truenas",
          "url": "https://www.truenas.com/"
        }
      ],
      "tags": ["networking", "dns"],
      "screenshots": [
        "https://media.sys.truenas.net/apps/pihole/screenshots/screenshot1.png"
      ],
      "sources": [
        "https://pi-hole.net/",
        "https://github.com/truenas/charts/tree/master/charts/pihole"
      ],
      "icon_url": "https://media.sys.truenas.net/apps/pihole/icons/icon.png",
      "capabilities": [
        {
          "description": "Pi-hole is able to perform various network-related operations.",
          "name": "NET_ADMIN"
        },
        {
          "description": "Pi-hole is able to access the network.",
          "name": "NET_RAW"
        },
        {
          "description": "Pi-hole is able to bind to a privileged port.",
          "name": "NET_BIND_SERVICE"
        },
        {
          "description": "Pi-hole is able to chown files.",
          "name": "CHOWN"
        },
        {
          "description": "Pi-hole is able to bypass permission checks for it's sub-processes.",
          "name": "FOWNER"
        },
        {
          "description": "Pi-hole is able to bypass permission checks.",
          "name": "DAC_OVERRIDE"
        },
        {
          "description": "Pi-hole is able to bypass permission checks.",
          "name": "SETGID"
        },
        {
          "description": "Pi-hole is able to bypass permission checks.",
          "name": "SETUID"
        },
        {
          "description": "Pi-hole is able to set the capabilities.",
          "name": "SETPCAP"
        },
        {
          "description": "Pi-hole is able to set the capabilities on a file.",
          "name": "SETFCAP"
        },
        {
          "description": "Pi-hole is able to kill processes.",
          "name": "KILL"
        },
        {
          "description": "Pi-hole is able to set the nice level on a process.",
          "name": "SYS_NICE"
        }
      ],
      "run_as_context": [
        {
          "description": "Pi-hole runs as root user.",
          "gid": 0,
          "group_name": "root",
          "uid": 0,
          "user_name": "root"
        }
      ]
    },
  ],
}

Testing:

Downstream

Affects	Reasoning
Documentation

Original PR: #10726
Jira URL: https://ixsystems.atlassian.net/browse/NAS-130884

[AlexKarpov98]

ported.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (stable/electriceel@4dfec21). Learn more about missing BASE report.

Additional details and impacted files

@@                  Coverage Diff                  @@
##             stable/electriceel   #10742   +/-   ##
=====================================================
  Coverage                      ?   79.78%           
=====================================================
  Files                         ?     1570           
  Lines                         ?    51329           
  Branches                      ?     5925           
=====================================================
  Hits                          ?    40955           
  Misses                        ?    10374           
  Partials                      ?        0           

Flag	Coverage Δ
	79.78% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[bugclerk]

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.