Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
fixup: Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-Authored-By: Alfonso Acosta <fons@syntacticsugar.consulting>
  • Loading branch information
squaremo and 2opremio authored Jan 23, 2020
1 parent a455a83 commit 9fd9be4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/references/fluxyaml-config-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ In the following example, the top-level `.flux.yaml` would take effect
for `--git-path=staging` or `--git-path=production`.

But if you wanted `yamls/permissions.yaml` to be applied (as it is),
you could put a `.flux.yaml` containing `files` in that directory, and
you could put a `.flux.yaml` containing `scanForFiles` in that directory, and
specify `--git-path=staging,yamls`.

```
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifests/configaware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,11 @@ func TestDuplicateInGenerators(t *testing.T) {
assert.Contains(t, err.Error(), "duplicate")
}

func TestJustFiles(t *testing.T) {
func TestSccanForFiles(t *testing.T) {
// +-- config
// +-- .flux.yaml (patchUpdated)
// +-- rawfiles
// +-- .flux.yaml (files)
// +-- .flux.yaml (scanForFiles)
// +-- manifest.yaml

manifestyaml := `
Expand Down
1 change: 0 additions & 1 deletion pkg/manifests/configfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"testing"

"github.com/stretchr/testify/assert"
// jsonschema "github.com/xeipuuv/gojsonschema"

"github.com/fluxcd/flux/pkg/resource"
)
Expand Down

0 comments on commit 9fd9be4

Please sign in to comment.