From 1436fa2d378241441ca83fd19c11006c6746c62a Mon Sep 17 00:00:00 2001 From: Luca Steeb Date: Wed, 20 Oct 2021 21:47:04 +0700 Subject: [PATCH 01/19] test(integration): un-ignore go.sum file, tidy --- test/integration/.gitignore | 1 - test/integration/go.mod | 2 +- test/integration/go.sum | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) delete mode 100644 test/integration/.gitignore create mode 100644 test/integration/go.sum diff --git a/test/integration/.gitignore b/test/integration/.gitignore deleted file mode 100644 index 08cb523c1..000000000 --- a/test/integration/.gitignore +++ /dev/null @@ -1 +0,0 @@ -go.sum diff --git a/test/integration/go.mod b/test/integration/go.mod index a089ea59a..32c202fc3 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -1,6 +1,6 @@ module integration -go 1.13 +go 1.16 replace github.com/prisma/prisma-client-go => ../../ diff --git a/test/integration/go.sum b/test/integration/go.sum new file mode 100644 index 000000000..d1098e002 --- /dev/null +++ b/test/integration/go.sum @@ -0,0 +1,19 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 h1:ECW73yc9MY7935nNYXUkK7Dz17YuSUI9yqRqYS8aBww= +github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/takuoki/gocase v1.0.0 h1:gPwLJTWVm2T1kUiCsKirg/faaIUGVTI0FA3SYr75a44= +github.com/takuoki/gocase v1.0.0/go.mod h1:QgOKJrbuJoDrtoKswBX1/Dw8mJrkOV9tbQZJaxaJ6zc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From aaa0822514755faf088e6c498960cb294d689b09 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 12:05:33 +0900 Subject: [PATCH 02/19] fix: Go version 1.16 --- .github/workflows/e2e-test.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- docs/deploy.md | 2 +- test/integration/integration.dockerfile | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 07e6ab230..2685ed6ca 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: '1.14' + go-version: '1.16' - uses: actions/cache@v2 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 16dc66dec..91b8475ef 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v1 with: - go-version: '1.15' + go-version: '1.16' - uses: actions/cache@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91e2580e6..e4851fca8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: '1.14' + go-version: '1.16' - uses: actions/cache@v2 with: diff --git a/docs/deploy.md b/docs/deploy.md index f7383308d..2b8f795b2 100644 --- a/docs/deploy.md +++ b/docs/deploy.md @@ -41,7 +41,7 @@ Your dockerfile could look like this. It uses Go modules, layered caching for fa lightweight images (usually a few megabytes). ```dockerfile -FROM golang:1.13 as build +FROM golang:1.16 as build WORKDIR /app diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 06d4b0655..fc734be37 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13 as build +FROM golang:1.16 as build WORKDIR /app @@ -22,7 +22,7 @@ RUN cd test/integration/; go run github.com/prisma/prisma-client-go generate --s RUN cd test/integration/; go build -o /app/main . # start a new stage to test if the runtime fetching works -FROM golang:1.13 +FROM golang:1.16 WORKDIR /app From dc26769f726d3d8e994e6da14641cff5629f8b5b Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 13:04:33 +0900 Subject: [PATCH 03/19] fix `go.mod` --- test/integration/go.mod | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 32c202fc3..76aafbf71 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -4,4 +4,10 @@ go 1.16 replace github.com/prisma/prisma-client-go => ../../ -require github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 +require ( + github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 + github.com/joho/godotenv v1.3.0 + github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 + github.com/shopspring/decimal v1.2.0 + github.com/takuoki/gocase v1.0.0 +) From c2c624f9aaf916eb9fd83b3e58b30465b2dc8b40 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 13:32:46 +0900 Subject: [PATCH 04/19] use go mod tidy --- test/integration/go.mod | 8 +------- test/integration/integration.dockerfile | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 76aafbf71..32c202fc3 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -4,10 +4,4 @@ go 1.16 replace github.com/prisma/prisma-client-go => ../../ -require ( - github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 - github.com/joho/godotenv v1.3.0 - github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 - github.com/shopspring/decimal v1.2.0 - github.com/takuoki/gocase v1.0.0 -) +require github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index fc734be37..8b02c2fa8 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -7,7 +7,7 @@ ENV DEBUG=* # add go modules lockfiles COPY go.mod go.sum ./ -RUN go mod download +RUN go mod tidy COPY . ./ From 756bcb13f35e5e4144b1357315c8a16d89b7afa9 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 13:49:05 +0900 Subject: [PATCH 05/19] execute go mod tidy --- test/integration/integration.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 8b02c2fa8..4c39ba404 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -7,10 +7,12 @@ ENV DEBUG=* # add go modules lockfiles COPY go.mod go.sum ./ -RUN go mod tidy +RUN go mod download COPY . ./ +RUN cd test/integration/; go mod tidy + RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch RUN cd test/integration/; go run github.com/prisma/prisma-client-go db push --preview-feature --schema schemax.prisma From b5b0e56b113ff7d9c5e56652f23bb0871b044f1f Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 14:02:37 +0900 Subject: [PATCH 06/19] update `go.mod` --- test/integration/go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 32c202fc3..1dccb3af3 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -2,6 +2,4 @@ module integration go 1.16 -replace github.com/prisma/prisma-client-go => ../../ - -require github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 +require github.com/prisma/prisma-client-go master From 3a91f3de08cc13fd0add4354db8f0c2371aad565 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 14:03:10 +0900 Subject: [PATCH 07/19] update `go.mod` --- test/integration/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 1dccb3af3..029525d2c 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -2,4 +2,4 @@ module integration go 1.16 -require github.com/prisma/prisma-client-go master +require github.com/prisma/prisma-client-go main From 7ff314c1db6ec0718e0fd71a2c0a6d513afc306b Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 14:24:33 +0900 Subject: [PATCH 08/19] debug --- test/integration/integration.dockerfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 4c39ba404..495860f7b 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -5,14 +5,24 @@ WORKDIR /app ENV PHOTON_GO_LOG=info ENV DEBUG=* +RUN ls -l + # add go modules lockfiles COPY go.mod go.sum ./ -RUN go mod download +RUN ls -l +RUN go mod download -x COPY . ./ +RUN ls -l ./ +RUN pwd + RUN cd test/integration/; go mod tidy +RUN pwd +RUN ls -l test/integration/ +RUN cat test/integration/go.mod && cat test/integration/go.sum + RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch RUN cd test/integration/; go run github.com/prisma/prisma-client-go db push --preview-feature --schema schemax.prisma From c3be2dd393b4f45e97233c23d55c84c43c24676f Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:01:55 +0900 Subject: [PATCH 09/19] debug --- test/integration/go.mod | 2 -- test/integration/integration.dockerfile | 15 +++------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 029525d2c..14d9ea3e9 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -1,5 +1,3 @@ module integration go 1.16 - -require github.com/prisma/prisma-client-go main diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 495860f7b..4a96e0326 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -5,23 +5,14 @@ WORKDIR /app ENV PHOTON_GO_LOG=info ENV DEBUG=* -RUN ls -l - -# add go modules lockfiles -COPY go.mod go.sum ./ -RUN ls -l -RUN go mod download -x - COPY . ./ -RUN ls -l ./ -RUN pwd - -RUN cd test/integration/; go mod tidy +RUN cd test/integration/; go install github.com/prisma/prisma-client-go@main RUN pwd RUN ls -l test/integration/ -RUN cat test/integration/go.mod && cat test/integration/go.sum +RUN cat test/integration/go.mod +RUN cat test/integration/go.sum RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch From 034f29ab19ce998e742c00ecf030dedbdf57e473 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:05:05 +0900 Subject: [PATCH 10/19] debug --- test/integration/integration.dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 4a96e0326..3bfac13fb 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -9,11 +9,6 @@ COPY . ./ RUN cd test/integration/; go install github.com/prisma/prisma-client-go@main -RUN pwd -RUN ls -l test/integration/ -RUN cat test/integration/go.mod -RUN cat test/integration/go.sum - RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch RUN cd test/integration/; go run github.com/prisma/prisma-client-go db push --preview-feature --schema schemax.prisma From 4a6f83cca7abff4506fd0271b6933418deb28290 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:07:19 +0900 Subject: [PATCH 11/19] debug --- test/integration/integration.dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 3bfac13fb..e504f365a 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -7,7 +7,12 @@ ENV DEBUG=* COPY . ./ -RUN cd test/integration/; go install github.com/prisma/prisma-client-go@main +RUN cd test/integration/; go get github.com/prisma/prisma-client-go@main + +RUN pwd +RUN ls -l test/integration/ +RUN cat test/integration/go.mod +RUN cat test/integration/go.sum RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch From 5c3ba67c333f052ed5653e9d8590f2f64f00f4a1 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:19:54 +0900 Subject: [PATCH 12/19] debug --- test/integration/integration.dockerfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index e504f365a..3a814cbf1 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -7,22 +7,21 @@ ENV DEBUG=* COPY . ./ -RUN cd test/integration/; go get github.com/prisma/prisma-client-go@main +WORKDIR /app/test/integration -RUN pwd -RUN ls -l test/integration/ -RUN cat test/integration/go.mod -RUN cat test/integration/go.sum +RUN go get github.com/prisma/prisma-client-go@main -RUN cd test/integration/; go run github.com/prisma/prisma-client-go prefetch +RUN go run github.com/prisma/prisma-client-go migrate dev --name init -RUN cd test/integration/; go run github.com/prisma/prisma-client-go db push --preview-feature --schema schemax.prisma +RUN go mod tidy -# generate the client in the integration folder -RUN cd test/integration/; go run github.com/prisma/prisma-client-go generate --schema schemax.prisma +RUN pwd +RUN ls -l +RUN cat go.mod +RUN cat go.sum # build the integration binary with all dependencies -RUN cd test/integration/; go build -o /app/main . +RUN go build -o /app/main . # start a new stage to test if the runtime fetching works FROM golang:1.16 From 802f476c9a2dafa2ab22004c2757a1a65c5003f3 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:24:49 +0900 Subject: [PATCH 13/19] debug --- test/integration/integration.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 3a814cbf1..856cc8c11 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -11,7 +11,7 @@ WORKDIR /app/test/integration RUN go get github.com/prisma/prisma-client-go@main -RUN go run github.com/prisma/prisma-client-go migrate dev --name init +RUN go run github.com/prisma/prisma-client-go migrate dev --name init --schema schemax.prisma RUN go mod tidy From d67fd957d61d4a47eeb7b45532b405c1fe28025e Mon Sep 17 00:00:00 2001 From: s-takehana Date: Tue, 19 Oct 2021 15:39:12 +0900 Subject: [PATCH 14/19] fix --- test/integration/integration.dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index 856cc8c11..ee2d42ee0 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -15,11 +15,6 @@ RUN go run github.com/prisma/prisma-client-go migrate dev --name init --schema s RUN go mod tidy -RUN pwd -RUN ls -l -RUN cat go.mod -RUN cat go.sum - # build the integration binary with all dependencies RUN go build -o /app/main . From 11ce3b18a01dd06c3cec53b3fc6f87a1f11ecfaa Mon Sep 17 00:00:00 2001 From: s-takehana Date: Wed, 20 Oct 2021 10:52:43 +0900 Subject: [PATCH 15/19] use `db push` --- test/integration/integration.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index ee2d42ee0..c84a205e5 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -11,7 +11,7 @@ WORKDIR /app/test/integration RUN go get github.com/prisma/prisma-client-go@main -RUN go run github.com/prisma/prisma-client-go migrate dev --name init --schema schemax.prisma +RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma RUN go mod tidy From bca9487b7423e31ca2c15c3e7660f08105ab5d0c Mon Sep 17 00:00:00 2001 From: s-takehana Date: Thu, 21 Oct 2021 10:04:56 +0900 Subject: [PATCH 16/19] undo `go.mod` --- test/integration/go.mod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/go.mod b/test/integration/go.mod index 14d9ea3e9..32c202fc3 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -1,3 +1,7 @@ module integration go 1.16 + +replace github.com/prisma/prisma-client-go => ../../ + +require github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 From f0cb57cac58237a029fff3cc7e5e18e97638da3e Mon Sep 17 00:00:00 2001 From: s-takehana Date: Thu, 21 Oct 2021 10:11:39 +0900 Subject: [PATCH 17/19] update `integration.dockerfile` --- test/integration/integration.dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index c84a205e5..f2b31d8eb 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -9,12 +9,10 @@ COPY . ./ WORKDIR /app/test/integration -RUN go get github.com/prisma/prisma-client-go@main +RUN go mod download RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma -RUN go mod tidy - # build the integration binary with all dependencies RUN go build -o /app/main . From b0be6ecfcc5c2fd87a5a24976a6bacda0ac5c1c5 Mon Sep 17 00:00:00 2001 From: s-takehana Date: Thu, 21 Oct 2021 10:38:34 +0900 Subject: [PATCH 18/19] use `go mod download -x` --- test/integration/integration.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/integration.dockerfile b/test/integration/integration.dockerfile index f2b31d8eb..e9c83c372 100644 --- a/test/integration/integration.dockerfile +++ b/test/integration/integration.dockerfile @@ -9,7 +9,7 @@ COPY . ./ WORKDIR /app/test/integration -RUN go mod download +RUN go mod download -x RUN go run github.com/prisma/prisma-client-go db push --schema schemax.prisma From 1a9af2561c3bb4ef95f11464676c32d95f16435a Mon Sep 17 00:00:00 2001 From: s-takehana Date: Thu, 21 Oct 2021 10:47:47 +0900 Subject: [PATCH 19/19] update `go.mod` --- test/integration/go.mod | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 32c202fc3..76aafbf71 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -4,4 +4,10 @@ go 1.16 replace github.com/prisma/prisma-client-go => ../../ -require github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 +require ( + github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 + github.com/joho/godotenv v1.3.0 + github.com/prisma/prisma-client-go v0.0.0-00010101000000-000000000000 + github.com/shopspring/decimal v1.2.0 + github.com/takuoki/gocase v1.0.0 +)