Merge a7c9ba002d into 5032760cea

chore(deps): update module github.com/stretchr/testify to v1.10.0 (#53 )
chore(deps): update module github.com/hetznercloud/hcloud-go/v2 to v2.17.0 (#52 )
2026-02-07 02:07:05 +00:00 · 2024-12-07 01:52:52 +01:00 · 2024-12-07 00:50:40 +00:00 · 2024-12-07 01:48:38 +01:00 · 2024-12-07 01:48:23 +01:00 · 2024-05-19 22:57:10 +02:00
9 changed files with 144 additions and 12 deletions
--- a/.github/release-please-config.json
+++ b/.github/release-please-config.json
@ -8,7 +8,7 @@
    ".": {
      "component": "cli",
      "package-name": "hcloud-upload-image",
-      "extra-files": ["internal/version/version.go"]
+      "extra-files": ["internal/version/version.go", "hcloud-upload-image.nix"]
    },
    "hcloudimages": {
      "component": "hcloudimages",
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -20,13 +20,13 @@ jobs:
      - name: Run golangci-lint (CLI)
        uses: golangci/golangci-lint-action@v6
        with:
-          version: v1.62.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
+          version: v1.62.2 # renovate: datasource=github-releases depName=golangci/golangci-lint
          args: --timeout 5m

      - name: Run golangci-lint (Lib)
        uses: golangci/golangci-lint-action@v6
        with:
-          version: v1.62.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
+          version: v1.62.2 # renovate: datasource=github-releases depName=golangci/golangci-lint
          args: --timeout 5m
          working-directory: hcloudimages

--- a/flake.lock
+++ b/flake.lock
@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1715961556,
+        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@ -0,0 +1,27 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # unstable for go 1.22
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          system = system;
+        };
+        hcloud-upload-image = pkgs.callPackage ./hcloud-upload-image.nix { };
+      in
+      {
+        packages = {
+          default = hcloud-upload-image;
+        };
+
+        devShells = {
+          default = pkgs.mkShell {
+            packages = [ hcloud-upload-image ];
+          };
+        };
+      }
+    );
+}
--- a/go.mod
+++ b/go.mod
@ -4,7 +4,7 @@ go 1.22.2

 require (
 	github.com/apricote/hcloud-upload-image/hcloudimages v0.3.0
-	github.com/hetznercloud/hcloud-go/v2 v2.16.0
+	github.com/hetznercloud/hcloud-go/v2 v2.17.0
 	github.com/spf13/cobra v1.8.1
 )

--- a/go.sum
+++ b/go.sum
@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/hetznercloud/hcloud-go/v2 v2.16.0 h1:s5wZFMX6/hZxONbD19pZ+JWvGaf2I7zH+f/Cem2ICAQ=
-github.com/hetznercloud/hcloud-go/v2 v2.16.0/go.mod h1:h8sHav+27Xa+48cVMAvAUMELov5h298Ilg2vflyTHgg=
+github.com/hetznercloud/hcloud-go/v2 v2.17.0 h1:ge0w2piey9SV6XGyU/wQ6HBR24QyMbJ3wLzezplqR68=
+github.com/hetznercloud/hcloud-go/v2 v2.17.0/go.mod h1:zfyZ4Orx+mPpYDzWAxXR7DHGL50nnlZ5Edzgs1o6f/s=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
--- a/hcloud-upload-image.nix
+++ b/hcloud-upload-image.nix
@ -0,0 +1,44 @@
+{ config, pkgs, fetchFromGitHub, ... }:
+
+pkgs.buildGo122Module rec {
+  pname = "hcloud-upload-image";
+  version = "v0.2.1"; # x-release-please-version
+  #src = pkgs.fetchFromGitHub {
+  #  owner = "apricote";
+  #  repo = "hcloud-upload-image";
+  #  rev = version;
+  #  sha256 = "KYhmMo/GDiLOWuEtdiY/KDwh1MO3crAFN2SGiL8FFIU=";
+  #};
+  src = ./.;
+
+  vendorHash = "";
+  overrideModAttrs = _: {
+    #outputHash = "sha256-/FluEFTvrX07L4kGPH7jPrcRhwdrCz1p4OVErNegNLw=";
+    #outputHash = null;
+    #outputHashAlgo = null;
+    #outputHashMode = null;
+  };
+
+  nativeBuildInputs = [
+    pkgs.installShellFiles
+  ];
+
+  preBuild = ''
+    export GOWORK=off
+  '';
+
+  subPackages = [ "." ]; # We only need to CLI, fails with the "hcloudimages" module otherwise
+  CGO_ENABLED = "0";
+
+  ldflags = [
+    "-X github.com/apricote/hcloud-upload-image/internal/version.version=${version}"
+    "-X github.com/apricote/hcloud-upload-image/internal/version.versionPrerelease="
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd hcloud-upload-image \
+      --bash <($out/bin/hcloud-upload-image completion bash) \
+      --fish <($out/bin/hcloud-upload-image completion fish) \
+      --zsh <($out/bin/hcloud-upload-image completion zsh)
+  '';
+}
--- a/hcloudimages/go.mod
+++ b/hcloudimages/go.mod
@ -3,8 +3,8 @@ module github.com/apricote/hcloud-upload-image/hcloudimages
 go 1.22.2

 require (
-	github.com/hetznercloud/hcloud-go/v2 v2.16.0
-	github.com/stretchr/testify v1.9.0
+	github.com/hetznercloud/hcloud-go/v2 v2.17.0
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.29.0
 )

--- a/hcloudimages/go.sum
+++ b/hcloudimages/go.sum
@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/hetznercloud/hcloud-go/v2 v2.16.0 h1:s5wZFMX6/hZxONbD19pZ+JWvGaf2I7zH+f/Cem2ICAQ=
-github.com/hetznercloud/hcloud-go/v2 v2.16.0/go.mod h1:h8sHav+27Xa+48cVMAvAUMELov5h298Ilg2vflyTHgg=
+github.com/hetznercloud/hcloud-go/v2 v2.17.0 h1:ge0w2piey9SV6XGyU/wQ6HBR24QyMbJ3wLzezplqR68=
+github.com/hetznercloud/hcloud-go/v2 v2.17.0/go.mod h1:zfyZ4Orx+mPpYDzWAxXR7DHGL50nnlZ5Edzgs1o6f/s=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@ -30,8 +30,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
 golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
Author	SHA1	Message	Date
Julian Tölle	b73563d5a6	Merge `a7c9ba002d` into `5032760cea`	2024-12-07 01:52:52 +01:00
renovate[bot]	5032760cea	chore(deps): update module github.com/stretchr/testify to v1.10.0 (#53 )	2024-12-07 00:50:40 +00:00
renovate[bot]	83c9e043f9	chore(deps): update module github.com/hetznercloud/hcloud-go/v2 to v2.17.0 (#52 )	2024-12-07 01:48:38 +01:00
renovate[bot]	020285e508	chore(deps): update dependency golangci/golangci-lint to v1.62.2 (#54 )	2024-12-07 01:48:23 +01:00
Julian Tölle	a7c9ba002d	chore: nix flake for CLI	2024-05-19 22:57:10 +02:00