hcp: init at 0.8.0 #370162

dbreyfogle · 2025-01-02T09:08:24Z

Adding HCP CLI, an official project from HashiCorp for interacting with HashiCorp Cloud Platform (HCP).

Things done

Add a 👍 reaction to pull requests you find important.

zimward

Looks pretty good to me.

pkgs/by-name/hc/hcp/package.nix

lucasew · 2025-01-02T15:40:06Z

pkgs/by-name/hc/hcp/package.nix

+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+


Try to add a versionCheckHook for basic binary testing

I added the version check but I'm getting the below error. hcp version outputs hcp v0.8.0 go1.23.4 amd64. Is the "v" prefix the issue? Tried adding glibc to nativeInstallCheckInputs but that did not work.

nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; versionCheckProgramArg = [ "version" ];

error: builder for '/nix/store/mkvvqzqmcn9xspbl4g5q1absgwnc0ikl-hcp-0.8.0.drv' failed with exit code 2; last 25 log lines: > ok github.com/hashicorp/hcp/internal/pkg/auth 0.002s [no tests to run] > ok github.com/hashicorp/hcp/internal/pkg/cmd 0.005s > ok github.com/hashicorp/hcp/internal/pkg/flagvalue 0.002s > ok github.com/hashicorp/hcp/internal/pkg/format 0.002s > ok github.com/hashicorp/hcp/internal/pkg/heredoc 0.003s > ok github.com/hashicorp/hcp/internal/pkg/iostreams 0.001s > ok github.com/hashicorp/hcp/internal/pkg/profile 0.004s > ok github.com/hashicorp/hcp/internal/pkg/table 0.002s > ok github.com/hashicorp/hcp/internal/pkg/testing/promptio 0.001s [no tests to run] > ok github.com/hashicorp/hcp/internal/pkg/versioncheck 0.004s > ok github.com/hashicorp/hcp/internal/pkg/waypoint/agent 0.005s > Running phase: installPhase > Running phase: fixupPhase > shrinking RPATHs of ELF executables and libraries in /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0 > shrinking /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0/bin/hcp > shrinking /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0/bin/gendocs > shrinking /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0/bin/mvdocs > checking for references to /build/ in /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0... > patching script interpreter paths in /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0 > stripping (with command strip and flags -S -p) in /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0/bin > Running phase: installCheckPhase > Executing versionCheckPhase > Did not find version 0.8.0 in the output of the command /nix/store/bfsl51gs7ml2fkry757n19hxgi3d2rky-hcp-0.8.0/bin/hcp version > failed to configure version checker: failed expanding HCP config directory path "~/.config/hcp/version_check_state.json": exec: "getent": executable file not found in $PATH > failed to instantiate HCP config: failed to resolve hcp's credential path: failed to resolve hcp's credential directory path: exec: "getent": executable file not found in $PATH For full logs, run 'nix log /nix/store/mkvvqzqmcn9xspbl4g5q1absgwnc0ikl-hcp-0.8.0.drv'.

Checking $out/bin/hcp version in postInstall. It looks like it tries to check for newer versions.

> failed to check for new version: failed to list recent releases: Get "https://api.releases.hashicorp.com/v1/releases/hcp": dial tcp: lookup api.rele ases.hashicorp.com on [::1]:53: read udp [::1]:40251->[::1]:53: read: connection refused > hcp v0.8.0 go1.23.4 amd64

Just patch it out

The v doesn't change anything. It looks if the version is a substring in the output.

Just patch it out

Could you please link some documentation or examples? Still new to Nix

Basically you can either replace stuff with substituteInPlace on postPatch or make a patch file and add to the patches list. It will be applied automatically. There are plenty of examples in nixpkgs.

Thanks, I gave it a close look but that version checker is embedded in a lot of the code and I couldn't find a good way to patch it out. Happy to take any more suggestions, moving on from this otherwise

lucasew · 2025-01-02T23:37:41Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370162

`x86_64-linux`

✅ 1 package built:

hcp

lucasew · 2025-01-03T22:54:34Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370162

`x86_64-linux`

✅ 1 package built:

hcp

ethancedwards8 · 2025-01-07T05:04:13Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370162

`aarch64-darwin`

✅ 1 package built:

hcp

ethancedwards8

LGTM.

pkgs/by-name/hc/hcp/package.nix

lucasew · 2025-01-07T17:31:14Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 370162

`x86_64-linux`

✅ 1 package built:

hcp

FliegendeWurst · 2025-01-18T14:06:53Z

pkgs/by-name/hc/hcp/package.nix

+    repo = pname;
+    rev = "v${version}";


Suggested change

repo = pname;

rev = "v${version}";

repo = "hcp";

tag = "v${version}";

Avoid using pname here: #277994
tag is the new recommended argument. rev should only be used for specific commits.

repo = pname; did feel a bit awkward to me but it was suggested by another reviewer. Thanks for clearing it up with the linked issue.

Yeah their two suggestions were exactly against current recommendations.

FliegendeWurst · 2025-01-18T14:07:51Z

pkgs/by-name/hc/hcp/package.nix

+    export HOME=$TMPDIR
+  '';
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };


I'm not sure, but I think the gitUpdater does not update the vendorHash.

Probably the nix-update-script could be used, I think it has a different parameter for version prefixes.

Agreed, I think nix-update-script is a better fit here after reading through the documentation.

pkgs/by-name/hc/hcp/package.nix

FliegendeWurst · 2025-01-18T14:09:05Z

pkgs/by-name/hc/hcp/package.nix

+  meta = {
+    description = "HCP Command-Line Interface";
+    homepage = "https://github.com/hashicorp/hcp";
+    changelog = "https://github.com/hashicorp/hcp/raw/v${version}/CHANGELOG.md";


There is also https://github.com/hashicorp/hcp/releases/tag/v${version} which is more common in nixpkgs.

One shows all changes, the other only changes in that version. Either is fine I think.

Switched to https://github.com/hashicorp/hcp/releases/tag/v${version}. Seems more concise anyway.

github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Jan 2, 2025

NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jan 2, 2025

github-actions bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jan 2, 2025

zimward approved these changes Jan 2, 2025

View reviewed changes

pkgs/by-name/hc/hcp/package.nix Outdated Show resolved Hide resolved

lucasew reviewed Jan 2, 2025

View reviewed changes

pkgs/by-name/hc/hcp/package.nix Show resolved Hide resolved

lucasew reviewed Jan 2, 2025

View reviewed changes

wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 2, 2025

dbreyfogle force-pushed the init-hcp branch from 4fffb9a to 0c3e59b Compare January 2, 2025 23:25

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 2, 2025

maintainers: add dbreyfogle

2ff2562

dbreyfogle force-pushed the init-hcp branch from 0c3e59b to 781add3 Compare January 3, 2025 22:45

ethancedwards8 approved these changes Jan 7, 2025

View reviewed changes

ethancedwards8 suggested changes Jan 7, 2025

View reviewed changes

pkgs/by-name/hc/hcp/package.nix Show resolved Hide resolved

ethancedwards8 suggested changes Jan 7, 2025

View reviewed changes

pkgs/by-name/hc/hcp/package.nix Outdated Show resolved Hide resolved

dbreyfogle force-pushed the init-hcp branch from 781add3 to 1905659 Compare January 7, 2025 05:34

ethancedwards8 approved these changes Jan 7, 2025

View reviewed changes

wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jan 7, 2025

FliegendeWurst reviewed Jan 18, 2025

View reviewed changes

dbreyfogle force-pushed the init-hcp branch from 1905659 to 8326063 Compare January 21, 2025 20:38

hcp: init at 0.8.0

845e0e7

dbreyfogle force-pushed the init-hcp branch from 8326063 to 845e0e7 Compare January 21, 2025 20:52

dbreyfogle requested a review from FliegendeWurst January 22, 2025 03:32

wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jan 22, 2025

FliegendeWurst approved these changes Jan 22, 2025

View reviewed changes

FliegendeWurst merged commit 5544e59 into NixOS:master Jan 22, 2025
25 of 27 checks passed

getchoo added the backport release-24.11 Backport PR automatically label Feb 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hcp: init at 0.8.0 #370162

hcp: init at 0.8.0 #370162

dbreyfogle commented Jan 2, 2025

zimward left a comment

lucasew Jan 2, 2025

dbreyfogle Jan 2, 2025

lucasew Jan 2, 2025

lucasew Jan 2, 2025

dbreyfogle Jan 2, 2025

lucasew Jan 2, 2025

dbreyfogle Jan 3, 2025

lucasew commented Jan 2, 2025

lucasew commented Jan 3, 2025

ethancedwards8 commented Jan 7, 2025

ethancedwards8 left a comment

lucasew commented Jan 7, 2025

FliegendeWurst Jan 18, 2025

dbreyfogle Jan 21, 2025 •

edited

Loading

FliegendeWurst Jan 22, 2025

FliegendeWurst Jan 18, 2025

dbreyfogle Jan 21, 2025

FliegendeWurst Jan 18, 2025

dbreyfogle Jan 21, 2025

hcp: init at 0.8.0 #370162

hcp: init at 0.8.0 #370162

Conversation

dbreyfogle commented Jan 2, 2025

Things done

zimward left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lucasew commented Jan 2, 2025

nixpkgs-review result

x86_64-linux

lucasew commented Jan 3, 2025

nixpkgs-review result

x86_64-linux

ethancedwards8 commented Jan 7, 2025

nixpkgs-review result

aarch64-darwin

ethancedwards8 left a comment

Choose a reason for hiding this comment

lucasew commented Jan 7, 2025

nixpkgs-review result

x86_64-linux

Choose a reason for hiding this comment

dbreyfogle Jan 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

`nixpkgs-review` result

`x86_64-linux`

`nixpkgs-review` result

`x86_64-linux`

`nixpkgs-review` result

`aarch64-darwin`

`nixpkgs-review` result

`x86_64-linux`

dbreyfogle Jan 21, 2025 •

edited

Loading