Skip to content

Commit

Permalink
Merge pull request #1752 from openmeterio/update-dagger
Browse files Browse the repository at this point in the history
Update dagger
  • Loading branch information
sagikazarmark authored Oct 25, 2024
2 parents fca4118 + 456a1f2 commit 547bf77
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 38 deletions.
11 changes: 7 additions & 4 deletions .dagger/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/openmeterio/openmeter/.dagger
go 1.22.5

require (
github.com/99designs/gqlgen v0.17.49
github.com/99designs/gqlgen v0.17.55
github.com/Khan/genqlient v0.7.0
github.com/dave/jennifer v1.7.0
github.com/elliotchance/orderedmap/v2 v2.2.0
github.com/google/go-github/v63 v63.0.0
github.com/sourcegraph/conc v0.3.0
github.com/vektah/gqlparser/v2 v2.5.16
github.com/vektah/gqlparser/v2 v2.5.17
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240619101304-773aec217df3
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0
Expand All @@ -36,11 +36,14 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sosodev/duration v1.3.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk/metric v1.27.0
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
Expand Down
18 changes: 12 additions & 6 deletions .dagger/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/99designs/gqlgen v0.17.49 h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ=
github.com/99designs/gqlgen v0.17.49/go.mod h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0=
github.com/99designs/gqlgen v0.17.55 h1:3vzrNWYyzSZjGDFo68e5j9sSauLxfKvLp+6ioRokVtM=
github.com/99designs/gqlgen v0.17.55/go.mod h1:3Bq768f8hgVPGZxL8aY9MaYmbxa6llPM/qu1IGH1EJo=
github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w=
github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
Expand Down Expand Up @@ -46,14 +46,18 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8=
github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
github.com/vektah/gqlparser/v2 v2.5.17 h1:9At7WblLV7/36nulgekUgIaqHZWn5hxqluxrxGUhOmI=
github.com/vektah/gqlparser/v2 v2.5.17/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88 h1:oM0GTNKGlc5qHctWeIGTVyda4iFFalOzMZ3Ehj5rwB4=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88/go.mod h1:JGG8ebaMO5nXOPnvKEl+DiA4MGwFjCbjsxT1WHIEBPY=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 h1:ccBrA8nCY5mM0y5uO7FT0ze4S0TuFcWdDB2FxGMTjkI=
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0/go.mod h1:/9pb6634zi2Lk8LYg9Q0X8Ar6jka4dkFOylBLbVQPCE=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 h1:bFgvUr3/O4PHj3VQcFEuYKvRZJX1SJDQ+11JXuSB3/w=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0/go.mod h1:xJntEd2KL6Qdg5lwp97HMLQDVeAhrYxmzFseAMDPQ8I=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 h1:CIHWikMsN3wO+wq1Tp5VGdVRTcON+DmOJSfDjXypKOc=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0/go.mod h1:TNupZ6cxqyFEpLXAZW7On+mLFL0/g0TE3unIYL91xWc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s=
Expand All @@ -68,6 +72,8 @@ go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBq
go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg=
go.opentelemetry.io/otel/sdk/log v0.3.0 h1:GEjJ8iftz2l+XO1GF2856r7yYVh74URiF9JMcAacr5U=
go.opentelemetry.io/otel/sdk/log v0.3.0/go.mod h1:BwCxtmux6ACLuys1wlbc0+vGBd+xytjmjajwqqIul2g=
go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI=
go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw=
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
Expand All @@ -82,8 +88,8 @@ golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-exp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ permissions:
contents: read

env:
DAGGER_VERSION: 0.13.5
DAGGER_VERSION: 0.13.6

jobs:
e2e:
name: E2E
runs-on: depot-ubuntu-latest-16,dagger=0.13.5
runs-on: depot-ubuntu-latest-16,dagger=0.13.6

steps:
# Required as a workaround for Dagger to properly detect Git metadata
Expand All @@ -26,7 +26,7 @@ jobs:

dagger:
name: CI
runs-on: depot-ubuntu-latest-16,dagger=0.13.5
runs-on: depot-ubuntu-latest-16,dagger=0.13.6

steps:
# Required as a workaround for Dagger to properly detect Git metadata
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
contents: read

env:
DAGGER_VERSION: 0.13.5
DAGGER_VERSION: 0.13.6

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
verb: call
args: generate node-sdk -o api/client/node
cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
version: "0.13.5"
version: "0.13.6"

- name: Open pull request
uses: peter-evans/create-pull-request@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
verb: call
args: generate python-sdk -o api/client/python
cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
version: "0.13.5"
version: "0.13.6"

- name: Open pull request
uses: peter-evans/create-pull-request@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
verb: call
args: generate web-sdk -o api/client/web
cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
version: "0.13.5"
version: "0.13.6"

- name: Open pull request
uses: peter-evans/create-pull-request@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
verb: call
args: snapshot --stainless-token env:STAINLESS_TOKEN
cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
version: "0.13.5"
version: "0.13.6"
env:
STAINLESS_TOKEN: ${{ secrets.STAINLESS_TOKEN }}
50 changes: 33 additions & 17 deletions dagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,71 +14,87 @@
"dependencies": [
{
"name": "archivist",
"source": "github.com/sagikazarmark/daggerverse/archivist@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/archivist@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "checksum",
"source": "github.com/sagikazarmark/daggerverse/checksum@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/checksum@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "gh",
"source": "github.com/sagikazarmark/daggerverse/gh@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/gh@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "go",
"source": "github.com/sagikazarmark/daggerverse/go@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/go@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "golangci-lint",
"source": "github.com/sagikazarmark/daggerverse/golangci-lint@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/golangci-lint@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "helm",
"source": "github.com/sagikazarmark/daggerverse/helm@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/helm@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "helm-docs",
"source": "github.com/sagikazarmark/daggerverse/helm-docs@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/helm-docs@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "kafka",
"source": "github.com/sagikazarmark/daggerverse/kafka@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/kafka@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "nix",
"source": "github.com/tsirysndr/daggerverse/nix@06ff14707b36c781eaa41a01072564fbe4172eef"
"source": "github.com/tsirysndr/daggerverse/nix@06ff14707b36c781eaa41a01072564fbe4172eef",
"pin": "06ff14707b36c781eaa41a01072564fbe4172eef"
},
{
"name": "openapi-changes",
"source": "github.com/sagikazarmark/daggerverse/openapi-changes@b2bd806a2c43a5a58459aa7969d0e3740e66ec43"
"source": "github.com/sagikazarmark/daggerverse/openapi-changes@b2bd806a2c43a5a58459aa7969d0e3740e66ec43",
"pin": "b2bd806a2c43a5a58459aa7969d0e3740e66ec43"
},
{
"name": "postgres",
"source": "github.com/sagikazarmark/daggerverse/postgres@89a5a332f2ad1a182e6e8172f6872c4ab3ada507"
"source": "github.com/sagikazarmark/daggerverse/postgres@89a5a332f2ad1a182e6e8172f6872c4ab3ada507",
"pin": "89a5a332f2ad1a182e6e8172f6872c4ab3ada507"
},
{
"name": "python",
"source": "github.com/sagikazarmark/daggerverse/python@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/python@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "spectral",
"source": "github.com/sagikazarmark/daggerverse/spectral@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/spectral@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "stainless",
"source": "github.com/sagikazarmark/daggerverse/stainless@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/stainless@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
},
{
"name": "svix",
"source": "github.com/sagikazarmark/daggerverse/svix@126b5fbbdad70dbf2a8689600baec2eb78c05ef4"
"source": "github.com/sagikazarmark/daggerverse/svix@126b5fbbdad70dbf2a8689600baec2eb78c05ef4",
"pin": "126b5fbbdad70dbf2a8689600baec2eb78c05ef4"
},
{
"name": "trivy",
"source": "github.com/sagikazarmark/daggerverse/trivy@691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
"source": "github.com/sagikazarmark/daggerverse/trivy@691dcc2fc5e53b351453c803c8abb1a5ad727d1b",
"pin": "691dcc2fc5e53b351453c803c8abb1a5ad727d1b"
}
],
"source": ".dagger",
"engineVersion": "v0.13.5",
"engineVersion": "v0.13.6",
"views": [
{
"name": "default",
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 547bf77

Please sign in to comment.