From 40d78f5d7b6cbbdbed2221c465c3e52f45c713ca Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Fri, 4 Oct 2024 00:44:57 +0900
Subject: [PATCH] kubelogin-oidc: 1.30.0 -> 1.30.1 (#346100)

- Diff: https://github.com/int128/kubelogin/compare/v1.30.0...v1.30.1
- Pinned buildGo123Module to fix build
- Added version in ldflags for correct version reporting
- Run all package tests during build
- Moved to by-name
- Added myself as maintainer
---
 .../ku/kubelogin-oidc/package.nix}            | 35 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 26 insertions(+), 11 deletions(-)
 rename pkgs/{applications/networking/cluster/kubelogin-oidc/default.nix => by-name/ku/kubelogin-oidc/package.nix} (53%)

diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
similarity index 53%
rename from pkgs/applications/networking/cluster/kubelogin-oidc/default.nix
rename to pkgs/by-name/ku/kubelogin-oidc/package.nix
index e7d879a83aac..efc658aae6a8 100644
--- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -1,31 +1,48 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGo123Module,
+  fetchFromGitHub,
+}:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "kubelogin";
-  version = "1.30.0";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "int128";
-    repo = pname;
+    repo = "kubelogin";
     rev = "v${version}";
-    sha256 = "sha256-DHg46t0gMypK6Nj428gpOMtPuA+XcW4IJU39CHTVGPw=";
+    hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU=";
   };
 
-  subPackages = ["."];
+  subPackages = [ "." ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${version}"
+  ];
 
   vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY=";
 
+  # test all packages
+  preCheck = ''
+    unset subPackages
+  '';
+
   # Rename the binary instead of symlinking to avoid conflict with the
   # Azure version of kubelogin
   postInstall = ''
     mv $out/bin/kubelogin $out/bin/kubectl-oidc_login
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication";
     mainProgram = "kubectl-oidc_login";
     inherit (src.meta) homepage;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      benley
+      nevivurn
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6deb5d614871..7bd456cadc28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30752,8 +30752,6 @@ with pkgs;
 
   kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
 
-  kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { };
-
   kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
 
   k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { };