Import changes.

  - 1c601f0afc71b24b2595d04bb5983e5e28a9a17e

GitOrigin-RevId: 1c601f0afc71b24b2595d04bb5983e5e28a9a17e

.github/workflows/main.yml

@@ -42,7 +42,6 @@ jobs:
         target:
           - //agent/cmd/agent
           - //tools/nbictl/cmd/nbictl
-          - //tools/generate_jwt
         os: [linux, windows, darwin]
         arch: [amd64, arm64]
 
@@ -81,18 +80,6 @@ jobs:
         with:
           name: agent-${{ matrix.os }}-${{ matrix.arch }}
           path: bazel-bin/agent/cmd/agent/agent_/agent.exe
-      - name: Upload generate_jwt binary
-        uses: actions/upload-artifact@v4
-        if: ${{ matrix.target == '//tools/generate_jwt' && matrix.os != 'windows' }}
-        with:
-          name: generate_jwt-${{ matrix.os }}-${{ matrix.arch }}
-          path: bazel-bin/tools/generate_jwt/generate_jwt_/generate_jwt
-      - name: Upload generate_jwt binary - Windows
-        uses: actions/upload-artifact@v4
-        if: ${{ matrix.target == '//tools/generate_jwt' && matrix.os == 'windows' }}
-        with:
-          name: generate_jwt-${{ matrix.os }}-${{ matrix.arch }}
-          path: bazel-bin/tools/generate_jwt/generate_jwt_/generate_jwt.exe
 
   build-and-upload-docs:
     needs: [build-and-test]

tools/nbictl/BUILD

@@ -22,6 +22,7 @@ go_library(
     srcs = [
         "config.go",
         "connection.go",
+        "generate_auth_token.go",
         "generate_rsa_key.go",
         "grpcurl.go",
         "model.go",
@@ -37,6 +38,7 @@ go_library(
         "//auth",
         "//tools/nbictl/proto:nbictl_go_proto",
         "@com_github_fullstorydev_grpcurl//:grpcurl",
+        "@com_github_golang_jwt_jwt_v5//:jwt",
         "@com_github_jhump_protoreflect//desc",
         "@com_github_jhump_protoreflect//grpcreflect",
         "@com_github_jonboulle_clockwork//:clockwork",
@@ -64,6 +66,7 @@ go_test(
         "connection_test.go",
         "fake_modelapi_server_test.go",
         "fake_nbi_server_test.go",
+        "generate_auth_token_test.go",
         "generate_rsa_key_test.go",
         "model_test.go",
         "nbictl_test.go",
@@ -76,6 +79,7 @@ go_test(
         "//api/nbi/v1alpha/resources:nbi_resources_go_grpc",
         "//auth/authtest",
         "//tools/nbictl/proto:nbictl_go_proto",
+        "@com_github_golang_jwt_jwt_v5//:jwt",
         "@com_github_google_go_cmp//cmp",
         "@com_github_urfave_cli_v2//:cli",
         "@org_golang_google_grpc//:grpc",

tools/nbictl/README.md

@@ -199,6 +199,14 @@ Takes a fully-qualified method name in 'service.method' or 'service/method' form
 
 **--request, -r**="": File containing the request to make encoded in the selected --format. Defaults to -, which uses stdin. (default: -)
 
+## generate-auth-token
+
+Generate a self-signed JWT token for API authentication.
+
+**--audience, --aud**="": The audience (aud) to set in the JWT token.
+
+**--expiration, --exp**="": The validity duration of token, from the time of creation. (default: 1h)
+
 ## help, h
 
 Shows a list of commands or help for one command

tools/nbictl/config.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -75,7 +76,7 @@ func readConfigs(confFilePath string) (*nbictlpb.AppConfig, error) {
 	confBytes, err := os.ReadFile(confFilePath)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return confProto, nil
+			return nil, fmt.Errorf("unable to read file: %w.\nSee `%s help set-config` to learn how to configure the tool.", err, appName)
 		}
 		return nil, fmt.Errorf("unable to read file: %w", err)
 	}
@@ -196,7 +197,11 @@ func setConfig(outWriter, errWriter io.Writer, confToCreate *nbictlpb.Config, co
 
 	confProto, err := readConfigs(confFile)
 	if err != nil {
-		return fmt.Errorf("unable to get configs from file %s: %w", confFile, err)
+		if errors.Is(err, fs.ErrNotExist) {
+			confProto = &nbictlpb.AppConfig{}
+		} else {
+			return fmt.Errorf("unable to get configs from file %s: %w", confFile, err)
+		}
 	}
 
 	found := false