MINOR: add option to set url_env and private_token_env for aspell

Author: oktalz

.aspell.yml

@@ -33,3 +33,4 @@ allowed:
   - json
   - req
   - nallowed
+  - url

aspell/aspell.go

@@ -16,7 +16,9 @@ import (
 
 type RemoteFile struct {
 	URL             string `yaml:"url"`
+	URLEnv          string `yaml:"url_env"`
 	HeaderFromENV   string `yaml:"header_from_env"`
+	PrivateTokenENV string `yaml:"private_token_env"`
 	AllowedItemsKey string `yaml:"allowed_items_key"`
 }
 

aspell/new.go

@@ -14,7 +14,7 @@ func New(filename string) (Aspell, error) {
 	var err error
 	fileExists := true
 	if data, err = os.ReadFile(filename); err != nil {
-		log.Printf("warning: aspell exceptions file not found (%s)", err)
+		log.Printf("warning: aspell exceptions file not found (%s)", err.Error())
 		fileExists = false
 	}
 
@@ -25,11 +25,15 @@ func New(filename string) (Aspell, error) {
 	}
 
 	var extraAllowedWords []string
-	if aspell.RemoteFile.URL != "" {
+	if aspell.RemoteFile.URL != "" || aspell.RemoteFile.URLEnv != "" {
 		extraAllowedWords, err = fetchRemoteFile(aspell)
 		if err != nil {
+			log.Printf("warning: aspell remote file (%s)", err.Error())
 			return Aspell{}, err
 		}
+		if len(extraAllowedWords) == 0 {
+			log.Printf("warning: aspell remote file is empty")
+		}
 	}
 
 	for i, word := range aspell.AllowedWords {

aspell/remote.go

@@ -2,6 +2,7 @@ package aspell
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"os"
 	"strings"
@@ -11,8 +12,8 @@ import (
 
 func fetchRemoteFile(aspell Aspell) ([]string, error) {
 	url := aspell.RemoteFile.URL
-	if url == "" {
-		return []string{}, nil
+	if aspell.RemoteFile.URLEnv != "" {
+		url = os.Getenv(aspell.RemoteFile.URLEnv)
 	}
 
 	req, err := http.NewRequest("GET", url, nil)
@@ -24,15 +25,22 @@ func fetchRemoteFile(aspell Aspell) ([]string, error) {
 		envValue := os.Getenv(aspell.RemoteFile.HeaderFromENV)
 		req.Header.Set(aspell.RemoteFile.HeaderFromENV, envValue)
 	}
+	if aspell.RemoteFile.PrivateTokenENV != "" {
+		envValue := os.Getenv(aspell.RemoteFile.PrivateTokenENV)
+		req.Header.Set("PRIVATE-TOKEN", envValue)
+	}
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}
-
 	defer resp.Body.Close()
 
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("error fetching remote file: %s", resp.Status)
+	}
+
 	var data map[string]interface{}
 	err = json.NewDecoder(resp.Body).Decode(&data)
 	if err != nil {