Fix lint errors in ui and remove deprecated ioutil in api

Signed-off-by: Shiv Verma <[email protected]>

api/pkg/app/data.go

@@ -16,8 +16,9 @@ package app
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"strings"
 )
 
@@ -75,13 +76,12 @@ func httpRead(url string) ([]byte, error) {
 		return nil, fmt.Errorf(resp.Status)
 	}
 
-	return ioutil.ReadAll(resp.Body)
+	return io.ReadAll(resp.Body)
 }
 
 // readLocalFile reads data from a local file using file path
 func readLocalFile(path string) ([]byte, error) {
-
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}

api/pkg/cli/hub/hub.go

@@ -16,7 +16,7 @@ package hub
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os/user"
@@ -184,7 +184,7 @@ func httpGet(url string) ([]byte, int, error) {
 	}
 	defer resp.Body.Close()
 
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, 0, err
 	}

api/pkg/parser/catalog.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -107,7 +106,7 @@ func (c CatalogParser) findResourcesByKind(kind string) ([]Resource, Result) {
 	// search for resources under catalog/<contextPath>/<kind>
 	kindPath := filepath.Join(c.repo.Path(), c.contextPath, strings.ToLower(kind))
 
-	resourceDirs, err := ioutil.ReadDir(kindPath)
+	resourceDirs, err := os.ReadDir(kindPath)
 	if err != nil && ignoreNotExists(err) != nil {
 		log.Warnf("failed to find %s: %s", kind, err)
 		// NOTE: returns empty task list; upto caller to check for error
@@ -121,7 +120,12 @@ func (c CatalogParser) findResourcesByKind(kind string) ([]Resource, Result) {
 			continue
 		}
 
-		res, r := c.parseResource(kind, kindPath, res)
+		resDirInfo, err := res.Info()
+		if err != nil {
+			log.Infof("Failing to read dir info for %s", res.Name())
+			continue
+		}
+		res, r := c.parseResource(kind, kindPath, resDirInfo)
 		result.Combine(r)
 		if r.Errors != nil {
 			log.Warn(r.Error())
@@ -141,7 +145,7 @@ func (c CatalogParser) findResourcesByKind(kind string) ([]Resource, Result) {
 
 func dirCount(path string) int {
 	count := 0
-	dirs, _ := ioutil.ReadDir(path)
+	dirs, _ := os.ReadDir(path)
 	for _, d := range dirs {
 		if d.IsDir() {
 			count++
@@ -332,7 +336,7 @@ func decodeResource(reader io.Reader, kind string) (*TektonResource, error) {
 	// to read from readers
 	var dup bytes.Buffer
 	r := io.TeeReader(reader, &dup)
-	contents, err := ioutil.ReadAll(r)
+	contents, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}

api/pkg/service/admin/admin_http_test.go

@@ -18,8 +18,9 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 	"testing"
 
 	"github.com/golang-jwt/jwt"
@@ -62,7 +63,7 @@ func TestUpdateAgent_Http_NewAgent(t *testing.T) {
 		WithHeader("Authorization", accessToken).WithBody(data).
 		Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -97,7 +98,7 @@ func TestUpdateAgent_Http_NormalUserExistWithName(t *testing.T) {
 		WithHeader("Authorization", accessToken).WithBody(data).
 		Check().
 		HasStatus(400).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -127,7 +128,7 @@ func TestUpdateAgent_Http_InvalidScopeCase(t *testing.T) {
 		WithHeader("Authorization", accessToken).WithBody(data).
 		Check().
 		HasStatus(400).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -159,7 +160,7 @@ func TestUpdateAgent_Http_UpdateCase(t *testing.T) {
 		WithHeader("Authorization", accessToken).WithBody(data).
 		Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -205,7 +206,7 @@ func TestRefreshConfig_Http(t *testing.T) {
 	RefreshConfigChecker(tc).Test(t, http.MethodPost, "/system/config/refresh").
 		WithHeader("Authorization", token).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -230,7 +231,7 @@ func TestRefreshConfig_Http(t *testing.T) {
 }
 
 func computeChecksum() (string, error) {
-	data, err := ioutil.ReadFile("../../../test/config/config.yaml")
+	data, err := os.ReadFile("../../../test/config/config.yaml")
 	if err != nil {
 		return "", err
 	}

api/pkg/service/catalog/catalog_http_test.go

@@ -17,7 +17,7 @@ package catalog
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -51,7 +51,7 @@ func TestRefresh_Http(t *testing.T) {
 	RefreshChecker(tc).Test(t, http.MethodPost, "/catalog/catalog-official/refresh").
 		WithHeader("Authorization", token).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -93,7 +93,7 @@ func TestRefreshAll_Http(t *testing.T) {
 	RefreshAllChecker(tc).Test(t, http.MethodPost, "/catalog/refresh").
 		WithHeader("Authorization", token).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -117,7 +117,7 @@ func TestCatalogError_Http(t *testing.T) {
 	CatalogErrorChecker(tc).Test(t, http.MethodGet, "/catalog/catalog-official/error").
 		WithHeader("Authorization", token).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -141,7 +141,7 @@ func TestCatalogError_HttpHavingNoError(t *testing.T) {
 	CatalogErrorChecker(tc).Test(t, http.MethodGet, "/catalog/catalog-community/error").
 		WithHeader("Authorization", token).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 

api/pkg/service/category/category_http_test.go

@@ -16,7 +16,7 @@ package category
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -40,7 +40,7 @@ func TestCategories_List_Http(t *testing.T) {
 
 	checker.Test(t, http.MethodGet, "/categories").Check().
 		HasStatus(http.StatusOK).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -63,7 +63,7 @@ func TestCategories_List_Http_V1(t *testing.T) {
 
 	checker.Test(t, http.MethodGet, "/v1/categories").Check().
 		HasStatus(http.StatusOK).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 

api/pkg/service/rating/rating_http_test.go

@@ -16,7 +16,7 @@ package rating
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -47,7 +47,7 @@ func TestGet_Http_InvalidToken(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/1/rating").
 		WithHeader("Authorization", "invalidToken").Check().
 		HasStatus(401).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -75,7 +75,7 @@ func TestGet_Http_ExpiredToken(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/1/rating").
 		WithHeader("Authorization", accessToken).Check().
 		HasStatus(401).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -102,7 +102,7 @@ func TestGet_Http_InvalidScopes(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/1/rating").
 		WithHeader("Authorization", accessToken).Check().
 		HasStatus(403).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -129,7 +129,7 @@ func TestGet_Http(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/1/rating").
 		WithHeader("Authorization", accessToken).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -156,7 +156,7 @@ func TestGet_Http_RatingNotFound(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/3/rating").
 		WithHeader("Authorization", accessToken).Check().
 		HasStatus(200).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -183,7 +183,7 @@ func TestGet_Http_ResourceNotFound(t *testing.T) {
 	GetChecker(tc).Test(t, http.MethodGet, "/resource/99/rating").
 		WithHeader("Authorization", accessToken).Check().
 		HasStatus(404).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -273,7 +273,7 @@ func TestUpdate_Http_ResourceNotFound(t *testing.T) {
 		WithHeader("Authorization", accessToken).
 		WithBody(data).Check().
 		HasStatus(404).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 

api/pkg/service/status/status_http_test.go

@@ -17,7 +17,7 @@ package status
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"testing"
@@ -92,7 +92,7 @@ func TestOk_http(t *testing.T) {
 
 	checker.Test(t, http.MethodGet, "/").Check().
 		HasStatus(http.StatusOK).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 
@@ -120,7 +120,7 @@ func TestDB_NotOK(t *testing.T) {
 
 	checker.Test(t, http.MethodGet, "/").Check().
 		HasStatus(http.StatusOK).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 

api/v1/service/catalog/catalog_http_test.go

@@ -16,7 +16,7 @@ package catalog
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -40,7 +40,7 @@ func TestCatalog_List_Http(t *testing.T) {
 
 	checker.Test(t, http.MethodGet, "/v1/catalogs").Check().
 		HasStatus(http.StatusOK).Cb(func(r *http.Response) {
-		b, readErr := ioutil.ReadAll(r.Body)
+		b, readErr := io.ReadAll(r.Body)
 		assert.NoError(t, readErr)
 		defer r.Body.Close()
 

api/v1/service/resource/resource.go

@@ -19,8 +19,8 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/url"
+	"os"
 	"strings"
 	"time"
 
@@ -185,7 +185,7 @@ func (s *service) ByCatalogKindNameVersionReadme(ctx context.Context,
 
 	readmePath := fmt.Sprintf("%s/%s/%s/%s/%s/README.md", s.CatalogClonePath(), strings.ToLower(p.Catalog), strings.ToLower(p.Kind), p.Name, p.Version)
 	s.Logger(ctx).Info(fmt.Sprintf("Fetching README for resource %s", p.Name))
-	content, err := ioutil.ReadFile(readmePath)
+	content, err := os.ReadFile(readmePath)
 	if err != nil {
 		return nil, resource.MakeNotFound(fmt.Errorf("resource not found"))
 	}
@@ -207,7 +207,7 @@ func (s *service) ByCatalogKindNameVersionYaml(ctx context.Context,
 	yamlPath := fmt.Sprintf("%s/%s/%s/%s/%s", s.CatalogClonePath(), strings.ToLower(p.Catalog), strings.ToLower(p.Kind), p.Name, p.Version)
 	yamlPath = fmt.Sprintf("%s/%s.yaml", yamlPath, p.Name)
 	s.Logger(ctx).Info(fmt.Sprintf("Fetching YAML for resource %s", p.Name))
-	content, err := ioutil.ReadFile(yamlPath)
+	content, err := os.ReadFile(yamlPath)
 	if err != nil {
 		return nil, resource.MakeNotFound(fmt.Errorf("resource not found"))
 	}
@@ -511,10 +511,10 @@ func (s *service) GetRawYamlByCatalogKindNameVersion(ctx context.Context, p *res
 	yamlPath := fmt.Sprintf("%s/%s/%s/%s/%s", s.CatalogClonePath(), strings.ToLower(p.Catalog), strings.ToLower(p.Kind), p.Name, p.Version)
 	yamlPath = fmt.Sprintf("%s/%s.yaml", yamlPath, p.Name)
 
-	content, err := ioutil.ReadFile(yamlPath)
+	content, err := os.ReadFile(yamlPath)
 	if err != nil {
 		return nil, resource.MakeNotFound(fmt.Errorf("resource not found"))
 	}
 
-	return ioutil.NopCloser(bytes.NewBuffer(content)), nil
+	return io.NopCloser(bytes.NewBuffer(content)), nil
 }