Created
July 10, 2023 19:31
-
-
Save jalseth/ebf866def89661d31fd87c93eed80ed2 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ cp -ap ../../jalseth/protobuf-specs ./ | |
$ git diff | |
diff --git a/.gitignore b/.gitignore | |
index e484529..43da3ac 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -27,3 +27,5 @@ signature | |
rekor.pub | |
*~ | |
*.test | |
+ | |
+protobuf-specs/ | |
diff --git a/Dockerfile b/Dockerfile | |
index 6dc74c7..ee238c5 100644 | |
--- a/Dockerfile | |
+++ b/Dockerfile | |
@@ -18,6 +18,7 @@ ENV APP_ROOT=/opt/app-root | |
ENV GOPATH=$APP_ROOT | |
WORKDIR $APP_ROOT/src/ | |
+ADD protobuf-specs/ $APP_ROOT/src/protobuf-specs/ | |
ADD go.mod go.sum $APP_ROOT/src/ | |
RUN go mod download | |
diff --git a/go.mod b/go.mod | |
index 113dd8b..530fc2d 100644 | |
--- a/go.mod | |
+++ b/go.mod | |
@@ -2,6 +2,8 @@ module github.com/sigstore/rekor | |
go 1.19 | |
+replace "github.com/sigstore/protobuf-specs" => ./protobuf-specs | |
+ | |
require ( | |
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 | |
github.com/blang/semver v3.5.1+incompatible | |
$ make rekor-server | |
CGO_ENABLED=0 go build -trimpath -ldflags "-X sigs.k8s.io/release-utils/version.gitVersion=v1.2.2-8-g0d47c18-dirty -X sigs.k8s.io/release-utils/version.gitCommit=0d47c1839913dacb1be6da70288ab3f7d13d5b85 -X sigs.k8s.io/release-utils/version.gitTreeState="dirty" -X sigs.k8s.io/release-utils/version.buildDate=2023-07-10T00:34:23Z" -o rekor-server ./cmd/rekor-server | |
$ go test ./... | |
? github.com/sigstore/rekor/cmd/backfill-redis [no test files] | |
? github.com/sigstore/rekor/cmd/rekor-cli/app/state [no test files] | |
? github.com/sigstore/rekor/cmd/rekor-cli/app/format [no test files] | |
ok github.com/sigstore/rekor/cmd/rekor-cli 0.428s | |
ok github.com/sigstore/rekor/cmd/rekor-cli/app 0.595s | |
? github.com/sigstore/rekor/cmd/rekor-server/app [no test files] | |
? github.com/sigstore/rekor/pkg/events [no test files] | |
? github.com/sigstore/rekor/pkg/fuzz [no test files] | |
? github.com/sigstore/rekor/pkg/generated/client [no test files] | |
? github.com/sigstore/rekor/pkg/generated/client/entries [no test files] | |
? github.com/sigstore/rekor/pkg/generated/client/index [no test files] | |
? github.com/sigstore/rekor/pkg/generated/client/pubkey [no test files] | |
? github.com/sigstore/rekor/pkg/generated/client/tlog [no test files] | |
? github.com/sigstore/rekor/pkg/generated/models [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi/operations [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi/operations/entries [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi/operations/index [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi/operations/pubkey [no test files] | |
? github.com/sigstore/rekor/pkg/generated/restapi/operations/tlog [no test files] | |
? github.com/sigstore/rekor/pkg/log [no test files] | |
ok github.com/sigstore/rekor/cmd/rekor-server 0.273s | |
ok github.com/sigstore/rekor/pkg/api 0.611s | |
? github.com/sigstore/rekor/pkg/pki/x509/testutils [no test files] | |
? github.com/sigstore/rekor/pkg/pubsub [no test files] | |
? github.com/sigstore/rekor/pkg/storage [no test files] | |
? github.com/sigstore/rekor/pkg/trillianclient [no test files] | |
ok github.com/sigstore/rekor/pkg/client 2.410s | |
ok github.com/sigstore/rekor/pkg/events/newentry 0.699s | |
ok github.com/sigstore/rekor/pkg/pki 0.161s | |
ok github.com/sigstore/rekor/pkg/pki/minisign 0.270s | |
ok github.com/sigstore/rekor/pkg/pki/pgp 0.426s | |
ok github.com/sigstore/rekor/pkg/pki/pkcs7 0.470s | |
ok github.com/sigstore/rekor/pkg/pki/ssh 0.774s | |
ok github.com/sigstore/rekor/pkg/pki/tuf 0.543s | |
ok github.com/sigstore/rekor/pkg/pki/x509 0.576s | |
ok github.com/sigstore/rekor/pkg/pubsub/gcp 0.238s | |
ok github.com/sigstore/rekor/pkg/sharding 0.321s | |
ok github.com/sigstore/rekor/pkg/signer 0.195s | |
ok github.com/sigstore/rekor/pkg/tle 0.187s | |
ok github.com/sigstore/rekor/pkg/types 0.201s | |
ok github.com/sigstore/rekor/pkg/types/alpine 0.225s | |
ok github.com/sigstore/rekor/pkg/types/alpine/v0.0.1 0.186s | |
ok github.com/sigstore/rekor/pkg/types/cose 0.303s | |
ok github.com/sigstore/rekor/pkg/types/cose/v0.0.1 0.468s | |
ok github.com/sigstore/rekor/pkg/types/dsse 0.340s | |
ok github.com/sigstore/rekor/pkg/types/dsse/v0.0.1 0.495s | |
ok github.com/sigstore/rekor/pkg/types/hashedrekord 0.601s | |
ok github.com/sigstore/rekor/pkg/types/hashedrekord/v0.0.1 0.518s | |
ok github.com/sigstore/rekor/pkg/types/helm 0.553s | |
ok github.com/sigstore/rekor/pkg/types/helm/v0.0.1 0.235s | |
ok github.com/sigstore/rekor/pkg/types/intoto 0.308s | |
ok github.com/sigstore/rekor/pkg/types/intoto/v0.0.1 0.219s | |
ok github.com/sigstore/rekor/pkg/types/intoto/v0.0.2 0.202s | |
ok github.com/sigstore/rekor/pkg/types/jar 0.294s | |
ok github.com/sigstore/rekor/pkg/types/jar/v0.0.1 0.195s | |
ok github.com/sigstore/rekor/pkg/types/rekord 0.217s | |
ok github.com/sigstore/rekor/pkg/types/rekord/v0.0.1 0.270s | |
ok github.com/sigstore/rekor/pkg/types/rfc3161 0.332s | |
ok github.com/sigstore/rekor/pkg/types/rfc3161/v0.0.1 0.388s | |
ok github.com/sigstore/rekor/pkg/types/rpm 0.182s | |
ok github.com/sigstore/rekor/pkg/types/rpm/v0.0.1 0.296s | |
? github.com/sigstore/rekor/pkg/witness/mockclient [no test files] | |
ok github.com/sigstore/rekor/pkg/types/tuf 0.405s | |
ok github.com/sigstore/rekor/pkg/types/tuf/v0.0.1 0.490s | |
ok github.com/sigstore/rekor/pkg/util 0.729s | |
ok github.com/sigstore/rekor/pkg/verify 0.521s | |
ok github.com/sigstore/rekor/pkg/witness 6.488s | |
$ ./tests/e2e-test.sh | |
installing gocovmerge | |
make: Nothing to be done for `gocovmerge'. | |
building test-only containers | |
[+] Building 0.1s (6/6) FINISHED | |
=> [internal] load build definition from Dockerfile.pubsub-emulator 0.0s | |
=> => transferring dockerfile: 267B 0.0s | |
=> [internal] load .dockerignore 0.0s | |
=> => transferring context: 2B 0.0s | |
=> [internal] load metadata for docker.io/google/cloud-sdk:437.0.1@sha256:615af2b80c5781891f402a38f35a5f422664f3bfee00c8ab2b94be47ac9fce8f 0.0s | |
=> [1/2] FROM docker.io/google/cloud-sdk:437.0.1@sha256:615af2b80c5781891f402a38f35a5f422664f3bfee00c8ab2b94be47ac9fce8f 0.0s | |
=> CACHED [2/2] RUN apt-get install -y netcat 0.0s | |
=> exporting to image 0.0s | |
=> => exporting layers 0.0s | |
=> => writing image sha256:da4dcc079643e147f24a55120c789df1ae255021a08ae296de01de916fa9c8e9 0.0s | |
=> => naming to docker.io/library/gcp-pubsub-emulator 0.0s | |
starting services | |
[+] Building 5.9s (18/18) FINISHED | |
=> [rekor-server internal] load .dockerignore 0.0s | |
=> => transferring context: 2B 0.0s | |
=> [rekor-server internal] load build definition from Dockerfile 0.0s | |
=> => transferring dockerfile: 2.05kB 0.0s | |
=> [rekor-server internal] load metadata for docker.io/library/golang:1.20.5@sha256:fd9306e1c664bd49a11d4a4a04e41303430e069e437d137876e9290a555e06f 0.0s | |
=> [rekor-server internal] load build context 0.1s | |
=> => transferring context: 78.87kB 0.1s | |
=> [rekor-server builder 1/10] FROM docker.io/library/golang:1.20.5@sha256:fd9306e1c664bd49a11d4a4a04e41303430e069e437d137876e9290a555e06fb 0.0s | |
=> => resolve docker.io/library/golang:1.20.5@sha256:fd9306e1c664bd49a11d4a4a04e41303430e069e437d137876e9290a555e06fb 0.0s | |
=> CACHED [rekor-server builder 2/10] WORKDIR /opt/app-root/src/ 0.0s | |
=> CACHED [rekor-server builder 3/10] ADD protobuf-specs/ /opt/app-root/src/protobuf-specs/ 0.0s | |
=> CACHED [rekor-server builder 4/10] ADD go.mod go.sum /opt/app-root/src/ 0.0s | |
=> CACHED [rekor-server builder 5/10] RUN go mod download 0.0s | |
=> CACHED [rekor-server builder 6/10] ADD ./cmd/ /opt/app-root/src/cmd/ 0.0s | |
=> CACHED [rekor-server builder 7/10] ADD ./pkg/ /opt/app-root/src/pkg/ 0.0s | |
=> CACHED [rekor-server builder 8/10] RUN go build -ldflags "${SERVER_LDFLAGS}" ./cmd/rekor-server 0.0s | |
=> CACHED [rekor-server builder 9/10] RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o rekor-server_debug ./cmd/rek 0.0s | |
=> CACHED [rekor-server builder 10/10] RUN go test -c -ldflags "${SERVER_LDFLAGS}" -cover -covermode=count -coverpkg=./... -o rekor-server_test ./c 0.0s | |
=> CACHED [rekor-server deploy 2/2] COPY --from=builder /opt/app-root/src/rekor-server /usr/local/bin/rekor-server 0.0s | |
=> CACHED [rekor-server test 1/1] COPY --from=builder /opt/app-root/src/rekor-server_test /usr/local/bin/rekor-server 0.0s | |
=> [rekor-server] exporting to docker image format 5.8s | |
=> => exporting layers 0.0s | |
=> => exporting manifest sha256:8a35144e33ac8584f0006bec5d5d952714e83a0069647dca829891a4716e870f 0.0s | |
=> => exporting config sha256:b8234af27474b6b80dc62ed8b9e2b7ee6f7e076f562c00b3e021e7c89d504955 0.0s | |
=> => sending tarball 5.8s | |
=> [rekor-server rekor-server] importing to docker 0.3s | |
[+] Running 6/0 | |
✔ Container rekor-gcp-pubsub-emulator-1 Running 0.0s | |
✔ Container rekor-redis-server-1 Running 0.0s | |
✔ Container rekor-mysql-1 Running 0.0s | |
✔ Container rekor-trillian-log-signer-1 Running 0.0s | |
✔ Container rekor-trillian-log-server-1 Running 0.0s | |
✔ Container rekor-rekor-server-1 Running 0.0s | |
building CLI and server | |
waiting up to 90 sec for system to start | |
running tests | |
ok github.com/sigstore/rekor/tests 0.663s | |
ok github.com/sigstore/rekor/tests 10.800s | |
generating code coverage | |
[+] Restarting 1/1 | |
✔ Container rekor-rekor-server-1 Started 0.4s | |
Successfully copied 595kB to /tmp/rekor-server.cov | |
code coverage total: ( tatement ) 37.5% |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment