refactor: migrate JSON function to new package

We now use it to help read remote docker registries also.
This commit is contained in:
2021-08-09 16:16:33 +02:00
parent 260edad142
commit 7ad812ad98
3 changed files with 17 additions and 7 deletions

View File

@ -11,6 +11,7 @@ import (
"time"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/web"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
)
@ -204,7 +205,7 @@ func readAppsCatalogueFS(target interface{}) error {
}
func readAppsCatalogueWeb(target interface{}) error {
if err := readJson(appsCatalogueURL, &target); err != nil {
if err := web.ReadJSON(appsCatalogueURL, &target); err != nil {
return err
}

View File

@ -1,17 +0,0 @@
package catalogue
import (
"encoding/json"
"net/http"
"time"
)
func readJson(url string, target interface{}) error {
httpClient := &http.Client{Timeout: 5 * time.Second}
res, err := httpClient.Get(url)
if err != nil {
return err
}
defer res.Body.Close()
return json.NewDecoder(res.Body).Decode(target)
}