From 880eabf49334bffa2d6489f72a576a3b3adaa2a5 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Thu, 1 Aug 2024 16:41:34 +0200 Subject: [PATCH] Fix handling of cfg var Signed-off-by: Carlos Eduardo Arango Gutierrez --- cmd/action/ci/cleanup.go | 2 +- cmd/action/ci/entrypoint.go | 5 ++++- cmd/action/ci/provider.go | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cmd/action/ci/cleanup.go b/cmd/action/ci/cleanup.go index 8165e7f9f..9915b42fb 100644 --- a/cmd/action/ci/cleanup.go +++ b/cmd/action/ci/cleanup.go @@ -50,7 +50,7 @@ func cleanup(log *logger.FunLogger) error { os.Exit(1) } - provider, err := newProvider(log, cfg) + provider, err := newProvider(log, &cfg) if err != nil { return fmt.Errorf("failed to create provider: %v", err) } diff --git a/cmd/action/ci/entrypoint.go b/cmd/action/ci/entrypoint.go index c3725ab0e..8ddd0f543 100644 --- a/cmd/action/ci/entrypoint.go +++ b/cmd/action/ci/entrypoint.go @@ -49,6 +49,9 @@ func entrypoint(log *logger.FunLogger) error { cfg.Spec.ContainerRuntime.Name = v1alpha1.ContainerRuntimeNone } + // Set default values for the environment + setCfgName(&cfg) + // Read Inputs // INPUT_* vars are optional since v0.2 of the action // Users can set the variables on self hosted runners. @@ -77,7 +80,7 @@ func entrypoint(log *logger.FunLogger) error { } } - provider, err := newProvider(log, cfg) + provider, err := newProvider(log, &cfg) if err != nil { return fmt.Errorf("failed to create provider: %v", err) } diff --git a/cmd/action/ci/provider.go b/cmd/action/ci/provider.go index 67dd83bdf..9d6e66e99 100644 --- a/cmd/action/ci/provider.go +++ b/cmd/action/ci/provider.go @@ -27,7 +27,7 @@ import ( "github.com/NVIDIA/holodeck/pkg/provider/vsphere" ) -func newProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (provider.Provider, error) { +func newProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (provider.Provider, error) { var provider provider.Provider var err error @@ -49,7 +49,7 @@ func newProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (provider.Prov return provider, nil } -func newAwsProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (*aws.Provider, error) { +func newAwsProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (*aws.Provider, error) { // Create cachedir directory if _, err := os.Stat(cachedir); os.IsNotExist(err) { err := os.Mkdir(cachedir, 0755) @@ -77,9 +77,9 @@ func newAwsProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (*aws.Provi cfg.Spec.Auth.Username = "ubuntu" // Set env name - setCfgName(&cfg) + setCfgName(cfg) - a, err := aws.New(log, cfg, cacheFile) + a, err := aws.New(log, *cfg, cacheFile) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func newAwsProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (*aws.Provi return a, nil } -func newVsphereProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (*vsphere.Provider, error) { +func newVsphereProvider(log *logger.FunLogger, cfg *v1alpha1.Environment) (*vsphere.Provider, error) { // Create cachedir directory if _, err := os.Stat(cachedir); os.IsNotExist(err) { err := os.Mkdir(cachedir, 0755) @@ -115,9 +115,9 @@ func newVsphereProvider(log *logger.FunLogger, cfg v1alpha1.Environment) (*vsphe cfg.Spec.Auth.Username = "nvidia" // Set env name - setCfgName(&cfg) + setCfgName(cfg) - v, err := vsphere.New(log, cfg, cacheFile) + v, err := vsphere.New(log, *cfg, cacheFile) if err != nil { return nil, err }