From 520030d4ee64ac7caeb76c3e17eae952bba7c122 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Mon, 26 Apr 2021 18:00:03 -0700 Subject: [PATCH] fixed tests creds + added authprovider to client solver Signed-off-by: Sam Alba --- dagger/client.go | 7 +++++-- tests/ops/push-container/inputs.yaml | 15 ++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dagger/client.go b/dagger/client.go index 5b3674d3..e78547f3 100644 --- a/dagger/client.go +++ b/dagger/client.go @@ -19,6 +19,7 @@ import ( _ "github.com/moby/buildkit/client/connhelper/dockercontainer" // import the container connection driver "github.com/moby/buildkit/client/llb" bkgw "github.com/moby/buildkit/frontend/gateway/client" + "github.com/moby/buildkit/session" // docker output "dagger.io/go/pkg/buildkitd" @@ -101,9 +102,13 @@ func (c *Client) buildfn(ctx context.Context, deployment *Deployment, fn ClientD localdirs[label] = abs } + // buildkit auth provider (registry) + auth := newRegistryAuthProvider() + // Setup solve options opts := bk.SolveOpt{ LocalDirs: localdirs, + Session: []session.Attachable{auth}, } // Call buildkit solver @@ -113,8 +118,6 @@ func (c *Client) buildfn(ctx context.Context, deployment *Deployment, fn ClientD Msg("spawning buildkit job") resp, err := c.c.Build(ctx, opts, "", func(ctx context.Context, gw bkgw.Client) (*bkgw.Result, error) { - // buildkit auth provider (registry) - auth := newRegistryAuthProvider() s := NewSolver(c.c, gw, ch, auth, c.noCache) lg.Debug().Msg("loading configuration") diff --git a/tests/ops/push-container/inputs.yaml b/tests/ops/push-container/inputs.yaml index c3c9fb1e..f054b2cf 100644 --- a/tests/ops/push-container/inputs.yaml +++ b/tests/ops/push-container/inputs.yaml @@ -1,16 +1,17 @@ registry: username: ENC[AES256_GCM,data:8AH6p9WHidanCA==,iv:ezThCQJv+bVBf8SdfSa2HFoP+eu6IZMPl5xvMOGDcps=,tag:mzR7xTKeQNDvkyd2Dm3AKw==,type:str] - token: ENC[AES256_GCM,data:68d31b3EfnQJofIt6j+iBCtDyLOBWjFqvVmejyDjIOh8oBXP,iv:PMghC2nd7jqAzrQzm/PW1YdbE0VAbEBkK0/Ri1WwduI=,tag:0JH4WbcJHvgzF4VIK4deBg==,type:str] + secret: ENC[AES256_GCM,data:GtuaBAhFBw2JFaeuOm6mUr3m1j5fvCJjcWAzjsdU2xASFxwO,iv:YAXcRzBoemmef5PBdAOBa5acNPo4BoKH7Ngud/CWYfA=,tag:MCCUCOSutjRCI92raYrxdg==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] - lastmodified: '2021-03-18T22:59:59Z' - mac: ENC[AES256_GCM,data:3++nHOAJaYFCEuUXim4/gOsG1ZVWt8Ab88qaqHM6jpCA2gLSyADWpB5iQfU9bM7Sq3PgCcWd5+mDHxl5Q8r9fiozrS025OLtsn7qQQQ84WaiFz9Y4Trsbe4EJXNpxYDXjLZEkEtkKs4/Dl+y2Ey3nVyIWKZEX9cPogJ64zfFS9Q=,iv:jvSwxJ8Of2Nfp1ijKItOraDO8aS6aGHQKFY61kF8JS8=,tag:I+AWPIZsPeXU30zxbgq2eQ==,type:str] + age: [] + lastmodified: "2021-04-27T00:59:33Z" + mac: ENC[AES256_GCM,data:qk+oo4m5OpfuQ+R3pZUuvn+gqAk15OAJzOULrlYqt1FIDRk/Q5ah5QpIbVxeP1EDVyuY/V/E0ZngRlSV7Dyx6Cp/moMd8AFBHNgnTB+Lq+NmZ9HR1QMOxpbMpJmUGn7MqQ1Ys4wy0p2q2Y2+TuUpKwmRGJbGVYEVmqvV5OT3jhc=,iv:QsUFa2GVzy6iqqLXRz8HascQZPIIzKBhxHdlabov02k=,tag:7lk63FeXsOlTCgfmWd7zrg==,type:str] pgp: - - created_at: '2021-03-18T22:59:59Z' - enc: | + - created_at: "2021-03-18T22:59:59Z" + enc: | -----BEGIN PGP MESSAGE----- hQIMAzqVY590vudzAQ//etnfnpfCo9rAkctR+Fwg/7VdVL3Rov+6gnyjUnoN1BS1 @@ -28,6 +29,6 @@ sops: Xd3gV3smg5xZ7/rfvzKTzJ1a5yH6D3xI05UtnUWdqojONcXS9NS+P7RArngJwSs= =m0OS -----END PGP MESSAGE----- - fp: 6CB37404020B5F0A0B41B5BB225EBAB0B936AC65 + fp: 6CB37404020B5F0A0B41B5BB225EBAB0B936AC65 unencrypted_suffix: _unencrypted - version: 3.6.1 + version: 3.7.1