Skip to content

Commit 34d1b13

Browse files
committed
Check that only one of the kubeconfig_t::fileName and kubeconfig_t::buffer is set
Add documentation note stating that only of the kubeconfig_t::fileName and kubeconfig_t::buffer may be set
1 parent 8f759fc commit 34d1b13

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

kubernetes/config/kube_config_yaml.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,11 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
430430
{
431431
static char fname[] = "kubeyaml_load_kubeconfig()";
432432

433+
if (kubeconfig->fileName && kubeconfig->buffer) {
434+
fprintf(stderr, "%s: Cannot use both kubeconfig->fileName and kubeconfig->buffer.\n", fname);
435+
return -1;
436+
}
437+
433438
/* Set a file input or use the provided buffer. */
434439
FILE *input = NULL;
435440
if (kubeconfig->fileName) {
@@ -443,7 +448,7 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
443448
// Nothing to do here for now.
444449
}
445450
else {
446-
fprintf(stderr, "%s: The kubeconf file name needs be set by kubeconfig->fileName .\n", fname);
451+
fprintf(stderr, "%s: One of the kubeconfig->fileName or kubeconfig->buffer needs to be set.\n", fname);
447452
return -1;
448453
}
449454

kubernetes/config/kube_config_yaml.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ extern "C" {
2626
* kubeconfig->fileName: kubernetes cluster configuration file name
2727
* kubeconfig->buffer: kubernetes cluster configuration data; this is considered only if kubeconfig->fileName is set to NULL
2828
*
29+
* Note: One may use either kubeconfig->fileName or kubeconfig->buffer but not both at the same time.
30+
*
2931
* OUT:
3032
* kubeconfig: kubernetes cluster configuration
3133
*

0 commit comments

Comments
 (0)