From d4bdf66e1f4013fc6e4565206f0c0a687f9f222d Mon Sep 17 00:00:00 2001 From: Hayato Kiwata Date: Thu, 16 Nov 2023 00:09:50 +0900 Subject: [PATCH 1/2] fix: Fix to be able to run finch build with --ssh option In the current implementation, the following error occurs when running finch build with the `--ssh default` option. This issue is also reported in issue/452. ``` error: invalid empty ssh agent socket: make sure SSH_AUTH_SOCK is set FATA[0000] no image was built FATA[0000] exit status 1 ``` This is because the ssh agent is not starting on the vm started using lima and the SSH_AUTH_SOCK variable is empty. As a result, this error occurs. On the other hand, setting forwardAgent to true in finch.yaml will configure the vm to forward the ssh agent. As a result, the ssh agent will be started in the vm and finch build can be executed using the `--ssh default` option. Therefore, this commit will fix it so that finch build can be run using the `--ssh default` option. Signed-off-by: Hayato Kiwata --- finch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/finch.yaml b/finch.yaml index 27c206862..8aa9f8403 100644 --- a/finch.yaml +++ b/finch.yaml @@ -105,7 +105,7 @@ ssh: loadDotSSHPubKeys: false # Forward ssh agent into the instance. # 🟢 Builtin default: false - forwardAgent: null + forwardAgent: true # Forward X11 into the instance # 🟢 Builtin default: false forwardX11: null From c977c2b9e2c9c391b7252c06412c1de02a5b6928 Mon Sep 17 00:00:00 2001 From: Hayato Kiwata Date: Thu, 23 Nov 2023 13:10:56 +0900 Subject: [PATCH 2/2] build(deps): Update go.mod and go.sum to run new version of github.com/runfinch/common-tests Issue #, if available: #452 *Description of changes:* This commit updates Go Modules by running go mod tidy so that we can test the --ssh option in finch build. *Testing done:* Yes - [x] I've reviewed the guidance in CONTRIBUTING.md By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Hayato Kiwata --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 0b06186c3..98075daa4 100644 --- a/go.mod +++ b/go.mod @@ -9,11 +9,11 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-licenses v1.6.0 github.com/lima-vm/lima v0.18.0 - github.com/onsi/ginkgo/v2 v2.13.0 + github.com/onsi/ginkgo/v2 v2.13.1 github.com/onsi/gomega v1.30.0 github.com/pelletier/go-toml v1.9.5 github.com/pkg/sftp v1.13.6 - github.com/runfinch/common-tests v0.7.8 + github.com/runfinch/common-tests v0.7.9 github.com/shirou/gopsutil/v3 v3.23.10 github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.10.0 @@ -60,7 +60,7 @@ require ( github.com/docker/go-units v0.5.0 github.com/emirpasic/gods v1.12.0 // indirect github.com/fatih/color v1.15.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/goccy/go-yaml v1.11.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-cmp v0.6.0 // indirect diff --git a/go.sum b/go.sum index f3b05dcfc..d0b8bf055 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -291,8 +291,8 @@ github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnE github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= +github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -325,8 +325,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/runfinch/common-tests v0.7.8 h1:uXskg7qUSLp+2H+BT3rsAn5RZ90XVTn8LYOOj6ODsUg= -github.com/runfinch/common-tests v0.7.8/go.mod h1:SiFfCOWo+b2SpA/MwEa3z3cFTCyuEJQJXBJ6ItH6G64= +github.com/runfinch/common-tests v0.7.9 h1:BcaiHZ/e8VTpaXKb3usP3vwddxVmsfpIELHM5peFJcg= +github.com/runfinch/common-tests v0.7.9/go.mod h1:iztvjCXgz5DmmRw1SAVWqcyVgER4932X1Q4W1EgY9QU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=