From 3f5afeb748101751387e2a0a5bd74686a0cc7a97 Mon Sep 17 00:00:00 2001 From: Razieh Behjati Date: Tue, 20 Dec 2022 23:15:53 +0000 Subject: [PATCH] Make the exposed LoadBuildConfigFromFile a method on DockerBuildConfig Signed-off-by: Razieh Behjati --- internal/builders/docker/pkg/config.go | 13 +++++++++++-- internal/builders/docker/pkg/config_test.go | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/builders/docker/pkg/config.go b/internal/builders/docker/pkg/config.go index 63411b2c05..f26d34f2c0 100644 --- a/internal/builders/docker/pkg/config.go +++ b/internal/builders/docker/pkg/config.go @@ -153,8 +153,17 @@ func (d *Digest) ToMap() map[string]string { return map[string]string{d.Alg: d.Value} } -// LoadBuildConfigFromFile loads build configuration from a toml file in the given path and returns an instance of BuildConfig. -func LoadBuildConfigFromFile(path string) (*BuildConfig, error) { +// LoadBuildConfigFromFile loads build configuration from a toml file specified +// by the BuildConfigPath of this DockerBuildConfig. An instance of BuildConfig +// is returned on success. +func (dbc *DockerBuildConfig) LoadBuildConfigFromFile() (*BuildConfig, error) { + return loadBuildConfigFromFile(dbc.BuildConfigPath) +} + +// loadBuildConfigFromFile does not validate the input path, and is therefore +// not exposed. The corresponding method LoadBuildConfigFromFile must be called +// on an instance of DockerBuildConfig which has a validated BuildConfigPath. +func loadBuildConfigFromFile(path string) (*BuildConfig, error) { tomlTree, err := toml.LoadFile(path) if err != nil { return nil, fmt.Errorf("couldn't load toml file: %v", err) diff --git a/internal/builders/docker/pkg/config_test.go b/internal/builders/docker/pkg/config_test.go index 1b2b40ff38..efc5f2fec0 100644 --- a/internal/builders/docker/pkg/config_test.go +++ b/internal/builders/docker/pkg/config_test.go @@ -21,7 +21,7 @@ import ( ) func Test_LoadBuildConfigFromFile(t *testing.T) { - got, err := LoadBuildConfigFromFile("../testdata/config.toml") + got, err := loadBuildConfigFromFile("../testdata/config.toml") if err != nil { t.Fatalf("couldn't load config file: %v", err) }