Skip to content

Commit

Permalink
Check for empty deployment targets and matchers
Browse files Browse the repository at this point in the history
Fixes #9220
  • Loading branch information
jmooring authored and bep committed Dec 1, 2021
1 parent 08a863e commit f122771
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
8 changes: 8 additions & 0 deletions deploy/deployConfig.go
Expand Up @@ -11,6 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build !nodeploy
// +build !nodeploy

package deploy
Expand All @@ -24,6 +25,7 @@ import (
hglob "github.com/gohugoio/hugo/hugofs/glob"
"github.com/gohugoio/hugo/media"
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
)

const deploymentConfigKey = "deployment"
Expand Down Expand Up @@ -124,12 +126,18 @@ func decodeConfig(cfg config.Provider) (deployConfig, error) {
return dcfg, err
}
for _, tgt := range dcfg.Targets {
if tgt == nil {
return dcfg, errors.New("empty deployment target")
}
if err := tgt.parseIncludeExclude(); err != nil {
return dcfg, err
}
}
var err error
for _, m := range dcfg.Matchers {
if m == nil {
return dcfg, errors.New("empty deployment matcher")
}
m.re, err = regexp.Compile(m.Pattern)
if err != nil {
return dcfg, fmt.Errorf("invalid deployment.matchers.pattern: %v", err)
Expand Down
32 changes: 31 additions & 1 deletion deploy/deployConfig_test.go
Expand Up @@ -11,6 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build !nodeploy
// +build !nodeploy

package deploy
Expand All @@ -21,7 +22,6 @@ import (

qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/config"

)

func TestDecodeConfigFromTOML(t *testing.T) {
Expand Down Expand Up @@ -169,3 +169,33 @@ func TestDecodeConfigDefault(t *testing.T) {
c.Assert(len(dcfg.Targets), qt.Equals, 0)
c.Assert(len(dcfg.Matchers), qt.Equals, 0)
}

func TestEmptyTarget(t *testing.T) {
c := qt.New(t)

tomlConfig := `
[deployment]
[[deployment.targets]]
`
cfg, err := config.FromConfigString(tomlConfig, "toml")
c.Assert(err, qt.IsNil)

_, err = decodeConfig(cfg)
c.Assert(err, qt.Not(qt.IsNil))
}

func TestEmptyMatcher(t *testing.T) {
c := qt.New(t)

tomlConfig := `
[deployment]
[[deployment.matchers]]
`
cfg, err := config.FromConfigString(tomlConfig, "toml")
c.Assert(err, qt.IsNil)

_, err = decodeConfig(cfg)
c.Assert(err, qt.Not(qt.IsNil))

fmt.Printf("JMM-1: %s", err)
}

0 comments on commit f122771

Please sign in to comment.