Merge branch 'main' into dc/user_timestamp_flag

Author: chenosaurus

README.md

@@ -425,6 +425,7 @@ lk perf agent-load-test \
   --agent-name test-agent \
   --echo-speech-delay 10s \
   --duration 5m
+  --attribute key1=value1
 ```
 
 The above simulates 5 concurrent rooms, where each room has:

autocomplete/fish_autocomplete

@@ -296,6 +296,8 @@ complete -c lk -n '__fish_seen_subcommand_from create' -f -l identity -s i -r -d
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l name -s n -r -d '`NAME` of the participant, used with --join. defaults to identity'
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l room -s r -r -d '`NAME` of the room to join'
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l metadata -r -d '`JSON` metadata to encode in the token, will be passed to participant'
+complete -c lk -n '__fish_seen_subcommand_from create' -f -l attribute -r -d 'set attributes in key=value format, can be used multiple times'
+complete -c lk -n '__fish_seen_subcommand_from create' -l attribute-file -r -d 'read attributes from a `JSON` file'
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l valid-for -r -d '`TIME` that the token is valid for, e.g. "5m", "1h10m" (s: seconds, m: minutes, h: hours)'
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l grant -r -d 'Additional `VIDEO_GRANT` fields. It\'ll be merged with other arguments (JSON formatted)'
 complete -c lk -n '__fish_seen_subcommand_from create' -f -l help -s h -d 'show help'
@@ -315,6 +317,8 @@ complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l name -s n -r
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l room -s r -r -d '`NAME` of the room to join'
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l room-configuration -r -d 'name of the room configuration to use when creating a room'
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l metadata -r -d '`JSON` metadata to encode in the token, will be passed to participant'
+complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l attribute -r -d 'set attributes in key=value format, can be used multiple times'
+complete -c lk -n '__fish_seen_subcommand_from create-token' -l attribute-file -r -d 'read attributes from a `JSON` file'
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l valid-for -r -d 'Amount of `TIME` that the token is valid for. i.e. "5m", "1h10m" (s: seconds, m: minutes, h: hours)'
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l grant -r -d 'Additional `VIDEO_GRANT` fields. It\'ll be merged with other arguments (JSON formatted)'
 complete -c lk -n '__fish_seen_subcommand_from create-token' -f -l help -s h -d 'show help'

cmd/lk/agent.go

@@ -77,6 +77,13 @@ var (
 		Required: false,
 	}
 
+	ignoreEmptySecretsFlag = &cli.BoolFlag{
+		Name:     "ignore-empty-secrets",
+		Usage:    "If set, will skip environment variables with empty values from secrets files instead of failing",
+		Required: false,
+		Value:    false,
+	}
+
 	logTypeFlag = &cli.StringFlag{
 		Name:     "log-type",
 		Usage:    "Type of logs to retrieve. Valid values are 'deploy' and 'build'",
@@ -156,6 +163,7 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 						secretsMountFlag,
+						ignoreEmptySecretsFlag,
 						silentFlag,
 						regionFlag,
 						skipSDKCheckFlag,
@@ -200,6 +208,8 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 						secretsMountFlag,
+						silentFlag,
+						ignoreEmptySecretsFlag,
 						skipSDKCheckFlag,
 					},
 					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
@@ -226,6 +236,7 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 						secretsMountFlag,
+						ignoreEmptySecretsFlag,
 					},
 					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
 					// we disable it entirely here and require multiple --secrets flags to be used.
@@ -320,6 +331,7 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 						secretsMountFlag,
+						ignoreEmptySecretsFlag,
 						idFlag(false),
 						&cli.BoolFlag{
 							Name:     "overwrite",
@@ -1284,13 +1296,20 @@ func requireSecrets(_ context.Context, cmd *cli.Command, required, lazy bool) ([
 			fmt.Printf("Using secrets file [%s]\n", util.Accented(file))
 		}
 
+		ignoreEmpty := cmd.Bool("ignore-empty-secrets")
+		var skippedEmpty []string
+
 		for k, v := range env {
 			if _, exists := secrets[k]; exists {
 				continue
 			}
 
 			if v == "" {
-				return nil, fmt.Errorf("failed to parse secrets file: secret %s is empty, either remove it or provide a value", k)
+				if ignoreEmpty {
+					skippedEmpty = append(skippedEmpty, k)
+					continue
+				}
+				return nil, fmt.Errorf("failed to parse secrets file: secret %s is empty, either remove it or provide a value, or use --ignore-empty-secrets to skip empty values", k)
 			}
 
 			secret := &lkproto.AgentSecret{
@@ -1300,6 +1319,12 @@ func requireSecrets(_ context.Context, cmd *cli.Command, required, lazy bool) ([
 			}
 			secrets[k] = secret
 		}
+
+		// Log skipped secrets if any (unless silent)
+		if len(skippedEmpty) > 0 && !silent {
+			skippedNames := strings.Join(skippedEmpty, ", ")
+			fmt.Printf("Skipped %d empty secret(s): %s\n", len(skippedEmpty), util.Dimmed(skippedNames))
+		}
 	}
 
 	var secretsSlice []*lkproto.AgentSecret