From e762d3dbcab79bf0efef73e36cd569de2d72ffd2 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:44:27 +0100 Subject: [PATCH] update compose build ssh path to an absolute one the unit test doesn't define a working_dir so path generate on Windows is escaped this use case is already covered and tested by compose-go CI Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- bake/compose_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bake/compose_test.go b/bake/compose_test.go index 277433a7..ebeb880e 100644 --- a/bake/compose_test.go +++ b/bake/compose_test.go @@ -33,7 +33,7 @@ services: cache_to: - type=local,dest=path/to/cache ssh: - - key=path/to/key + - key=/path/to/key - default secrets: - token @@ -77,7 +77,7 @@ secrets: require.Equal(t, []string{"type=local,src=path/to/cache"}, stringify(c.Targets[1].CacheFrom)) require.Equal(t, []string{"type=local,dest=path/to/cache"}, stringify(c.Targets[1].CacheTo)) require.Equal(t, "none", *c.Targets[1].NetworkMode) - require.Equal(t, []string{"default", "key=path/to/key"}, stringify(c.Targets[1].SSH)) + require.Equal(t, []string{"default", "key=/path/to/key"}, stringify(c.Targets[1].SSH)) require.Equal(t, []string{ "id=aws,src=/root/.aws/credentials", "id=token,env=ENV_TOKEN", @@ -283,7 +283,7 @@ services: tags: - ct-addon:baz ssh: - key: path/to/key + key: /path/to/key args: CT_ECR: foo CT_TAG: bar @@ -338,7 +338,7 @@ services: require.Equal(t, []string{"linux/amd64", "linux/arm64"}, c.Targets[0].Platforms) require.Equal(t, []string{"type=local,src=path/to/cache", "user/app:cache"}, stringify(c.Targets[0].CacheFrom)) require.Equal(t, []string{"type=local,dest=path/to/cache", "user/app:cache"}, stringify(c.Targets[0].CacheTo)) - require.Equal(t, []string{"default", "key=path/to/key", "other=path/to/otherkey"}, stringify(c.Targets[0].SSH)) + require.Equal(t, []string{"default", "key=/path/to/key", "other=path/to/otherkey"}, stringify(c.Targets[0].SSH)) require.Equal(t, newBool(true), c.Targets[0].Pull) require.Equal(t, map[string]string{"alpine": "docker-image://alpine:3.13"}, c.Targets[0].Contexts) require.Equal(t, []string{"ct-fake-aws:bar"}, c.Targets[1].Tags)