Skip to content
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.

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

Match file path relative to config file's directory #827

Merged
merged 3 commits into from
Mar 10, 2021
Merged

Match file path relative to config file's directory #827

merged 3 commits into from
Mar 10, 2021

Conversation

paulolieuthier
Copy link
Contributor

Fixes #480.

Copy link
Contributor

@autrilla autrilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR. Before feeling comfortable merging this, I would like to see the documentation mention how the creation rules path is computed, and some tests as well.

config/config.go Outdated Show resolved Hide resolved
@paulolieuthier
Copy link
Contributor Author

Hey @autrilla, please tell me if it's ok now.

@paulolieuthier paulolieuthier requested a review from autrilla March 6, 2021 19:38
README.rst Outdated Show resolved Hide resolved
autrilla
autrilla previously approved these changes Mar 7, 2021
Copy link
Contributor

@autrilla autrilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@autrilla
Copy link
Contributor

autrilla commented Mar 7, 2021

Oh, can you make this merge against develop please?

@paulolieuthier paulolieuthier changed the base branch from master to develop March 8, 2021 14:22
@paulolieuthier
Copy link
Contributor Author

Rebased to develop!

@paulolieuthier paulolieuthier requested a review from autrilla March 8, 2021 17:46
Copy link
Contributor

@autrilla autrilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one thing I missed in the original review, and then we're good to go.

config/config.go Outdated
@@ -65,6 +67,7 @@ func FindConfigFile(start string) (string, error) {
type configFile struct {
CreationRules []creationRule `yaml:"creation_rules"`
DestinationRules []destinationRule `yaml:"destination_rules"`
Path string
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed this in the last review, but this struct is used to parse the .sops.yaml file, and I don't want this exposed in there. Can you move this out of the struct and just pass it in as a parameter to the functions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Tell me if it's ok now.

@paulolieuthier paulolieuthier requested a review from autrilla March 8, 2021 20:26
@autrilla autrilla merged commit dd7ce3d into getsops:develop Mar 10, 2021
@paulolieuthier paulolieuthier deleted the fix-rule-relative-file-matching branch March 10, 2021 20:44
autrilla added a commit that referenced this pull request Mar 10, 2021
@paulolieuthier
Copy link
Contributor Author

@autrilla I just saw you reverted the merge. Was that because of the failing tests (I just saw that as well). Do you have anything against merging a new PR (with passing tests)?

@autrilla
Copy link
Contributor

autrilla commented Apr 9, 2021 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Behavior of path_regex changed in patch release and broke some usecases
2 participants