Add field alignment

cmd/app/options.go

@@ -62,15 +62,13 @@ var (
 
 // Options is a struct to hold options for the version-checker
 type Options struct {
+	Client                client.Options
+	kubeConfigFlags       *genericclioptions.ConfigFlags
+	selfhosted            selfhosted.Options
 	MetricsServingAddress string
-	DefaultTestAll        bool
-	CacheTimeout          time.Duration
 	LogLevel              string
-
-	kubeConfigFlags *genericclioptions.ConfigFlags
-	selfhosted      selfhosted.Options
-
-	Client client.Options
+	CacheTimeout          time.Duration
+	DefaultTestAll        bool
 }
 
 func (o *Options) addFlags(cmd *cobra.Command) {
@@ -272,27 +270,27 @@ func (o *Options) complete() {
 
 	envs := os.Environ()
 	for _, opt := range []struct {
-		key    string
 		assign *string
+		key    string
 	}{
-		{envACRUsername, &o.Client.ACR.Username},
-		{envACRPassword, &o.Client.ACR.Password},
-		{envACRRefreshToken, &o.Client.ACR.RefreshToken},
+		{key: envACRUsername, assign: &o.Client.ACR.Username},
+		{key: envACRPassword, assign: &o.Client.ACR.Password},
+		{key: envACRRefreshToken, assign: &o.Client.ACR.RefreshToken},
 
-		{envDockerUsername, &o.Client.Docker.Username},
-		{envDockerPassword, &o.Client.Docker.Password},
-		{envDockerToken, &o.Client.Docker.Token},
+		{key: envDockerUsername, assign: &o.Client.Docker.Username},
+		{key: envDockerPassword, assign: &o.Client.Docker.Password},
+		{key: envDockerToken, assign: &o.Client.Docker.Token},
 
-		{envECRIamRoleArn, &o.Client.ECR.IamRoleArn},
-		{envECRAccessKeyID, &o.Client.ECR.AccessKeyID},
-		{envECRSessionToken, &o.Client.ECR.SessionToken},
-		{envECRSecretAccessKey, &o.Client.ECR.SecretAccessKey},
+		{key: envECRIamRoleArn, assign: &o.Client.ECR.IamRoleArn},
+		{key: envECRAccessKeyID, assign: &o.Client.ECR.AccessKeyID},
+		{key: envECRSessionToken, assign: &o.Client.ECR.SessionToken},
+		{key: envECRSecretAccessKey, assign: &o.Client.ECR.SecretAccessKey},
 
-		{envGCRAccessToken, &o.Client.GCR.Token},
+		{key: envGCRAccessToken, assign: &o.Client.GCR.Token},
 
-		{envGHCRAccessToken, &o.Client.GHCR.Token},
+		{key: envGHCRAccessToken, assign: &o.Client.GHCR.Token},
 
-		{envQuayToken, &o.Client.Quay.Token},
+		{key: envQuayToken, assign: &o.Client.Quay.Token},
 	} {
 		for _, env := range envs {
 			if o.assignEnv(env, opt.key, opt.assign) {

cmd/app/options_test.go

@@ -17,8 +17,8 @@ import (
 
 func TestComplete(t *testing.T) {
 	tests := map[string]struct {
-		envs       [][2]string
 		expOptions client.Options
+		envs       [][2]string
 	}{
 		"no envs should give no options": {
 			envs: [][2]string{},
@@ -190,8 +190,8 @@ func TestComplete(t *testing.T) {
 
 func TestAssignSelfhosted(t *testing.T) {
 	tests := map[string]struct {
-		envs       []string
 		expOptions client.Options
+		envs       []string
 	}{
 		"no envs should give no options": {
 			envs: []string{},

pkg/api/types.go

@@ -42,22 +42,17 @@ const (
 // Options is used to describe what restrictions should be used for determining
 // the latest image.
 type Options struct {
-	OverrideURL *string `json:"override-url,omitempty"`
-
+	OverrideURL  *string        `json:"override-url,omitempty"`
+	MatchRegex   *string        `json:"match-regex,omitempty"`
+	PinMajor     *int64         `json:"pin-major,omitempty"`
+	PinMinor     *int64         `json:"pin-minor,omitempty"`
+	PinPatch     *int64         `json:"pin-patch,omitempty"`
+	RegexMatcher *regexp.Regexp `json:"-"`
 	// UseSHA cannot be used with any other options
 	UseSHA bool `json:"use-sha,omitempty"`
-
-	MatchRegex *string `json:"match-regex,omitempty"`
-
 	// UseMetaData defines whether tags with '-alpha', '-debian.0' etc. is
 	// permissible.
 	UseMetaData bool `json:"use-metadata,omitempty"`
-
-	PinMajor *int64 `json:"pin-major,omitempty"`
-	PinMinor *int64 `json:"pin-minor,omitempty"`
-	PinPatch *int64 `json:"pin-patch,omitempty"`
-
-	RegexMatcher *regexp.Regexp `json:"-"`
 }
 
 // ImageTag describes a container image tag.

pkg/cache/cache.go

@@ -12,21 +12,19 @@ import (
 
 // Cache is a generic cache store.
 type Cache struct {
-	log *logrus.Entry
-
-	mu      sync.RWMutex
-	timeout time.Duration
 	handler Handler
-
-	store map[string]*cacheItem
+	log     *logrus.Entry
+	store   map[string]*cacheItem
+	timeout time.Duration
+	mu      sync.RWMutex
 }
 
 // cacheItem is a single item for the cache stored. This cache item is
 // periodically garbage collected.
 type cacheItem struct {
-	mu        sync.Mutex
 	timestamp time.Time
 	i         interface{}
+	mu        sync.Mutex
 }
 
 // Handler is an interface for implementations of the cache fetch

pkg/client/acr/acr.go

@@ -24,10 +24,9 @@ const (
 
 type Client struct {
 	*http.Client
-	Options
-
-	cacheMu         sync.Mutex
 	cachedACRClient map[string]*acrClient
+	Options
+	cacheMu sync.Mutex
 }
 
 type acrClient struct {

pkg/client/client.go

@@ -39,19 +39,19 @@ type ImageClient interface {
 // Client is a container image registry client to list tags of given image
 // URLs.
 type Client struct {
-	clients        []ImageClient
 	fallbackClient ImageClient
+	clients        []ImageClient
 }
 
 // Options used to configure client authentication.
 type Options struct {
-	ACR        acr.Options
+	Selfhosted map[string]*selfhosted.Options
 	ECR        ecr.Options
+	ACR        acr.Options
+	Docker     docker.Options
 	GCR        gcr.Options
 	GHCR       ghcr.Options
-	Docker     docker.Options
 	Quay       quay.Options
-	Selfhosted map[string]*selfhosted.Options
 }
 
 func New(ctx context.Context, log *logrus.Entry, opts Options) (*Client, error) {

pkg/client/ecr/ecr.go

@@ -14,9 +14,8 @@ import (
 )
 
 type Client struct {
-	Config aws.Config
-
 	Options
+	Config aws.Config
 }
 
 type Options struct {

pkg/client/gcr/gcr.go

@@ -30,8 +30,8 @@ type Response struct {
 }
 
 type ManifestItem struct {
-	Tag         []string `json:"tag"`
 	TimeCreated string   `json:"timeCreatedMs"`
+	Tag         []string `json:"tag"`
 }
 
 func New(opts Options) *Client {

pkg/client/quay/pager.go

@@ -11,14 +11,12 @@ import (
 // pager is used for implementing the paging mechanism for fetching image tags
 type pager struct {
 	*Client
-
-	repo, image string
-
-	mu sync.Mutex
-	wg sync.WaitGroup
-
-	tags []api.ImageTag
-	errs []error
+	repo  string
+	image string
+	tags  []api.ImageTag
+	errs  []error
+	wg    sync.WaitGroup
+	mu    sync.Mutex
 }
 
 func (c *Client) newPager(repo, image string) *pager {

pkg/client/quay/quay.go

@@ -41,8 +41,8 @@ type responseTagItem struct {
 }
 
 type responseManifest struct {
-	ManifestData string `json:"manifest_data"`
 	Status       *int   `json:"status,omitempty"`
+	ManifestData string `json:"manifest_data"`
 }
 
 type responseManifestData struct {

pkg/client/selfhosted/selfhosted.go

@@ -40,8 +40,8 @@ type Options struct {
 	Password  string
 	Bearer    string
 	TokenPath string
-	Insecure  bool
 	CAPath    string
+	Insecure  bool
 }
 
 type Client struct {

pkg/controller/checker/checker.go

@@ -20,8 +20,8 @@ type Checker struct {
 type Result struct {
 	CurrentVersion string
 	LatestVersion  string
-	IsLatest       bool
 	ImageURL       string
+	IsLatest       bool
 }
 
 func New(search search.Searcher) *Checker {

pkg/controller/checker/checker_test.go

@@ -15,11 +15,11 @@ import (
 
 func TestContainer(t *testing.T) {
 	tests := map[string]struct {
-		statusSHA  string
-		imageURL   string
 		opts       *api.Options
 		searchResp *api.ImageTag
 		expResult  *Result
+		statusSHA  string
+		imageURL   string
 	}{
 		"no status sha should return nil, nil": {
 			statusSHA:  "",
@@ -278,9 +278,9 @@ func TestContainer(t *testing.T) {
 
 func TestContainerStatusImageSHA(t *testing.T) {
 	tests := map[string]struct {
-		status []corev1.ContainerStatus
 		name   string
 		expSHA string
+		status []corev1.ContainerStatus
 	}{
 		"if no status, then return ''": {
 			status: []corev1.ContainerStatus{},
@@ -393,11 +393,12 @@ func TestIsLatestOrEmptyTag(t *testing.T) {
 
 func TestIsLatestSemver(t *testing.T) {
 	tests := map[string]struct {
-		imageURL, currentSHA string
-		currentImage         *semver.SemVer
-		searchResp           *api.ImageTag
-		expLatestImage       *api.ImageTag
-		expIsLatest          bool
+		currentImage   *semver.SemVer
+		searchResp     *api.ImageTag
+		expLatestImage *api.ImageTag
+		imageURL       string
+		currentSHA     string
+		expIsLatest    bool
 	}{
 		"if current semver is less, then is less": {
 			imageURL:     "docker.io",
@@ -480,9 +481,10 @@ func TestIsLatestSemver(t *testing.T) {
 
 func TestIsLatestSHA(t *testing.T) {
 	tests := map[string]struct {
-		imageURL, currentSHA string
-		searchResp           *api.ImageTag
-		expResult            *Result
+		searchResp *api.ImageTag
+		expResult  *Result
+		imageURL   string
+		currentSHA string
 	}{
 		"if SHA not eqaual, then should be not equal": {
 			imageURL:   "docker.io",

pkg/controller/options/options_test.go

@@ -145,8 +145,8 @@ func TestBuild(t *testing.T) {
 
 func TestIsEnabled(t *testing.T) {
 	tests := map[string]struct {
-		containerName string
 		annotations   map[string]string
+		containerName string
 		defaultAll    bool
 		expEnabled    bool
 	}{

pkg/version/semver/semver.go

@@ -12,15 +12,13 @@ var (
 
 // SemVer is a struct to contain a SemVer of an image tag.
 type SemVer struct {
-	// version is the version number of a tag. 'Left', or smaller index, the
-	// higher weight.
-	version [3]int64
-
 	// metadata holds the metadata, which is the string suffixed from the patch
 	metadata string
-
 	// original holds the origin string of the tag
 	original string
+	// version is the version number of a tag. 'Left', or smaller index, the
+	// higher weight.
+	version [3]int64
 }
 
 func Parse(tag string) *SemVer {