diff options
| author |   Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-08-31 14:57:54 -0700 |
|---|---|---|
| committer | Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2018-08-31 14:59:38 -0700 |
| commit | 28376cbc428324577451181f67f383ea9d8de164 (patch) | |
| tree | cb4666aa2d8866240c331ec05d96d9b2a831c65a /src/k8splugin/api | |
| parent | 979f6535310b683747fd23423d27e0eeb72208b7 (diff) | |
Make PLUGINS_DIR to be required than optional
This patch makes sure PLUGINS_DIR is not optional since its better
explicitly pass the plugins directory.
Change-Id: I08da5cf1563527d8b713fa106aa05b37a26c95cb
Issue-ID: MULTICLOUD-301
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Diffstat (limited to 'src/k8splugin/api')
| -rw-r--r-- | src/k8splugin/api/api.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go index 651d9311..53db3fb5 100644 --- a/src/k8splugin/api/api.go +++ b/src/k8splugin/api/api.go @@ -28,7 +28,7 @@ import ( // CheckEnvVariables checks for required Environment variables func CheckEnvVariables() error { - envList := []string{"CSAR_DIR", "KUBE_CONFIG_DIR", "DATABASE_TYPE", "DATABASE_IP"} + envList := []string{"CSAR_DIR", "KUBE_CONFIG_DIR", "PLUGINS_DIR", "DATABASE_TYPE", "DATABASE_IP"} for _, env := range envList { if _, ok := os.LookupEnv(env); !ok { return pkgerrors.New("environment variable " + env + " not set") @@ -60,10 +60,7 @@ func CheckDatabaseConnection() error { // LoadPlugins loads all the compiled .so plugins func LoadPlugins() error { - pluginsDir, ok := os.LookupEnv("PLUGINS_DIR") - if !ok { - pluginsDir, _ = filepath.Abs(filepath.Dir(os.Args[0])) - } + pluginsDir := os.Getenv("PLUGINS_DIR") err := filepath.Walk(pluginsDir, func(path string, info os.FileInfo, err error) error { if strings.Contains(path, ".so") { |