Skip to content

Commit 8ac4ea1

Browse files
mxabmxab
authored
refactor and move a lot of packages into pkg (#46)
1 parent f74a55b commit 8ac4ea1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+60
-68
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ testutil/
66
.github/
77
.mypy_cache/
88

9-
config/testdata/
9+
pkg/config/testdata/
1010

1111
example/
1212

‎cmd/nacp/nacp.go‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/mxab/nacp/admissionctrl/remoteutil"
26-
"github.com/mxab/nacp/admissionctrl/types"
27-
"github.com/mxab/nacp/logutil"
28-
nacpOtel "github.com/mxab/nacp/otel"
25+
"github.com/mxab/nacp/pkg/admissionctrl/remoteutil"
26+
"github.com/mxab/nacp/pkg/admissionctrl/types"
27+
"github.com/mxab/nacp/pkg/logutil"
28+
nacpOtel "github.com/mxab/nacp/pkg/otel"
2929

3030
"log/slog"
3131

3232
"github.com/hashicorp/go-multierror"
3333
"github.com/hashicorp/nomad/api"
3434
"github.com/hashicorp/nomad/helper"
35-
"github.com/mxab/nacp/admissionctrl"
36-
"github.com/mxab/nacp/admissionctrl/mutator"
37-
"github.com/mxab/nacp/admissionctrl/notation"
38-
"github.com/mxab/nacp/admissionctrl/validator"
39-
"github.com/mxab/nacp/config"
35+
"github.com/mxab/nacp/pkg/admissionctrl"
36+
"github.com/mxab/nacp/pkg/admissionctrl/mutator"
37+
"github.com/mxab/nacp/pkg/admissionctrl/notation"
38+
"github.com/mxab/nacp/pkg/admissionctrl/validator"
39+
"github.com/mxab/nacp/pkg/config"
4040
"github.com/notaryproject/notation-go/dir"
4141
"github.com/notaryproject/notation-go/verifier/truststore"
4242

@@ -152,9 +152,7 @@ func newProxyHandler(nomadAddress *url.URL, jobHandler *admissionctrl.JobHandler
152152
return nil
153153
}
154154
var proxyHandler http.Handler = proxy
155-
// if otelInstrumentation {
156-
// proxyHandler = otelhttp.NewHandler(proxyHandler, "/")
157-
// }
155+
158156
nacpHandler := func(w http.ResponseWriter, r *http.Request) {
159157

160158
ctx := r.Context()
@@ -849,5 +847,3 @@ func buildTlsConfig(config config.NomadServerTLS) (*tls.Config, error) {
849847
}
850848
return tlsConfig, err
851849
}
852-
853-
type loggerFactory func(name string) *slog.Logger

‎cmd/nacp/nacp_otel_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"time"
1212

1313
"github.com/hashicorp/nomad/api"
14-
"github.com/mxab/nacp/admissionctrl"
15-
"github.com/mxab/nacp/otel"
14+
"github.com/mxab/nacp/pkg/admissionctrl"
15+
"github.com/mxab/nacp/pkg/otel"
1616
"github.com/mxab/nacp/testutil"
1717
"github.com/stretchr/testify/assert"
1818
"github.com/stretchr/testify/require"

‎cmd/nacp/nacp_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"github.com/hashicorp/nomad/helper"
2525
"github.com/hashicorp/nomad/helper/tlsutil"
2626
"github.com/hashicorp/nomad/lib/file"
27-
"github.com/mxab/nacp/admissionctrl"
28-
"github.com/mxab/nacp/admissionctrl/mutator"
29-
"github.com/mxab/nacp/admissionctrl/validator"
30-
"github.com/mxab/nacp/config"
31-
"github.com/mxab/nacp/logutil"
27+
"github.com/mxab/nacp/pkg/admissionctrl"
28+
"github.com/mxab/nacp/pkg/admissionctrl/mutator"
29+
"github.com/mxab/nacp/pkg/admissionctrl/validator"
30+
"github.com/mxab/nacp/pkg/config"
31+
"github.com/mxab/nacp/pkg/logutil"
3232
"github.com/mxab/nacp/testutil"
3333
"github.com/stretchr/testify/assert"
3434
"github.com/stretchr/testify/mock"

‎dev.Dockerfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@ WORKDIR /app
55
ENV CGO_ENABLED=0
66
COPY go.mod go.sum ./
77
RUN --mount=type=cache,target=/root/.cache/go-build go mod download
8-
COPY admissionctrl ./admissionctrl
8+
COPY pkg ./pkg
99
COPY cmd ./cmd
10-
COPY o11y ./o11y
11-
COPY otel ./otel
12-
COPY logutil ./logutil
13-
COPY config ./config
1410
ENV GOCACHE=/root/.cache/go-build
1511
RUN --mount=type=cache,target=/root/.cache/go-build go build -o nacp ./cmd/nacp
1612

admissionctrl/controller.go renamed to pkg/admissionctrl/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"fmt"
1010
"log/slog"
1111

12-
"github.com/mxab/nacp/admissionctrl/types"
13-
"github.com/mxab/nacp/o11y"
12+
"github.com/mxab/nacp/pkg/admissionctrl/types"
13+
"github.com/mxab/nacp/pkg/o11y"
1414
"go.opentelemetry.io/otel"
1515
"go.opentelemetry.io/otel/attribute"
1616
"go.opentelemetry.io/otel/codes"

admissionctrl/controller_test.go renamed to pkg/admissionctrl/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/mitchellh/copystructure"
10-
"github.com/mxab/nacp/admissionctrl/types"
10+
"github.com/mxab/nacp/pkg/admissionctrl/types"
1111

1212
"github.com/hashicorp/nomad/api"
1313
"github.com/mxab/nacp/testutil"

admissionctrl/mutator/json_patch_webhook.go renamed to pkg/admissionctrl/mutator/json_patch_webhook.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"net/http"
1010
"net/url"
1111

12-
"github.com/mxab/nacp/admissionctrl/mutator/jsonpatcher"
13-
"github.com/mxab/nacp/admissionctrl/remoteutil"
14-
"github.com/mxab/nacp/admissionctrl/types"
12+
"github.com/mxab/nacp/pkg/admissionctrl/mutator/jsonpatcher"
13+
"github.com/mxab/nacp/pkg/admissionctrl/remoteutil"
14+
"github.com/mxab/nacp/pkg/admissionctrl/types"
1515

1616
"github.com/hashicorp/nomad/api"
1717
)

admissionctrl/mutator/json_patch_webhook_test.go renamed to pkg/admissionctrl/mutator/json_patch_webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"net/http/httptest"
88
"testing"
99

10-
"github.com/mxab/nacp/admissionctrl/types"
11-
"github.com/mxab/nacp/config"
10+
"github.com/mxab/nacp/pkg/admissionctrl/types"
11+
"github.com/mxab/nacp/pkg/config"
1212
"github.com/mxab/nacp/testutil"
1313

1414
"github.com/hashicorp/nomad/api"

admissionctrl/mutator/jsonpatcher/jsonpatcher.go renamed to pkg/admissionctrl/mutator/jsonpatcher/jsonpatcher.go

File renamed without changes.

0 commit comments

Comments
 (0)