Skip to content

Fix mismatched variable name#1507

Merged
brianmcgillion merged 1 commit intotiiuae:mainfrom
avnik:avnik/givc-cli
Oct 28, 2025
Merged

Fix mismatched variable name#1507
brianmcgillion merged 1 commit intotiiuae:mainfrom
avnik:avnik/givc-cli

Conversation

@avnik
Copy link
Copy Markdown
Contributor

@avnik avnik commented Oct 27, 2025 •
edited
Loading

Description of Changes

Fix mismatched variables name for GIVC key/cert

Type of Change

  • New Feature
  • Bug Fix
  • Improvement / Refactor

Related Issues / Tickets

Checklist

  • Clear summary in PR description
  • Detailed and meaningful commit message(s)
  • Commits are logically organized and squashed if appropriate
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • Author has run make-checks and it passes
  • All automatic GitHub Action checks pass - see actions
  • Author has added reviewers and removed PR draft status

Testing Instructions

Applicable Targets

  • Orin AGX aarch64
  • Orin NX aarch64
  • Lenovo X1 x86_64
  • Dell Latitude x86_64
  • System 76 x86_64

Installation Method

  • Requires full re-installation
  • Can be updated with nixos-rebuild ... switch
  • Other:

Test Steps To Verify:

  1. ...

@avnik
Fix mismatched variable name
f0518be 
Signed-off-by: Alexander Nikolaev <alexander.nikolaev@tii.ae>
@avnik avnik marked this pull request as draft October 27, 2025 10:38
@leivos-unikie
Copy link
Copy Markdown
Contributor

leivos-unikie commented Oct 27, 2025

This fixes the issue with update via givc-cli. Checked on Lenovo-X1:

[root@gui-vm:/tmp]# givc-cli update cachix --cache ghaf-release lenovo-x1-carbon-gen11-debug
2025-10-27T11:49:50.879327Z  INFO CLI is Cli {
    addr: "192.168.100.5",
    port: 9001,
    name: "admin-vm",
    vsock: None,
    cacert: Some(
        "/run/givc/ca-cert.pem",
    ),
    cert: Some(
        "/run/givc/cert.pem",
    ),
    key: Some(
        "/run/givc/key.pem",
    ),
    notls: false,
    command: Update {
        update: Cachix(
            CachixOptions {
                pin_name: "lenovo-x1-carbon-gen11-debug",
                token: None,
                cache: "ghaf-release",
                cachix_host: None,
            },
        ),
    },
}
2025-10-27T11:49:50.880241Z  INFO Connecting to https://192.168.100.5:9001, TLS name Some(TlsConfig { ca_cert_file_path: "/run/givc/ca-cert.pem", cert_file_path: "/run/givc/cert.pem", key_file_path: "/run/givc/key.pem", tls_name: Some("admin-vm") })
2025-10-27T11:49:50.880691Z  INFO Using TLS name: admin-vm

[root@gui-vm:/tmp]# givc-cli update list
2025-10-27T11:50:44.751186Z  INFO CLI is Cli {
    addr: "192.168.100.5",
    port: 9001,
    name: "admin-vm",
    vsock: None,
    cacert: Some(
        "/run/givc/ca-cert.pem",
    ),
    cert: Some(
        "/run/givc/cert.pem",
    ),
    key: Some(
        "/run/givc/key.pem",
    ),
    notls: false,
    command: Update {
        update: List,
    },
}
2025-10-27T11:50:44.752090Z  INFO Connecting to https://192.168.100.5:9001, TLS name Some(TlsConfig { ca_cert_file_path: "/run/givc/ca-cert.pem", cert_file_path: "/run/givc/cert.pem", key_file_path: "/run/givc/key.pem", tls_name: Some("admin-vm") })
2025-10-27T11:50:44.752525Z  INFO Using TLS name: admin-vm
[Generation { generation: 1, date: "bogus", nixos_version: "25.11.20251020.b8df13e", kernel_version: "6.17.3", configuration_revision: "unknown", specialisations: [], current: true, store_path: "/nix/store/ngiysijnrs4624sqywx2x9gszifhajr5-nixos-system-ghaf-host-25.11.20251020.b8df13e" }, Generation { generation: 2, date: "bogus", nixos_version: "25.11.20251020.b8df13e", kernel_version: "6.17.3", configuration_revision: "unknown", specialisations: [], current: false, store_path: "/nix/store/rxj7q3plpvs35k6n1mwa9kg9kdmrg3vl-nixos-system-ghaf-host-25.11.20251020.b8df13e" }]

@leivos-unikie leivos-unikie added the Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon label Oct 27, 2025
@avnik avnik marked this pull request as ready for review October 28, 2025 10:16
@brianmcgillion brianmcgillion merged commit 0214189 into tiiuae:main Oct 28, 2025
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brianmcgillion brianmcgillion brianmcgillion approved these changes

Assignees

No one assigned

Labels

Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@avnik @leivos-unikie @brianmcgillion