Skip to content

refactor to move more processing to the API #1082

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
merged 7 commits into from
Apr 25, 2023
Merged

refactor to move more processing to the API #1082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4992745
refactor to move more processing to the template
grokspawn Mar 28, 2023
6b4a6a5
better diagnostics on custom exec error
grokspawn Mar 31, 2023
8f129e9
Remove obsolete fields
oceanc80 Apr 11, 2023
3dac14c
caching wip
grokspawn Apr 18, 2023
4593d4a
refactor a bit and update unit tests (#2)
everettraven Apr 19, 2023
135969c
whitespace sanity hell
grokspawn Apr 19, 2023
097ed19
drop STDERR for nominal case
grokspawn Apr 24, 2023
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
36 changes: 14 additions & 22 deletions alpha/template/composite/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,9 @@ const (
CustomBuilderSchema = "olm.builder.custom"
)

type ContainerConfig struct {
ContainerTool string
BaseImage string
WorkingDir string
}

type BuilderConfig struct {
ContainerCfg ContainerConfig
OutputType string
InputDirectory string
WorkingDir string
OutputType string
}

type Builder interface {
Expand Down Expand Up @@ -96,13 +89,13 @@ func (bb *BasicBuilder) Build(ctx context.Context, reg image.Registry, dir strin
return fmt.Errorf("error rendering basic template: %v", err)
}

destPath := path.Join(bb.builderCfg.ContainerCfg.WorkingDir, dir, basicConfig.Output)
destPath := path.Join(bb.builderCfg.WorkingDir, dir, basicConfig.Output)

return build(dcfg, destPath, bb.builderCfg.OutputType)
}

func (bb *BasicBuilder) Validate(dir string) error {
return validate(bb.builderCfg.ContainerCfg, dir)
return validate(bb.builderCfg, dir)
}

type SemverBuilder struct {
Expand Down Expand Up @@ -158,13 +151,13 @@ func (sb *SemverBuilder) Build(ctx context.Context, reg image.Registry, dir stri
return fmt.Errorf("error rendering semver template: %v", err)
}

destPath := path.Join(sb.builderCfg.ContainerCfg.WorkingDir, dir, semverConfig.Output)
destPath := path.Join(sb.builderCfg.WorkingDir, dir, semverConfig.Output)

return build(dcfg, destPath, sb.builderCfg.OutputType)
}

func (sb *SemverBuilder) Validate(dir string) error {
return validate(sb.builderCfg.ContainerCfg, dir)
return validate(sb.builderCfg, dir)
}

type RawBuilder struct {
Expand Down Expand Up @@ -218,13 +211,13 @@ func (rb *RawBuilder) Build(ctx context.Context, _ image.Registry, dir string, t
return fmt.Errorf("error parsing raw input file: %s, %v", rawConfig.Input, err)
}

destPath := path.Join(rb.builderCfg.ContainerCfg.WorkingDir, dir, rawConfig.Output)
destPath := path.Join(rb.builderCfg.WorkingDir, dir, rawConfig.Output)

return build(dcfg, destPath, rb.builderCfg.OutputType)
}

func (rb *RawBuilder) Validate(dir string) error {
return validate(rb.builderCfg.ContainerCfg, dir)
return validate(rb.builderCfg, dir)
}

type CustomBuilder struct {
Expand Down Expand Up @@ -268,13 +261,12 @@ func (cb *CustomBuilder) Build(ctx context.Context, reg image.Registry, dir stri
}
// build the command to execute
cmd := exec.Command(customConfig.Command, customConfig.Args...)
cmd.Dir = cb.builderCfg.ContainerCfg.WorkingDir

// custom template should output a valid FBC to STDOUT so we can
// build the FBC just like all the other templates.
v, err := cmd.Output()
if err != nil {
return fmt.Errorf("running command %q: %v", cmd.String(), err)
return fmt.Errorf("running command %q: %v: %v", cmd.String(), err, v)
}

reader := bytes.NewReader(v)
Expand All @@ -286,15 +278,15 @@ func (cb *CustomBuilder) Build(ctx context.Context, reg image.Registry, dir stri
return fmt.Errorf("error parsing custom command output: %s, %v", strings.Join(cmdString, "'"), err)
}

destPath := path.Join(cb.builderCfg.ContainerCfg.WorkingDir, dir, customConfig.Output)
destPath := path.Join(cb.builderCfg.WorkingDir, dir, customConfig.Output)

// custom template should output a valid FBC to STDOUT so we can
// build the FBC just like all the other templates.
return build(dcfg, destPath, cb.builderCfg.OutputType)
}

func (cb *CustomBuilder) Validate(dir string) error {
return validate(cb.builderCfg.ContainerCfg, dir)
return validate(cb.builderCfg, dir)
}

func writeDeclCfg(dcfg declcfg.DeclarativeConfig, w io.Writer, output string) error {
Expand All @@ -308,12 +300,12 @@ func writeDeclCfg(dcfg declcfg.DeclarativeConfig, w io.Writer, output string) er
}
}

func validate(containerCfg ContainerConfig, dir string) error {
func validate(builderCfg BuilderConfig, dir string) error {

path := path.Join(containerCfg.WorkingDir, dir)
path := path.Join(builderCfg.WorkingDir, dir)
s, err := os.Stat(path)
if err != nil {
return fmt.Errorf("directory not found. validation path needs to be composed of ContainerConfig.WorkingDir+Component[].Destination.Path: %q: %v", path, err)
return fmt.Errorf("directory not found. validation path needs to be composed of BuilderConfig.WorkingDir+Component[].Destination.Path: %q: %v", path, err)
}
if !s.IsDir() {
return fmt.Errorf("%q is not a directory", path)
Expand Down
Loading