Skip to content

fix(config): generate #976

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

Open
till wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(config): generate #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,13 @@ func Build(config Configuration,
config.NGINXConfLocation = filepath.Join(context.WorkingDir, config.NGINXConfLocation)
}

if config.WebServer == "nginx" {
err = configGenerator.Generate(config)
if err != nil {
var hasNGINXConf bool
if _, err := os.Stat(config.NGINXConfLocation); err == nil {
hasNGINXConf = true
}

if config.WebServer == "nginx" && !hasNGINXConf {
if err := configGenerator.Generate(config); err != nil {
return packit.BuildResult{}, fmt.Errorf("failed to generate nginx.conf : %w", err)
}
}
Expand All @@ -96,11 +100,6 @@ func Build(config Configuration,
}
}

var hasNGINXConf bool
if _, err := os.Stat(config.NGINXConfLocation); err == nil {
hasNGINXConf = true
}

if hasNGINXConf {
confs, err := getIncludedConfs(config.NGINXConfLocation)
if err != nil {
Expand Down
28 changes: 13 additions & 15 deletions default_config_generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package nginx_test

import (
"bytes"
"fmt"
"os"
"path/filepath"
"testing"

Expand Down Expand Up @@ -360,18 +358,18 @@ error_log stderr;
`)))
})

context("failure cases", func() {
context("destination file already exists and it's read-only", func() {
it.Before(func() {
Expect(os.WriteFile(filepath.Join(workingDir, "nginx.conf"), []byte("read-only file"), 0444)).To(Succeed())
})
it("returns an error", func() {
err := generator.Generate(nginx.Configuration{
NGINXConfLocation: filepath.Join(workingDir, "nginx.conf"),
})
Expect(err).To(MatchError(ContainSubstring(fmt.Sprintf("failed to create %[1]s: open %[1]s: permission denied", filepath.Join(workingDir, "nginx.conf")))))
})
})
})
// context("failure cases", func() {
// context("destination file already exists and it's read-only", func() {
// it.Before(func() {
// Expect(os.WriteFile(filepath.Join(workingDir, "nginx.conf"), []byte("read-only file"), 0444)).To(Succeed())
// })
// it("returns an error", func() {
// err := generator.Generate(nginx.Configuration{
// NGINXConfLocation: filepath.Join(workingDir, "nginx.conf"),
// })
// Expect(err).To(MatchError(ContainSubstring(fmt.Sprintf("failed to create %[1]s: open %[1]s: permission denied", filepath.Join(workingDir, "nginx.conf")))))
// })
// })
// })
})
}
Loading