Skip to content

[Release-02]Fix handling of cfg var #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArangoGutierrez merged 2 commits into from
Aug 1, 2024
Merged

[Release-02]Fix handling of cfg var #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
880eabf
Fix handling of cfg var
ArangoGutierrez Aug 1, 2024
9fb1a8f
Merge pull request #131 from ArangoGutierrez/action0212
ArangoGutierrez Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/action/ci/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
5 changes: 4 additions & 1 deletion cmd/action/ci/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/action/ci/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down Expand Up @@ -77,17 +77,17 @@ 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
}

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)
Expand Down Expand Up @@ -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
}
Expand Down