From ecd09c420222bde469ae0528b2a0f236ab840981 Mon Sep 17 00:00:00 2001 From: Ryan Koval Date: Sat, 28 Jan 2023 17:47:42 -0600 Subject: [PATCH] fixed lint --- caching/caching.go | 3 +-- caching/fetch_tools.go | 3 +-- generators/searchers_by_service_id_sorter/main.go | 6 +++--- parsers/yml_parser.go | 4 ++-- workflow/workflow.go | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/caching/caching.go b/caching/caching.go index 03d59dcc..878961a4 100644 --- a/caching/caching.go +++ b/caching/caching.go @@ -2,7 +2,6 @@ package caching import ( "errors" - "io/ioutil" "log" "os" "strings" @@ -70,7 +69,7 @@ func LoadEntityArrayFromCache[K Entity](wf *aw.Workflow, searchArgs searchutil.S // but that's bad given that we will never be run in AWS. as a result, just populate an error string that informs users better errString = "NoCredentialProviders" } - _ = ioutil.WriteFile(lastFetchErrPath, []byte(errString), 0600) + _ = os.WriteFile(lastFetchErrPath, []byte(errString), 0600) panic(err) } else { os.Remove(lastFetchErrPath) diff --git a/caching/fetch_tools.go b/caching/fetch_tools.go index 88a50d88..61678fc6 100644 --- a/caching/fetch_tools.go +++ b/caching/fetch_tools.go @@ -2,7 +2,6 @@ package caching import ( "errors" - "io/ioutil" "log" "os" "os/exec" @@ -53,7 +52,7 @@ func handleExpiredCache(wf *aw.Workflow, cacheName string, lastFetchErrPath stri } func handleFetchErr(wf *aw.Workflow, lastFetchErrPath string, searchArgs searchutil.SearchArgs) error { - data, err := ioutil.ReadFile(lastFetchErrPath) + data, err := os.ReadFile(lastFetchErrPath) if err != nil { if !os.IsNotExist(err) { // this file will often not exist, so don't spam logs if it doesn't diff --git a/generators/searchers_by_service_id_sorter/main.go b/generators/searchers_by_service_id_sorter/main.go index 6a289f9a..146a0746 100644 --- a/generators/searchers_by_service_id_sorter/main.go +++ b/generators/searchers_by_service_id_sorter/main.go @@ -1,13 +1,13 @@ package main import ( - "io/ioutil" + "os" "sort" "strings" ) func main() { - content, err := ioutil.ReadFile("../searchers/searchers_by_service_id.go") + content, err := os.ReadFile("../searchers/searchers_by_service_id.go") if err != nil { panic(err) } @@ -36,7 +36,7 @@ func main() { } } - err = ioutil.WriteFile("../searchers/searchers_by_service_id.go", []byte(strings.Join(lines, "\n")), 0600) + err = os.WriteFile("../searchers/searchers_by_service_id.go", []byte(strings.Join(lines, "\n")), 0600) if err != nil { panic(err) } diff --git a/parsers/yml_parser.go b/parsers/yml_parser.go index ba9e9f82..39286eed 100644 --- a/parsers/yml_parser.go +++ b/parsers/yml_parser.go @@ -1,8 +1,8 @@ package parsers import ( - "io/ioutil" "log" + "os" "github.com/rkoval/alfred-aws-console-services-workflow/awsworkflow" "gopkg.in/yaml.v2" @@ -10,7 +10,7 @@ import ( func ParseConsoleServicesYml(ymlPath string) []awsworkflow.AwsService { awsServices := []awsworkflow.AwsService{} - yamlFile, err := ioutil.ReadFile(ymlPath) + yamlFile, err := os.ReadFile(ymlPath) if err != nil { log.Fatal(err) } diff --git a/workflow/workflow.go b/workflow/workflow.go index 33274c7a..ab17ccc6 100644 --- a/workflow/workflow.go +++ b/workflow/workflow.go @@ -3,7 +3,6 @@ package workflow import ( "encoding/json" "fmt" - "io/ioutil" "log" "net/http" "os" @@ -250,7 +249,7 @@ func handleOpenAll(wf *aw.Workflow, awsService *awsworkflow.AwsService, allAwsSe if err != nil { panic(err) } - err = ioutil.WriteFile(lastOpenedUrlsPath, urlBytes, 0600) + err = os.WriteFile(lastOpenedUrlsPath, urlBytes, 0600) if err != nil { panic(err) }