You've already forked docker-hub-description-updater
fix(lint): be compliant with golangci-lint
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 20s
Lint Markdown files / Run markdown linter (push) Successful in 3s
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 35s
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 1m3s
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 19s
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 20s
Lint Markdown files / Run markdown linter (push) Successful in 3s
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 35s
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 1m3s
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 19s
This commit is contained in:
@@ -2,7 +2,6 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
@@ -59,7 +58,8 @@ func runE(cmd *cobra.Command, args []string) error {
|
|||||||
return fmt.Errorf("can not find file: %v", file)
|
return fmt.Errorf("can not find file: %v", file)
|
||||||
}
|
}
|
||||||
|
|
||||||
f, err := ioutil.ReadFile(file)
|
// #nosec G304
|
||||||
|
f, err := os.ReadFile(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("can not read file %v: %v", file, err)
|
return fmt.Errorf("can not read file %v: %v", file, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package hub
|
|||||||
import "errors"
|
import "errors"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
errorFailedToCreateRequest = errors.New("failed to create http request")
|
errFailedToCreateRequest = errors.New("failed to create http request")
|
||||||
errorFailedToParseJSON = errors.New("failed to parse json")
|
errFailedToParseJSON = errors.New("failed to parse json")
|
||||||
errorFailedToParseURL = errors.New("failed to parse url")
|
errFailedToParseURL = errors.New("failed to parse url")
|
||||||
errorFailedToSendRequest = errors.New("failed to send http request")
|
errFailedToSendRequest = errors.New("failed to send http request")
|
||||||
errorNoNamespaceDefined = errors.New("no Namespace defined")
|
errNoNamespaceDefined = errors.New("no Namespace defined")
|
||||||
errorNoRepositoryDefined = errors.New("no Repository defined")
|
errNoRepositoryDefined = errors.New("no Repository defined")
|
||||||
errorUnexpectedHTTPStatuscode = errors.New("unexpected HTTP-Statuscode")
|
errUnexpectedHTTPStatuscode = errors.New("unexpected HTTP-Statuscode")
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -25,22 +25,22 @@ type Hub struct {
|
|||||||
func (h *Hub) GetRepository(namespace string, name string) (*types.Repository, error) {
|
func (h *Hub) GetRepository(namespace string, name string) (*types.Repository, error) {
|
||||||
|
|
||||||
if len(namespace) <= 0 {
|
if len(namespace) <= 0 {
|
||||||
return nil, errorNoNamespaceDefined
|
return nil, errNoNamespaceDefined
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(name) <= 0 {
|
if len(name) <= 0 {
|
||||||
return nil, errorNoRepositoryDefined
|
return nil, errNoRepositoryDefined
|
||||||
}
|
}
|
||||||
|
|
||||||
rawURL := fmt.Sprintf("%v/repositories/%v/%v", dockerHubAPI, namespace, name)
|
rawURL := fmt.Sprintf("%v/repositories/%v/%v", dockerHubAPI, namespace, name)
|
||||||
url, err := url.Parse(rawURL)
|
url, err := url.Parse(rawURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseURL, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseURL, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := http.NewRequest(http.MethodGet, url.String(), nil)
|
req, err := http.NewRequest(http.MethodGet, url.String(), nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToCreateRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToCreateRequest, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if h.token == nil {
|
if h.token == nil {
|
||||||
@@ -54,18 +54,18 @@ func (h *Hub) GetRepository(namespace string, name string) (*types.Repository, e
|
|||||||
|
|
||||||
resp, err := h.client.Do(req)
|
resp, err := h.client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToSendRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToSendRequest, err)
|
||||||
}
|
}
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("%v: expect %v, received %v", errorUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
return nil, fmt.Errorf("%v: expect %v, received %v", errUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
repository := new(types.Repository)
|
repository := new(types.Repository)
|
||||||
jsonDecoder := json.NewDecoder(resp.Body)
|
jsonDecoder := json.NewDecoder(resp.Body)
|
||||||
if err := jsonDecoder.Decode(repository); err != nil {
|
if err := jsonDecoder.Decode(repository); err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseJSON, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseJSON, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return repository, nil
|
return repository, nil
|
||||||
@@ -75,30 +75,30 @@ func (h *Hub) getToken() (*types.Token, error) {
|
|||||||
loginBuffer := new(bytes.Buffer)
|
loginBuffer := new(bytes.Buffer)
|
||||||
jsonEncoder := json.NewEncoder(loginBuffer)
|
jsonEncoder := json.NewEncoder(loginBuffer)
|
||||||
if err := jsonEncoder.Encode(h.credentials); err != nil {
|
if err := jsonEncoder.Encode(h.credentials); err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseJSON, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseJSON, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
rawURL := fmt.Sprintf("%v/users/login/", dockerHubAPI)
|
rawURL := fmt.Sprintf("%v/users/login/", dockerHubAPI)
|
||||||
req, err := http.NewRequest(http.MethodPost, rawURL, loginBuffer)
|
req, err := http.NewRequest(http.MethodPost, rawURL, loginBuffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToCreateRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToCreateRequest, err)
|
||||||
}
|
}
|
||||||
req.Header.Add("Content-Type", "application/json")
|
req.Header.Add("Content-Type", "application/json")
|
||||||
|
|
||||||
resp, err := h.client.Do(req)
|
resp, err := h.client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToCreateRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToCreateRequest, err)
|
||||||
}
|
}
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("%v: expect %v, received %v", errorUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
return nil, fmt.Errorf("%v: expect %v, received %v", errUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
token := new(types.Token)
|
token := new(types.Token)
|
||||||
jsonDecoder := json.NewDecoder(resp.Body)
|
jsonDecoder := json.NewDecoder(resp.Body)
|
||||||
if err := jsonDecoder.Decode(token); err != nil {
|
if err := jsonDecoder.Decode(token); err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseJSON, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseJSON, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return token, nil
|
return token, nil
|
||||||
@@ -108,11 +108,11 @@ func (h *Hub) getToken() (*types.Token, error) {
|
|||||||
func (h *Hub) PatchRepository(repository *types.Repository) (*types.Repository, error) {
|
func (h *Hub) PatchRepository(repository *types.Repository) (*types.Repository, error) {
|
||||||
|
|
||||||
if len(repository.Namespcace) <= 0 {
|
if len(repository.Namespcace) <= 0 {
|
||||||
return nil, errorNoNamespaceDefined
|
return nil, errNoNamespaceDefined
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(repository.Name) <= 0 {
|
if len(repository.Name) <= 0 {
|
||||||
return nil, errorNoRepositoryDefined
|
return nil, errNoRepositoryDefined
|
||||||
}
|
}
|
||||||
|
|
||||||
if h.token == nil {
|
if h.token == nil {
|
||||||
@@ -127,7 +127,7 @@ func (h *Hub) PatchRepository(repository *types.Repository) (*types.Repository,
|
|||||||
rawURL := fmt.Sprintf("%v/repositories/%v/%v", dockerHubAPI, repository.Namespcace, repository.Name)
|
rawURL := fmt.Sprintf("%v/repositories/%v/%v", dockerHubAPI, repository.Namespcace, repository.Name)
|
||||||
patchURL, err := url.Parse(rawURL)
|
patchURL, err := url.Parse(rawURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseURL, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseURL, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
data := &url.Values{}
|
data := &url.Values{}
|
||||||
@@ -136,24 +136,24 @@ func (h *Hub) PatchRepository(repository *types.Repository) (*types.Repository,
|
|||||||
|
|
||||||
req, err := http.NewRequest(http.MethodPatch, patchURL.String(), nil)
|
req, err := http.NewRequest(http.MethodPatch, patchURL.String(), nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToCreateRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToCreateRequest, err)
|
||||||
}
|
}
|
||||||
req.Header.Set("Authorization", fmt.Sprintf("JWT %v", h.token.Token))
|
req.Header.Set("Authorization", fmt.Sprintf("JWT %v", h.token.Token))
|
||||||
|
|
||||||
resp, err := h.client.Do(req)
|
resp, err := h.client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToCreateRequest, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToCreateRequest, err)
|
||||||
}
|
}
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("%v: expect %v, received %v", errorUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
return nil, fmt.Errorf("%v: expect %v, received %v", errUnexpectedHTTPStatuscode, http.StatusOK, resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
patchedRepository := new(types.Repository)
|
patchedRepository := new(types.Repository)
|
||||||
jsonDecoder := json.NewDecoder(resp.Body)
|
jsonDecoder := json.NewDecoder(resp.Body)
|
||||||
if err := jsonDecoder.Decode(h.token); err != nil {
|
if err := jsonDecoder.Decode(h.token); err != nil {
|
||||||
return nil, fmt.Errorf("%v: %v", errorFailedToParseJSON, err)
|
return nil, fmt.Errorf("%v: %v", errFailedToParseJSON, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return patchedRepository, nil
|
return patchedRepository, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user