From a50e0a55fb84a20f790ed06bf5aabd1e1e246f5e Mon Sep 17 00:00:00 2001
From: sulabh chaturvedi <sulabhchaturvedi08@gmail.com>
Date: Mon, 12 Apr 2021 20:56:06 +0100
Subject: [PATCH] replace io/fs with os, go mod failing -
 https://github.com/golang/go/issues/40067#issuecomment-782075833

---
 api/konfig/plugins.go      | 3 +--
 api/konfig/plugins_test.go | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/konfig/plugins.go b/api/konfig/plugins.go
index 6ceec212d22..1a8c0626053 100644
--- a/api/konfig/plugins.go
+++ b/api/konfig/plugins.go
@@ -4,7 +4,6 @@
 package konfig
 
 import (
-	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -169,7 +168,7 @@ func mergeMultipleConfigDirsToOne(dirs []string, fSys filesys.FileSystem) string
 	for _, root := range dirs {
 		root = filepath.Join(root, ProgramName, RelPluginHome)
 		if fSys.Exists(root) {
-			fSys.Walk(root, func(path string, info fs.FileInfo, err error) error {
+			fSys.Walk(root, func(path string, info os.FileInfo, err error) error {
 				if !info.IsDir() {
 					idx := strings.Index(path, "plugin")
 					trimPath := path[idx:]
diff --git a/api/konfig/plugins_test.go b/api/konfig/plugins_test.go
index 8a9586f5354..1cb05049a1a 100644
--- a/api/konfig/plugins_test.go
+++ b/api/konfig/plugins_test.go
@@ -5,7 +5,6 @@ package konfig
 
 import (
 	"fmt"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -227,7 +226,7 @@ func TestDefaultAbsPluginHomeWithXdgConfigDirs(t *testing.T) {
 	var expected = []string{filepath.Join(h, "1", "fakeplugin.so"), filepath.Join(h, "2",
 		"fakeplugin.so")}
 	var actual []string
-	fSys.Walk(h, func(path string, info fs.FileInfo, err error) error {
+	fSys.Walk(h, func(path string, info os.FileInfo, err error) error {
 		fmt.Println(h)
 		if info.Name() == "fakeplugin.so" {
 			actual = append(actual, path)