Skip to content

Fix linting errors #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidkuridza wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix linting errors #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2225da
FIX code to comply with golint's rules
davidkuridza Dec 20, 2018
a760aff
ADD lint test to CI
davidkuridza Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ env:
- PACKAGE_TYPE=deb
- PACKAGE_TYPE=rpm

install:
- go get -u golang.org/x/lint/golint

script: make test

before_install:
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DATADIR := ./data
CI_COMMIT ?= dev
GIT_COMMIT := $(shell git rev-parse --short HEAD || echo $(CI_COMMIT))
VERSION ?= $(shell cat ./VERSION)
FLAGS := "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)"
FLAGS := "-X main.gitCommit=$(GIT_COMMIT) -X main.version=$(VERSION)"
DISTRIBUTIONS := ubuntu debian rhel centos opensuse sles amzn
PACKAGE_TYPE := deb rpm

Expand Down Expand Up @@ -43,7 +43,7 @@ clean: ## cleans up the repository
/bin/rm -rf $(DATADIR)
/bin/rm -rf ./.state

test: vet ## runs unit tests
test: lint vet ## runs unit tests
go test -v ./...

format: ## formats the code
Expand All @@ -52,6 +52,9 @@ format: ## formats the code
vet: ## examines the go code with `go vet`
go vet ./...

lint: ## lint the source code
golint -set_exit_status $(shell go list ./...)

up: $(addprefix up/,$(DISTRIBUTIONS)) ## start agents for all distributions
up/%: build ## starts the agent for a specific distribution
mkdir -p .state
Expand Down
65 changes: 35 additions & 30 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,59 @@ import (
"strings"
"time"

"github.com/tactycal/agent/packageLookup"
"github.com/tactycal/agent/packagelookup"
)

const (
DefaultClientTimeout = time.Second * 3
ErrorCodeExpiredToken = "TOKEN_EXPIRED"
ErrorCodeInvalidToken = "TOKEN_INVALID"
defaultClientTimeout = time.Second * 3
errorCodeExpiredToken = "TOKEN_EXPIRED"
errorCodeInvalidToken = "TOKEN_INVALID"
apiVersionPrefix = "v2"
)

type Client struct {
// List of errors
var (
ErrInvalidToken = fmt.Errorf("token was reported as invalid (perhaps the host was deleted), new host ID will be assigned to this machine")
)

type client struct {
token string
host *Host
uri string
proxyUrl *url.URL
state *State
proxyURL *url.URL
state *state
timeout time.Duration
}

type SendPackagesRequestBody struct {
type sendPackagesRequestBody struct {
*Host
Package []*packageLookup.Package `json:"packages"`
Package []*packagelookup.Package `json:"packages"`
}

type ResponseErrorCode struct {
type responseErrorCode struct {
Error string `json:"error"`
}

type Token struct {
type token struct {
Token string `json:"token"`
}

func NewClient(cfg *Config, host *Host, state *State, timeout time.Duration) *Client {
func newClient(cfg *config, host *Host, state *state, timeout time.Duration) *client {
// copy labels from config to host
host.Labels = cfg.Labels

// compose the client
return &Client{
return &client{
token: cfg.Token,
host: host,
uri: cfg.Uri,
proxyUrl: cfg.Proxy,
uri: cfg.URI,
proxyURL: cfg.Proxy,
state: state,
timeout: timeout,
}
}

func (c *Client) Authenticate() (string, error) {
func (c *client) Authenticate() (string, error) {
// create a request
rsp, err := c.apiRequest("POST", "/agent/auth", fmt.Sprintf("Token %s", c.token), &c.host)
if err != nil {
Expand All @@ -72,7 +77,7 @@ func (c *Client) Authenticate() (string, error) {
}

// decode the response
var rspData Token
var rspData token
decoder := json.NewDecoder(rsp.Body)
err = decoder.Decode(&rspData)
if err != nil {
Expand All @@ -82,13 +87,13 @@ func (c *Client) Authenticate() (string, error) {
return rspData.Token, nil
}

func (c *Client) SendPackageList(packages []*packageLookup.Package) error {
func (c *client) SendPackageList(packages []*packagelookup.Package) error {
token, err := c.getToken()
if err != nil {
return err
}

body := &SendPackagesRequestBody{
body := &sendPackagesRequestBody{
Host: c.host,
Package: packages,
}
Expand Down Expand Up @@ -117,20 +122,20 @@ func (c *Client) SendPackageList(packages []*packageLookup.Package) error {
// handle invalid or expired token response
if rsp.StatusCode == http.StatusUnauthorized {
// check error code
errCode := &ResponseErrorCode{}
errCode := &responseErrorCode{}
if err := json.NewDecoder(rsp.Body).Decode(errCode); err != nil {
return err
}

if errCode.Error == ErrorCodeInvalidToken {
if errCode.Error == errorCodeInvalidToken {
if err := c.state.Reset(); err != nil {
return err
}
return fmt.Errorf("Token was reported as invalid. Perhaps the host was deleted. New host ID will be assigned to this machine.")
return ErrInvalidToken
}

// renew a token
if errCode.Error == ErrorCodeExpiredToken {
if errCode.Error == errorCodeExpiredToken {
err := c.renewToken(token)
if err == nil {
err = fmt.Errorf("Token was reported as expired. It has been renewed")
Expand All @@ -142,7 +147,7 @@ func (c *Client) SendPackageList(packages []*packageLookup.Package) error {
return fmt.Errorf("API returned status code %d, expected 204", rsp.StatusCode)
}

func (c *Client) getToken() (string, error) {
func (c *client) getToken() (string, error) {
// try to read token from state
token, err := c.state.GetToken()
if err == nil && token != "" {
Expand All @@ -164,9 +169,9 @@ func (c *Client) getToken() (string, error) {
return token, nil
}

func (c *Client) renewToken(token string) error {
func (c *client) renewToken(accessToken string) error {
// create a request
rsp, err := c.apiRequest("POST", "/agent/renew", fmt.Sprintf("Token %s", c.token), &Token{token})
rsp, err := c.apiRequest("POST", "/agent/renew", fmt.Sprintf("Token %s", c.token), &token{accessToken})
if err != nil {
return err
}
Expand All @@ -176,14 +181,14 @@ func (c *Client) renewToken(token string) error {

if rsp.StatusCode == 401 {
c.state.Reset()
return fmt.Errorf("Token was reported as invalid. Perhaps the host was deleted. New host ID will be assigned to this machine.")
return ErrInvalidToken
}

if rsp.StatusCode != 200 {
return fmt.Errorf("Token could not be renewed")
}

var rspData Token
var rspData token
decoder := json.NewDecoder(rsp.Body)
err = decoder.Decode(&rspData)
if err != nil {
Expand All @@ -196,7 +201,7 @@ func (c *Client) renewToken(token string) error {
return err
}

func (c *Client) apiRequest(method, endpoint, authorization string, input interface{}) (*http.Response, error) {
func (c *client) apiRequest(method, endpoint, authorization string, input interface{}) (*http.Response, error) {
// encode body
body := bytes.NewBuffer(nil)
if input != nil {
Expand All @@ -223,7 +228,7 @@ func (c *Client) apiRequest(method, endpoint, authorization string, input interf
// execute the request
client := &http.Client{
Transport: &http.Transport{
Proxy: http.ProxyURL(c.proxyUrl),
Proxy: http.ProxyURL(c.proxyURL),
},
Timeout: c.timeout,
}
Expand Down
Loading