Skip to content

Commit 828353e

Browse files
mmaturmmatur
authored
Docker authentication
1 parent 3ebe16a commit 828353e

File tree

12 files changed

+52
-48
lines changed

12 files changed

+52
-48
lines changed

‎.golangci.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
"noctx", # Too strict
4747
"exhaustive", # Too strict
4848
"nlreturn", # Too strict
49+
"wrapcheck",
50+
"exhaustivestruct",
51+
"tparallel",
4952
]
5053

5154
[issues]

‎.semaphore/semaphore.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,21 @@ fail_fast:
1414
stop:
1515
when: "branch != 'master'"
1616

17+
global_job_config:
18+
secrets:
19+
- name: dockerhub-pull-secrets
20+
prologue:
21+
commands:
22+
- curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
23+
- sudo semgo go1.15
24+
- echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
25+
- checkout
26+
1727
blocks:
1828
- name: Build
1929
skip:
2030
when: "branch = 'gh-pages'"
2131
task:
22-
prologue:
23-
commands:
24-
- curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
25-
- sudo semgo go1.15
26-
- checkout
2732
jobs:
2833
- name: Cache Go dependencies
2934
commands:
@@ -43,9 +48,6 @@ blocks:
4348
task:
4449
prologue:
4550
commands:
46-
- curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
47-
- sudo semgo go1.15
48-
- checkout
4951
- cache restore
5052
jobs:
5153
- name: Unit Tests
@@ -58,9 +60,6 @@ blocks:
5860
task:
5961
prologue:
6062
commands:
61-
- curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
62-
- sudo semgo go1.15
63-
- checkout
6463
- cache restore
6564
- cache restore traefik-mesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
6665
- cache restore traefik-mesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ WORKDIR /go/src/github.com/traefik/mesh
2121
RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
2222

2323
# Download golangci-lint binary to bin folder in $GOPATH
24-
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.31.0
24+
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.32.0
2525

2626
ENV GO111MODULE on
2727
COPY go.mod go.sum ./

‎cmd/mesh/mesh.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
stdlog "log"
78
"net/http"
@@ -119,7 +120,7 @@ func traefikMeshCommand(config *cmd.TraefikMeshConfiguration) error {
119120
go func() {
120121
defer wg.Done()
121122

122-
if err := apiServer.ListenAndServe(); err != http.ErrServerClosed {
123+
if err := apiServer.ListenAndServe(); errors.Is(err, http.ErrServerClosed) {
123124
apiErrCh <- fmt.Errorf("API server has stopped unexpectedly: %w", err)
124125
}
125126
}()

‎integration/k3d/k3d.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func NewCluster(logger logrus.FieldLogger, masterURL string, name string, opts .
9090
}
9191

9292
if err = createCluster(logger, name, clusterOpts.Cmd); err != nil {
93-
return nil, fmt.Errorf("unable to create k3s cluster: %d", err)
93+
return nil, fmt.Errorf("unable to create k3s cluster: %w", err)
9494
}
9595

9696
if err = importDockerImages(logger, name, clusterOpts.Images); err != nil {
@@ -199,7 +199,7 @@ func (c *Cluster) WaitReadyDeployment(name, namespace string, timeout time.Durat
199199
return fmt.Errorf("deployment %q has not been yet created", name)
200200
}
201201

202-
return fmt.Errorf("unable get deployment %q in namespace %q: %v", name, namespace, err)
202+
return fmt.Errorf("unable get deployment %q in namespace %q: %w", name, namespace, err)
203203
}
204204

205205
if d.Status.UpdatedReplicas == *(d.Spec.Replicas) &&
@@ -230,7 +230,7 @@ func (c *Cluster) WaitReadyDaemonSet(name, namespace string, timeout time.Durati
230230
return fmt.Errorf("daemonset %q has not been yet created", name)
231231
}
232232

233-
return fmt.Errorf("unable get daemonset %q in namespace %q: %v", name, namespace, err)
233+
return fmt.Errorf("unable get daemonset %q in namespace %q: %w", name, namespace, err)
234234
}
235235
if d.Status.NumberReady == d.Status.DesiredNumberScheduled {
236236
return nil
@@ -257,7 +257,7 @@ func (c *Cluster) WaitReadyPod(name, namespace string, timeout time.Duration) er
257257
return fmt.Errorf("pod %q has not been yet created", name)
258258
}
259259

260-
return fmt.Errorf("unable get pod %q in namespace %q: %v", name, namespace, err)
260+
return fmt.Errorf("unable get pod %q in namespace %q: %w", name, namespace, err)
261261
}
262262

263263
if !isPodReady(pod) {
@@ -370,11 +370,11 @@ func createK8sClient(logger logrus.FieldLogger, clusterName, masterURL string) (
370370
err = try.Retry(func() error {
371371
client, err = k8s.NewClient(logger, masterURL, kubeConfigPath)
372372
if err != nil {
373-
return fmt.Errorf("unable to create clients: %v", err)
373+
return fmt.Errorf("unable to create clients: %w", err)
374374
}
375375

376376
if _, err = client.KubernetesClient().Discovery().ServerVersion(); err != nil {
377-
return fmt.Errorf("unable to get server version: %v", err)
377+
return fmt.Errorf("unable to get server version: %w", err)
378378
}
379379

380380
return nil

‎integration/try/condition.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func BodyContains(values ...string) ResponseCondition {
3838
return func(res *http.Response) error {
3939
body, err := ioutil.ReadAll(res.Body)
4040
if err != nil {
41-
return fmt.Errorf("failed to read response body: %s", err)
41+
return fmt.Errorf("failed to read response body: %w", err)
4242
}
4343

4444
for _, value := range values {

‎integration/try/try.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Retry(f func() error, timeout time.Duration) error {
1919
ebo.MaxElapsedTime = applyCIMultiplier(timeout)
2020

2121
if err := backoff.Retry(safe.OperationWithRecover(f), ebo); err != nil {
22-
return fmt.Errorf("unable execute function: %v", err)
22+
return fmt.Errorf("unable execute function: %w", err)
2323
}
2424

2525
return nil

‎pkg/annotations/annotations_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package annotations
22

33
import (
4+
"errors"
45
"testing"
56

67
"github.com/stretchr/testify/assert"
@@ -154,7 +155,7 @@ func TestGetRetryAttempts(t *testing.T) {
154155
attempts, err := GetRetryAttempts(test.annotations)
155156
if test.err {
156157
require.Error(t, err)
157-
assert.Equal(t, test.wantNotFound, err == ErrNotFound)
158+
assert.Equal(t, test.wantNotFound, errors.Is(err, ErrNotFound))
158159
return
159160
}
160161

@@ -192,7 +193,7 @@ func TestGetCircuitBreakerExpression(t *testing.T) {
192193
value, err := GetCircuitBreakerExpression(test.annotations)
193194
if test.err {
194195
require.Error(t, err)
195-
assert.Equal(t, test.wantNotFound, err == ErrNotFound)
196+
assert.Equal(t, test.wantNotFound, errors.Is(err, ErrNotFound))
196197
return
197198
}
198199

@@ -237,7 +238,7 @@ func TestGetRateLimitBurst(t *testing.T) {
237238
value, err := GetRateLimitBurst(test.annotations)
238239
if test.err {
239240
require.Error(t, err)
240-
assert.Equal(t, test.wantNotFound, err == ErrNotFound)
241+
assert.Equal(t, test.wantNotFound, errors.Is(err, ErrNotFound))
241242
return
242243
}
243244

@@ -282,7 +283,7 @@ func TestGetRateLimitAverage(t *testing.T) {
282283
value, err := GetRateLimitAverage(test.annotations)
283284
if test.err {
284285
require.Error(t, err)
285-
assert.Equal(t, test.wantNotFound, err == ErrNotFound)
286+
assert.Equal(t, test.wantNotFound, errors.Is(err, ErrNotFound))
286287
return
287288
}
288289

‎pkg/annotations/middleware.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func buildRetryMiddleware(annotations map[string]string) (middleware *dynamic.Mi
3838

3939
retryAttempts, err = GetRetryAttempts(annotations)
4040
if err != nil {
41-
if err == ErrNotFound {
41+
if errors.Is(err, ErrNotFound) {
4242
return nil, "", nil
4343
}
4444

@@ -60,14 +60,14 @@ func buildRateLimitMiddleware(annotations map[string]string) (middleware *dynami
6060
)
6161

6262
rateLimitBurst, err = GetRateLimitBurst(annotations)
63-
if err == ErrNotFound {
63+
if errors.Is(err, ErrNotFound) {
6464
return nil, "", nil
6565
} else if err != nil {
6666
return nil, "", fmt.Errorf("unable to build rate-limit middleware: %w", err)
6767
}
6868

6969
rateLimitAverage, err = GetRateLimitAverage(annotations)
70-
if err == ErrNotFound {
70+
if errors.Is(err, ErrNotFound) {
7171
return nil, "", nil
7272
} else if err != nil {
7373
return nil, "", fmt.Errorf("unable to build rate-limit middleware: %w", err)
@@ -93,7 +93,7 @@ func buildCircuitBreakerMiddleware(annotations map[string]string) (middleware *d
9393

9494
circuitBreakerExpression, err = GetCircuitBreakerExpression(annotations)
9595
if err != nil {
96-
if err == ErrNotFound {
96+
if errors.Is(err, ErrNotFound) {
9797
return nil, "", nil
9898
}
9999

‎pkg/k8s/client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func buildKubernetesClient(log logrus.FieldLogger, config *rest.Config) (*kubern
109109

110110
client, err := kubernetes.NewForConfig(config)
111111
if err != nil {
112-
return nil, fmt.Errorf("unable to create kubernetes client: %v", err)
112+
return nil, fmt.Errorf("unable to create kubernetes client: %w", err)
113113
}
114114

115115
return client, nil
@@ -121,7 +121,7 @@ func buildSmiAccessClient(log logrus.FieldLogger, config *rest.Config) (*accessc
121121

122122
client, err := accessclient.NewForConfig(config)
123123
if err != nil {
124-
return nil, fmt.Errorf("unable to create SMI Access Client: %v", err)
124+
return nil, fmt.Errorf("unable to create SMI Access Client: %w", err)
125125
}
126126

127127
return client, nil
@@ -133,7 +133,7 @@ func buildSmiSpecsClient(log logrus.FieldLogger, config *rest.Config) (*specscli
133133

134134
client, err := specsclient.NewForConfig(config)
135135
if err != nil {
136-
return nil, fmt.Errorf("unable to create SMI Specs Client: %v", err)
136+
return nil, fmt.Errorf("unable to create SMI Specs Client: %w", err)
137137
}
138138

139139
return client, nil
@@ -145,7 +145,7 @@ func buildSmiSplitClient(log logrus.FieldLogger, config *rest.Config) (*splitcli
145145

146146
client, err := splitclient.NewForConfig(config)
147147
if err != nil {
148-
return nil, fmt.Errorf("unable to create SMI Split Client: %v", err)
148+
return nil, fmt.Errorf("unable to create SMI Split Client: %w", err)
149149
}
150150

151151
return client, nil

0 commit comments

Comments
 (0)