diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 288e9aa..65ef226 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@v4 - name: Install Dagger CLI run: cd /usr/local && { curl -L https://dl.dagger.io/dagger/install.sh | sh; cd -; } - - name: Display module functions + - name: Display Helm module functions run: dagger functions -m helm/ - name: Run module tests - run: dagger -m helm/examples/go call all + run: dagger -m tests/ call all - name: Run module integration tests env: TEST_HELM_REGISTRY_URL: ${{ secrets.TEST_HELM_REGISTRY_URL }} @@ -26,9 +26,16 @@ jobs: TEST_HELM_REGISTRY_HELM_USER: ${{ secrets.TEST_HELM_REGISTRY_HELM_USER }} TEST_HELM_REGISTRY_HELM_PASSWORD: ${{ secrets.TEST_HELM_REGISTRY_HELM_PASSWORD }} run: | - dagger -m helm/examples/go \ + dagger -m tests/ \ call helm-packagepush \ --registry ${TEST_HELM_REGISTRY_URL} \ --repository ${TEST_HELM_REGISTRY_REPOSITORY} \ --username ${TEST_HELM_REGISTRY_HELM_USER} \ --password env:TEST_HELM_REGISTRY_HELM_PASSWORD + - name: Display go examples module functions + run: dagger -m helm/examples/go/ functions + - name: Test shell examples + run: | + source helm/examples/shell/examples.sh + helm_test + helm_version diff --git a/helm/examples/go/dagger.json b/helm/examples/go/dagger.json index 689cdfd..36307d9 100644 --- a/helm/examples/go/dagger.json +++ b/helm/examples/go/dagger.json @@ -1,5 +1,5 @@ { - "name": "go", + "name": "Examples", "sdk": "go", "dependencies": [ { @@ -8,5 +8,5 @@ } ], "source": ".", - "engineVersion": "v0.13.5" + "engineVersion": "v0.13.6" } diff --git a/helm/examples/go/go.mod b/helm/examples/go/go.mod index bef1aed..e3b82f2 100644 --- a/helm/examples/go/go.mod +++ b/helm/examples/go/go.mod @@ -1,6 +1,6 @@ -module dagger/go +module dagger/examples -go 1.22.5 +go 1.23.2 require ( github.com/99designs/gqlgen v0.17.55 @@ -9,11 +9,15 @@ require ( go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 + 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/otlptracegrpc v1.27.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 go.opentelemetry.io/otel/log v0.3.0 + go.opentelemetry.io/otel/metric v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 go.opentelemetry.io/otel/sdk/log v0.3.0 + go.opentelemetry.io/otel/sdk/metric v1.27.0 go.opentelemetry.io/otel/trace v1.27.0 go.opentelemetry.io/proto/otlp v1.3.1 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa @@ -27,14 +31,8 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect - github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/sosodev/duration v1.3.1 // indirect - github.com/sourcegraph/conc v0.3.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.27.0 - go.opentelemetry.io/otel/sdk/metric v1.27.0 - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.9.0 // indirect golang.org/x/net v0.29.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.18.0 // indirect diff --git a/helm/examples/go/go.sum b/helm/examples/go/go.sum index bcf8cf4..c52dd24 100644 --- a/helm/examples/go/go.sum +++ b/helm/examples/go/go.sum @@ -6,7 +6,6 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -20,20 +19,12 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= -github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sosodev/duration v1.3.1 h1:qtHBDMQ6lvMQsL15g4aopM4HEfOaYuhWBw3NPTtlqq4= github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -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.17 h1:9At7WblLV7/36nulgekUgIaqHZWn5hxqluxrxGUhOmI= @@ -44,6 +35,10 @@ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-2024051809000 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.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= @@ -64,12 +59,8 @@ go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5 go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= @@ -88,9 +79,5 @@ google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/helm/examples/go/main.go b/helm/examples/go/main.go index 5c3e81c..f517097 100644 --- a/helm/examples/go/main.go +++ b/helm/examples/go/main.go @@ -1,50 +1,26 @@ +// Go examples for the Helm module. +// +// This module defines the examples for the Daggerverse. package main import ( "context" - "dagger/go/internal/dagger" - "fmt" - - "github.com/sourcegraph/conc/pool" + "dagger/examples/internal/dagger" ) -type Go struct{} - -// All executes all tests. -func (m *Go) All(ctx context.Context) error { - p := pool.New().WithErrors().WithContext(ctx) - - p.Go(m.HelmVersion) - p.Go(m.HelmTest) - - return p.Wait() -} - -func (m *Go) HelmVersion( - // method call context - ctx context.Context, -) error { - const expected = "0.1.1" - - // dagger call version --directory ./examples/testdata/mychart/ - directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") - version, err := dag.Helm().Version(ctx, directory) - - if err != nil { - return err - } - - if version != expected { - return fmt.Errorf("expected %q, got %q", expected, version) - } +type Examples struct{} - return nil -} -func (h *Go) HelmPackagepush( +// Example on how to call the PackagePush method. +// Packages and pushes a Helm chart to a specified OCI-compatible registry with authentication. +// +// Return: true if the chart was successfully pushed, or false if the chart already exists, with error handling for push failures. +func (h *Examples) HelmPackagepush( // method call context ctx context.Context, + // directory that contains the Helm Chart + directory *dagger.Directory, // URL of the registry registry string, // name of the repository @@ -53,38 +29,43 @@ func (h *Go) HelmPackagepush( username string, // registry login password password *dagger.Secret, -) error { - // dagger call package-push \ - // --registry registry.puzzle.ch \ - // --repository helm \ - // --username $REGISTRY_HELM_USER \ - // --password env:REGISTRY_HELM_PASSWORD \ - // --directory ./examples/testdata/mychart/ - - // directory that contains the Helm Chart - directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") - _, err := dag.Helm().PackagePush(ctx, directory, registry, repository, username, password) - - if err != nil { - return err - } - - return nil +) (bool, error) { + return dag. + Helm(). + PackagePush(ctx, directory, registry, repository, username, password) } -func (m *Go) HelmTest( +// Example on how to call the Test method. +// +// Run the unit tests for the Helm Chart located inside the directory referenced by the directory parameter. +// Add the directory location with `"."` as `--args` parameter to tell helm unittest where to find the tests inside the passed directory. +// +// Return: The Helm unit test output as string. +func (h *Examples) HelmTest( // method call context ctx context.Context, -) error { - args := []string{"."} - - // dagger call test --directory ./examples/testdata/mychart/ --args "." - directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") - _, err := dag.Helm().Test(ctx, directory, args) - - if err != nil { - return err - } + // directory that contains the Helm Chart, e.g. "./helm/examples/testdata/mychart/" + directory *dagger.Directory, + // Helm Unittest arguments, e.g. "." to reference the Helm Chart root directory inside the passed directory. + args []string, +) (string, error) { + return dag. + Helm(). + Test(ctx, directory, args) +} - return nil +// Example on how to call the Version method. +// +// Get and display the version of the Helm Chart located inside the directory referenced by the directory parameter. +// +// Return: The Helm Chart version as string. +func (m *Examples) HelmVersion( + // method call context + ctx context.Context, + // directory that contains the Helm Chart, e.g. "./helm/examples/testdata/mychart/" + chart *dagger.Directory, +) (string, error) { + return dag. + Helm(). + Version(ctx, chart) } diff --git a/helm/examples/shell/examples.sh b/helm/examples/shell/examples.sh new file mode 100755 index 0000000..ff5d879 --- /dev/null +++ b/helm/examples/shell/examples.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +################################################# +# Example on how to call the PackagePush method. +# Packages and pushes a Helm chart to a specified OCI-compatible registry with authentication. +# ARGUMENTS: +# directory: directory that contains the Helm Chart +# registry: URL of the registry +# repository: name of the repository +# username: registry login username +# password: registry login password as a Dagger Secret +# RETURN: +# true if the chart was successfully pushed, or false if the chart already exists, with error handling for push failures. +################################################# +function helm_packagepush() { + dagger -m helm/ \ + call package-push \ + --directory ./helm/examples/testdata/mychart/ \ + --registry registry.puzzle.ch \ + --repository helm \ + --username registry-helm-user \ + --password env:REGISTRY_HELM_PASSWORD \ + --directory ./examples/testdata/mychart/ +} + +################################################# +# Example on how to call the Test method. +# Run the unit tests for the Helm Chart located inside the directory referenced by the directory parameter. +# Add the directory location with `"."` as `--args` parameter to tell helm unittest where to find the tests inside the passed directory. +# ARGUMENTS: +# directory: directory that contains the Helm Chart +# args: arguments for the helm test command +# RETURN: +# The Helm unit test output as string. +################################################# +function helm_test() { + dagger -m helm/ \ + call test \ + --directory ./helm/examples/testdata/mychart/ \ + --args "." +} + +################################################# +# Example on how to call the Version method. +# Get and display the version of the Helm Chart located inside the directory referenced by the directory parameter. +# ARGUMENTS: +# directory: directory that contains the Helm Chart +# RETURN: +# The Helm Chart version as string. +################################################# +function helm_version() { + dagger -m helm/ \ + call version \ + --directory ./helm/examples/testdata/mychart/ +} diff --git a/helm/main.go b/helm/main.go index 69c2558..a3263a0 100644 --- a/helm/main.go +++ b/helm/main.go @@ -42,7 +42,7 @@ func (p PushOpts) getRepoFqdn() string { // Get and display the version of the Helm Chart located inside the given directory. // -// Example usage: dagger call version --directory ./examples/testdata/mychart/ +// Example usage: dagger call version --directory ./helm/examples/testdata/mychart/ func (h *Helm) Version( // method call context ctx context.Context, @@ -158,7 +158,7 @@ func (h *Helm) PackagePush( // Provide the helm chart directory with pointing to it with the `--directory` flag. // Add the directory location with `"."` as `--args` parameter to tell helm unittest where to find the helm chart with the tests. // -// Example usage: dagger call test --directory ./examples/testdata/mychart/ --args "." +// Example usage: dagger call test --directory ./helm/examples/testdata/mychart/ --args "." func (h *Helm) Test( // method call context ctx context.Context, diff --git a/tests/.gitattributes b/tests/.gitattributes new file mode 100644 index 0000000..3a45493 --- /dev/null +++ b/tests/.gitattributes @@ -0,0 +1,4 @@ +/dagger.gen.go linguist-generated +/internal/dagger/** linguist-generated +/internal/querybuilder/** linguist-generated +/internal/telemetry/** linguist-generated diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..7ebabcc --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,4 @@ +/dagger.gen.go +/internal/dagger +/internal/querybuilder +/internal/telemetry diff --git a/tests/dagger.json b/tests/dagger.json new file mode 100644 index 0000000..2e2cf12 --- /dev/null +++ b/tests/dagger.json @@ -0,0 +1,12 @@ +{ + "name": "go", + "sdk": "go", + "dependencies": [ + { + "name": "helm", + "source": "../helm/" + } + ], + "source": ".", + "engineVersion": "v0.13.5" +} diff --git a/tests/go.mod b/tests/go.mod new file mode 100644 index 0000000..bef1aed --- /dev/null +++ b/tests/go.mod @@ -0,0 +1,52 @@ +module dagger/go + +go 1.22.5 + +require ( + github.com/99designs/gqlgen v0.17.55 + github.com/Khan/genqlient v0.7.0 + github.com/vektah/gqlparser/v2 v2.5.17 + go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 + go.opentelemetry.io/otel/log v0.3.0 + go.opentelemetry.io/otel/sdk v1.27.0 + go.opentelemetry.io/otel/sdk/log v0.3.0 + go.opentelemetry.io/otel/trace v1.27.0 + go.opentelemetry.io/proto/otlp v1.3.1 + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa + golang.org/x/sync v0.8.0 + google.golang.org/grpc v1.65.0 +) + +require ( + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect + github.com/sosodev/duration v1.3.1 // indirect + github.com/sourcegraph/conc v0.3.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 + go.opentelemetry.io/otel/sdk/metric v1.27.0 + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/net v0.29.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-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/protobuf v1.34.2 // indirect +) + +replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88 + +replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.3.0 + +replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.3.0 + +replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.3.0 diff --git a/tests/go.sum b/tests/go.sum new file mode 100644 index 0000000..bcf8cf4 --- /dev/null +++ b/tests/go.sum @@ -0,0 +1,96 @@ +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= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +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/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/sosodev/duration v1.3.1 h1:qtHBDMQ6lvMQsL15g4aopM4HEfOaYuhWBw3NPTtlqq4= +github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +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.17 h1:9At7WblLV7/36nulgekUgIaqHZWn5hxqluxrxGUhOmI= +github.com/vektah/gqlparser/v2 v2.5.17/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +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/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 h1:QY7/0NeRPKlzusf40ZE4t1VlMKbqSNT7cJRYzWuja0s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0/go.mod h1:HVkSiDhTM9BoUJU8qE6j2eSWLLXvi1USXjyd2BXT8PY= +go.opentelemetry.io/otel/log v0.3.0 h1:kJRFkpUFYtny37NQzL386WbznUByZx186DpEMKhEGZs= +go.opentelemetry.io/otel/log v0.3.0/go.mod h1:ziCwqZr9soYDwGNbIL+6kAvQC+ANvjgG367HVcyR/ys= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +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.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +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.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= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tests/main.go b/tests/main.go new file mode 100644 index 0000000..05adefc --- /dev/null +++ b/tests/main.go @@ -0,0 +1,78 @@ +package main + +import ( + "context" + "dagger/go/internal/dagger" + "fmt" + + "github.com/sourcegraph/conc/pool" +) + +type Go struct{} + +// All executes all tests. +func (m *Go) All(ctx context.Context) error { + p := pool.New().WithErrors().WithContext(ctx) + + p.Go(m.HelmVersion) + p.Go(m.HelmTest) + + return p.Wait() +} + +func (m *Go) HelmVersion( + // method call context + ctx context.Context, +) error { + const expected = "0.1.1" + directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") + version, err := dag.Helm().Version(ctx, directory) + + if err != nil { + return err + } + + if version != expected { + return fmt.Errorf("expected %q, got %q", expected, version) + } + + return nil +} + +func (h *Go) HelmPackagepush( + // method call context + ctx context.Context, + // URL of the registry + registry string, + // name of the repository + repository string, + // registry login username + username string, + // registry login password + password *dagger.Secret, +) error { + // directory that contains the Helm Chart + directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") + _, err := dag.Helm().PackagePush(ctx, directory, registry, repository, username, password) + + if err != nil { + return err + } + + return nil +} + +func (m *Go) HelmTest( + // method call context + ctx context.Context, +) error { + args := []string{"."} + directory := dag.CurrentModule().Source().Directory("./testdata/mychart/") + _, err := dag.Helm().Test(ctx, directory, args) + + if err != nil { + return err + } + + return nil +} diff --git a/helm/examples/go/testdata/mychart/.helmignore b/tests/testdata/mychart/.helmignore similarity index 100% rename from helm/examples/go/testdata/mychart/.helmignore rename to tests/testdata/mychart/.helmignore diff --git a/helm/examples/go/testdata/mychart/Chart.yaml b/tests/testdata/mychart/Chart.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/Chart.yaml rename to tests/testdata/mychart/Chart.yaml diff --git a/helm/examples/go/testdata/mychart/templates/NOTES.txt b/tests/testdata/mychart/templates/NOTES.txt similarity index 100% rename from helm/examples/go/testdata/mychart/templates/NOTES.txt rename to tests/testdata/mychart/templates/NOTES.txt diff --git a/helm/examples/go/testdata/mychart/templates/_helpers.tpl b/tests/testdata/mychart/templates/_helpers.tpl similarity index 100% rename from helm/examples/go/testdata/mychart/templates/_helpers.tpl rename to tests/testdata/mychart/templates/_helpers.tpl diff --git a/helm/examples/go/testdata/mychart/templates/deployment.yaml b/tests/testdata/mychart/templates/deployment.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/deployment.yaml rename to tests/testdata/mychart/templates/deployment.yaml diff --git a/helm/examples/go/testdata/mychart/templates/hpa.yaml b/tests/testdata/mychart/templates/hpa.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/hpa.yaml rename to tests/testdata/mychart/templates/hpa.yaml diff --git a/helm/examples/go/testdata/mychart/templates/ingress.yaml b/tests/testdata/mychart/templates/ingress.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/ingress.yaml rename to tests/testdata/mychart/templates/ingress.yaml diff --git a/helm/examples/go/testdata/mychart/templates/service.yaml b/tests/testdata/mychart/templates/service.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/service.yaml rename to tests/testdata/mychart/templates/service.yaml diff --git a/helm/examples/go/testdata/mychart/templates/serviceaccount.yaml b/tests/testdata/mychart/templates/serviceaccount.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/serviceaccount.yaml rename to tests/testdata/mychart/templates/serviceaccount.yaml diff --git a/helm/examples/go/testdata/mychart/templates/tests/test-connection.yaml b/tests/testdata/mychart/templates/tests/test-connection.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/templates/tests/test-connection.yaml rename to tests/testdata/mychart/templates/tests/test-connection.yaml diff --git a/helm/examples/go/testdata/mychart/tests/deployment_test.yaml b/tests/testdata/mychart/tests/deployment_test.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/tests/deployment_test.yaml rename to tests/testdata/mychart/tests/deployment_test.yaml diff --git a/helm/examples/go/testdata/mychart/values.yaml b/tests/testdata/mychart/values.yaml similarity index 100% rename from helm/examples/go/testdata/mychart/values.yaml rename to tests/testdata/mychart/values.yaml