diff --git a/.goreleaser.yml b/.goreleaser.yml index 1eb0006a..5c3c3a42 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,8 +14,8 @@ builds: binary: regula ldflags: - -s -w - - -X github.com/fugue/regula/v2/pkg/version.Version={{.Tag}} - - -X github.com/fugue/regula/v2/pkg/version.GitCommit={{.ShortCommit}} + - -X github.com/fugue/regula/v3/pkg/version.Version={{.Tag}} + - -X github.com/fugue/regula/v3/pkg/version.GitCommit={{.ShortCommit}} id: macos goos: [darwin] goarch: [amd64, arm64] diff --git a/CHANGELOG.md b/CHANGELOG.md index f645456f..206c1cf8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG +## v3.0.0 (2023-01-24) +### Added +* support for_each for resources in tf loader +### Changed +* switch to hcl_interpreter from policy-engine (#383) +* resources IDs for tf resources that have count set now use the `aws_s3_bucket.my_bucket[0]` format +### Fixed +* FG_R00252 should support arrays for condition values (#380) +* FG_R00329 has wrong property name (#368) + ## v2.10.0 (2022-11-10) ### Added * Support for .tf.json files - including those output by Terraform CDK's `cdktf synth` command. diff --git a/Makefile b/Makefile index a5c8a357..4faede48 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ REGO_RULES_SOURCE = $(shell find rego/rules -type f -name '*.rego') GITCOMMIT = $(shell git rev-parse --short HEAD 2> /dev/null || true) BUILD_TYPE ?= dev define LDFLAGS - -X \"github.com/fugue/regula/v2/pkg/version.Version=$(VERSION)-$(BUILD_TYPE)\" \ - -X \"github.com/fugue/regula/v2/pkg/version.GitCommit=$(GITCOMMIT)\" + -X \"github.com/fugue/regula/v3/pkg/version.Version=$(VERSION)-$(BUILD_TYPE)\" \ + -X \"github.com/fugue/regula/v3/pkg/version.GitCommit=$(GITCOMMIT)\" endef CLI_BUILD = go build -ldflags="$(LDFLAGS) -s -w" GO_BIN_DIR= $(shell go env GOPATH)/bin diff --git a/changes/v3.0.0.md b/changes/v3.0.0.md new file mode 100644 index 00000000..b328aadf --- /dev/null +++ b/changes/v3.0.0.md @@ -0,0 +1,9 @@ +## v3.0.0 (2023-01-24) +### Added +* support for_each for resources in tf loader +### Changed +* switch to hcl_interpreter from policy-engine (#383) +* resources IDs for tf resources that have count set now use the `aws_s3_bucket.my_bucket[0]` format +### Fixed +* FG_R00252 should support arrays for condition values (#380) +* FG_R00329 has wrong property name (#368) \ No newline at end of file diff --git a/cmd/flags.go b/cmd/flags.go index d03a64c5..ef79ef86 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -20,8 +20,8 @@ import ( "path/filepath" "strings" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/reporter" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/init.go b/cmd/init.go index 336ef432..0c3db662 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -20,8 +20,8 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/reporter" "github.com/manifoldco/promptui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/repl.go b/cmd/repl.go index bbaac21a..e031ec90 100644 --- a/cmd/repl.go +++ b/cmd/repl.go @@ -18,8 +18,8 @@ import ( "context" _ "embed" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/root.go b/cmd/root.go index df241803..4281a76d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/rego" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/run.go b/cmd/run.go index af848191..cbd289a5 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -21,9 +21,9 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/reporter" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/runconfig.go b/cmd/runconfig.go index e5063560..426db65b 100644 --- a/cmd/runconfig.go +++ b/cmd/runconfig.go @@ -20,10 +20,10 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/fugue" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/fugue" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/reporter" "github.com/sirupsen/logrus" ) diff --git a/cmd/showconfigrego.go b/cmd/showconfigrego.go index 4be5e371..f8b05508 100644 --- a/cmd/showconfigrego.go +++ b/cmd/showconfigrego.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/fugue/regula/v2/pkg/fugue" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/fugue" + "github.com/fugue/regula/v3/pkg/rego" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/showcustomrule.go b/cmd/showcustomrule.go index 8874e594..63e041d5 100644 --- a/cmd/showcustomrule.go +++ b/cmd/showcustomrule.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/fugue/regula/v2/pkg/fugue" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/fugue" + "github.com/fugue/regula/v3/pkg/rego" "github.com/spf13/cobra" ) diff --git a/cmd/showinput.go b/cmd/showinput.go index 4d149be6..1b81d292 100644 --- a/cmd/showinput.go +++ b/cmd/showinput.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/showscanview.go b/cmd/showscanview.go index 5d6df876..7c74e9fc 100644 --- a/cmd/showscanview.go +++ b/cmd/showscanview.go @@ -20,9 +20,9 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/reporter" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/test.go b/cmd/test.go index e2434449..8f2e33f1 100644 --- a/cmd/test.go +++ b/cmd/test.go @@ -18,8 +18,8 @@ import ( "context" _ "embed" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 370337b9..16bc7d82 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -17,7 +17,7 @@ package cmd import ( "fmt" - "github.com/fugue/regula/v2/pkg/version" + "github.com/fugue/regula/v3/pkg/version" "github.com/spf13/cobra" ) diff --git a/cmd/write_test_inputs.go b/cmd/write_test_inputs.go index ce99f215..48ecd9d6 100644 --- a/cmd/write_test_inputs.go +++ b/cmd/write_test_inputs.go @@ -19,8 +19,8 @@ import ( _ "embed" "os" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/go.mod b/go.mod index 4074287f..f94c471a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/fugue/regula/v2 +module github.com/fugue/regula/v3 go 1.17 diff --git a/main.go b/main.go index 150b3d6b..31211a0e 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/fugue/regula/v2/cmd" + "github.com/fugue/regula/v3/cmd" ) func main() { diff --git a/mkdocs.yml b/mkdocs.yml index c1d60d72..64c62bc1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -60,7 +60,7 @@ markdown_extensions: site_url: https://regula.dev edit_uri: blob/master/docs/src/ extra: - version: v2.10.0 + version: v3.0.0 social: - icon: fontawesome/solid/globe link: https://www.fugue.co diff --git a/pkg/fugue/client.go b/pkg/fugue/client.go index 2db0fdc5..f511bb53 100644 --- a/pkg/fugue/client.go +++ b/pkg/fugue/client.go @@ -26,17 +26,17 @@ import ( "path/filepath" "strings" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/reporter" - "github.com/fugue/regula/v2/pkg/rule_waivers" - "github.com/fugue/regula/v2/pkg/swagger/client" - apiclient "github.com/fugue/regula/v2/pkg/swagger/client" - "github.com/fugue/regula/v2/pkg/swagger/client/environments" - "github.com/fugue/regula/v2/pkg/swagger/client/rule_bundles" - waivers "github.com/fugue/regula/v2/pkg/swagger/client/rule_waivers" - "github.com/fugue/regula/v2/pkg/swagger/models" - "github.com/fugue/regula/v2/pkg/version" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/reporter" + "github.com/fugue/regula/v3/pkg/rule_waivers" + "github.com/fugue/regula/v3/pkg/swagger/client" + apiclient "github.com/fugue/regula/v3/pkg/swagger/client" + "github.com/fugue/regula/v3/pkg/swagger/client/environments" + "github.com/fugue/regula/v3/pkg/swagger/client/rule_bundles" + waivers "github.com/fugue/regula/v3/pkg/swagger/client/rule_waivers" + "github.com/fugue/regula/v3/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/version" "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" diff --git a/pkg/fugue/customrules.go b/pkg/fugue/customrules.go index 135d0d8a..26d8398f 100644 --- a/pkg/fugue/customrules.go +++ b/pkg/fugue/customrules.go @@ -19,11 +19,11 @@ import ( "fmt" "strings" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/regotools/doublequote" - "github.com/fugue/regula/v2/pkg/regotools/metadoc" - "github.com/fugue/regula/v2/pkg/swagger/client/custom_rules" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/regotools/doublequote" + "github.com/fugue/regula/v3/pkg/regotools/metadoc" + "github.com/fugue/regula/v3/pkg/swagger/client/custom_rules" + "github.com/fugue/regula/v3/pkg/swagger/models" "github.com/sirupsen/logrus" ) diff --git a/pkg/fugue/upload.go b/pkg/fugue/upload.go index 56ead1db..4991cb8b 100644 --- a/pkg/fugue/upload.go +++ b/pkg/fugue/upload.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "github.com/fugue/regula/v2/pkg/reporter" - "github.com/fugue/regula/v2/pkg/swagger/client/scans" + "github.com/fugue/regula/v3/pkg/reporter" + "github.com/fugue/regula/v3/pkg/swagger/client/scans" "github.com/sirupsen/logrus" ) diff --git a/pkg/loader/base.go b/pkg/loader/base.go index ec636c29..a85ec913 100644 --- a/pkg/loader/base.go +++ b/pkg/loader/base.go @@ -19,12 +19,12 @@ import ( "strings" ) -//go:generate mockgen -destination=../mocks/mock_iacconfiguration.go -package=mocks github.com/fugue/regula/v2/pkg/loader IACConfiguration -//go:generate mockgen -destination=../mocks/mock_configurationdetector.go -package=mocks github.com/fugue/regula/v2/pkg/loader ConfigurationDetector -//go:generate mockgen -destination=../mocks/mock_inputpath.go -package=mocks github.com/fugue/regula/v2/pkg/loader InputPath -//go:generate mockgen -destination=../mocks/mock_inputdirectory.go -package=mocks github.com/fugue/regula/v2/pkg/loader InputDirectory -//go:generate mockgen -destination=../mocks/mock_inputfile.go -package=mocks github.com/fugue/regula/v2/pkg/loader InputFile -//go:generate mockgen -destination=../mocks/mock_loadedconfigurations.go -package=mocks github.com/fugue/regula/v2/pkg/loader LoadedConfigurations +//go:generate mockgen -destination=../mocks/mock_iacconfiguration.go -package=mocks github.com/fugue/regula/v3/pkg/loader IACConfiguration +//go:generate mockgen -destination=../mocks/mock_configurationdetector.go -package=mocks github.com/fugue/regula/v3/pkg/loader ConfigurationDetector +//go:generate mockgen -destination=../mocks/mock_inputpath.go -package=mocks github.com/fugue/regula/v3/pkg/loader InputPath +//go:generate mockgen -destination=../mocks/mock_inputdirectory.go -package=mocks github.com/fugue/regula/v3/pkg/loader InputDirectory +//go:generate mockgen -destination=../mocks/mock_inputfile.go -package=mocks github.com/fugue/regula/v3/pkg/loader InputFile +//go:generate mockgen -destination=../mocks/mock_loadedconfigurations.go -package=mocks github.com/fugue/regula/v3/pkg/loader LoadedConfigurations // stdIn is the path used for stdin. const stdIn = "" diff --git a/pkg/loader/cfn_test.go b/pkg/loader/cfn_test.go index fe448d19..7239d346 100644 --- a/pkg/loader/cfn_test.go +++ b/pkg/loader/cfn_test.go @@ -18,9 +18,9 @@ import ( "encoding/json" "testing" - "github.com/fugue/regula/v2/pkg/loader" - inputs "github.com/fugue/regula/v2/pkg/loader/test_inputs" - "github.com/fugue/regula/v2/pkg/mocks" + "github.com/fugue/regula/v3/pkg/loader" + inputs "github.com/fugue/regula/v3/pkg/loader/test_inputs" + "github.com/fugue/regula/v3/pkg/mocks" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/loader/input.go b/pkg/loader/input.go index fd1546a5..a049dae4 100644 --- a/pkg/loader/input.go +++ b/pkg/loader/input.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/git" + "github.com/fugue/regula/v3/pkg/git" ) type directory struct { diff --git a/pkg/loader/loadpaths.go b/pkg/loader/loadpaths.go index 2c560fe0..5269afa9 100644 --- a/pkg/loader/loadpaths.go +++ b/pkg/loader/loadpaths.go @@ -23,7 +23,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/fugue/regula/v2/pkg/git" + "github.com/fugue/regula/v3/pkg/git" ) type LoadPathsOptions struct { diff --git a/pkg/loader/loadpaths_test.go b/pkg/loader/loadpaths_test.go index 37b4cb5c..0af90655 100644 --- a/pkg/loader/loadpaths_test.go +++ b/pkg/loader/loadpaths_test.go @@ -17,7 +17,7 @@ package loader_test import ( "testing" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" "github.com/stretchr/testify/assert" ) diff --git a/pkg/loader/tf_test.go b/pkg/loader/tf_test.go index e27f5ea7..ba146616 100644 --- a/pkg/loader/tf_test.go +++ b/pkg/loader/tf_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/fugue/regula/v2/pkg/git" + "github.com/fugue/regula/v3/pkg/git" "github.com/stretchr/testify/assert" ) diff --git a/pkg/loader/tfplan_test.go b/pkg/loader/tfplan_test.go index 298c8ade..9c4c7258 100644 --- a/pkg/loader/tfplan_test.go +++ b/pkg/loader/tfplan_test.go @@ -17,9 +17,9 @@ package loader_test import ( "testing" - "github.com/fugue/regula/v2/pkg/loader" - inputs "github.com/fugue/regula/v2/pkg/loader/test_inputs" - "github.com/fugue/regula/v2/pkg/mocks" + "github.com/fugue/regula/v3/pkg/loader" + inputs "github.com/fugue/regula/v3/pkg/loader/test_inputs" + "github.com/fugue/regula/v3/pkg/mocks" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ) diff --git a/pkg/mocks/mock_configurationdetector.go b/pkg/mocks/mock_configurationdetector.go index cb9222de..f4bb545a 100644 --- a/pkg/mocks/mock_configurationdetector.go +++ b/pkg/mocks/mock_configurationdetector.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: ConfigurationDetector) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: ConfigurationDetector) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/mocks/mock_iacconfiguration.go b/pkg/mocks/mock_iacconfiguration.go index 6659a53b..75ec8a77 100644 --- a/pkg/mocks/mock_iacconfiguration.go +++ b/pkg/mocks/mock_iacconfiguration.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: IACConfiguration) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: IACConfiguration) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/mocks/mock_inputdirectory.go b/pkg/mocks/mock_inputdirectory.go index dc5ca360..b83f41dd 100644 --- a/pkg/mocks/mock_inputdirectory.go +++ b/pkg/mocks/mock_inputdirectory.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: InputDirectory) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: InputDirectory) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/mocks/mock_inputfile.go b/pkg/mocks/mock_inputfile.go index ee0c3645..73acdaac 100644 --- a/pkg/mocks/mock_inputfile.go +++ b/pkg/mocks/mock_inputfile.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: InputFile) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: InputFile) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/mocks/mock_inputpath.go b/pkg/mocks/mock_inputpath.go index 4b8c7a94..6ff39519 100644 --- a/pkg/mocks/mock_inputpath.go +++ b/pkg/mocks/mock_inputpath.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: InputPath) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: InputPath) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/mocks/mock_loadedconfigurations.go b/pkg/mocks/mock_loadedconfigurations.go index 4b18601d..e04120c7 100644 --- a/pkg/mocks/mock_loadedconfigurations.go +++ b/pkg/mocks/mock_loadedconfigurations.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/fugue/regula/v2/pkg/loader (interfaces: LoadedConfigurations) +// Source: github.com/fugue/regula/v3/pkg/loader (interfaces: LoadedConfigurations) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - loader "github.com/fugue/regula/v2/pkg/loader" + loader "github.com/fugue/regula/v3/pkg/loader" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/rego/base.go b/pkg/rego/base.go index 34c72a4f..ad8a944d 100644 --- a/pkg/rego/base.go +++ b/pkg/rego/base.go @@ -17,7 +17,7 @@ package rego import ( "context" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" ) diff --git a/pkg/rego/builtin.go b/pkg/rego/builtin.go index f3c99a61..fbf024a3 100644 --- a/pkg/rego/builtin.go +++ b/pkg/rego/builtin.go @@ -18,7 +18,7 @@ import ( "encoding/json" "path/filepath" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/types" diff --git a/pkg/rego/load.go b/pkg/rego/load.go index c5a1831a..99bd3754 100644 --- a/pkg/rego/load.go +++ b/pkg/rego/load.go @@ -25,8 +25,8 @@ import ( "os" "path/filepath" - "github.com/fugue/regula/v2/pkg/loader" - embedded "github.com/fugue/regula/v2/rego" + "github.com/fugue/regula/v3/pkg/loader" + embedded "github.com/fugue/regula/v3/rego" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" "github.com/sirupsen/logrus" diff --git a/pkg/rego/rego_test.go b/pkg/rego/rego_test.go index d4e9b6ec..a912e68d 100644 --- a/pkg/rego/rego_test.go +++ b/pkg/rego/rego_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/storage/inmem" "github.com/open-policy-agent/opa/tester" diff --git a/pkg/rego/runrepl.go b/pkg/rego/runrepl.go index 2c1bc97f..67fb4973 100644 --- a/pkg/rego/runrepl.go +++ b/pkg/rego/runrepl.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "github.com/fugue/regula/v2/pkg/version" + "github.com/fugue/regula/v3/pkg/version" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/repl" "github.com/open-policy-agent/opa/storage" diff --git a/pkg/rego/runrules.go b/pkg/rego/runrules.go index 49c9a183..1de85c97 100644 --- a/pkg/rego/runrules.go +++ b/pkg/rego/runrules.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" "github.com/sirupsen/logrus" diff --git a/pkg/rego/runtime.go b/pkg/rego/runtime.go index 02c1ffb7..b1c02dc2 100644 --- a/pkg/rego/runtime.go +++ b/pkg/rego/runtime.go @@ -18,7 +18,7 @@ import ( "os" "strings" - "github.com/fugue/regula/v2/pkg/version" + "github.com/fugue/regula/v3/pkg/version" "github.com/open-policy-agent/opa/ast" ) diff --git a/pkg/rego/testinput.go b/pkg/rego/testinput.go index b12206d0..ed7c2d22 100644 --- a/pkg/rego/testinput.go +++ b/pkg/rego/testinput.go @@ -24,7 +24,7 @@ import ( "strings" "text/template" - "github.com/fugue/regula/v2/pkg/loader" + "github.com/fugue/regula/v3/pkg/loader" ) //go:embed testinput.tmpl diff --git a/pkg/reporter/base.go b/pkg/reporter/base.go index cf71e23a..5ae1288c 100644 --- a/pkg/reporter/base.go +++ b/pkg/reporter/base.go @@ -21,10 +21,10 @@ import ( "sort" "strings" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/rego" - "github.com/fugue/regula/v2/pkg/version" - embedded "github.com/fugue/regula/v2/rego" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/rego" + "github.com/fugue/regula/v3/pkg/version" + embedded "github.com/fugue/regula/v3/rego" ) type Severity int diff --git a/pkg/reporter/base_test.go b/pkg/reporter/base_test.go index 6154b624..b96fbd41 100644 --- a/pkg/reporter/base_test.go +++ b/pkg/reporter/base_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/mocks" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/mocks" ) func testOutput() RegulaReport { diff --git a/pkg/reporter/sarif.go b/pkg/reporter/sarif.go index bd452fe6..1645a3ac 100644 --- a/pkg/reporter/sarif.go +++ b/pkg/reporter/sarif.go @@ -17,8 +17,8 @@ package reporter import ( "bytes" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/version" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/version" "github.com/owenrumney/go-sarif/v2/sarif" ) diff --git a/pkg/rule_waivers/rule_waivers.go b/pkg/rule_waivers/rule_waivers.go index bad3fe3d..74526f35 100644 --- a/pkg/rule_waivers/rule_waivers.go +++ b/pkg/rule_waivers/rule_waivers.go @@ -17,8 +17,8 @@ package rule_waivers import ( "strings" - "github.com/fugue/regula/v2/pkg/loader" - "github.com/fugue/regula/v2/pkg/reporter" + "github.com/fugue/regula/v3/pkg/loader" + "github.com/fugue/regula/v3/pkg/reporter" ) func ExactMatchOrWildcards(waiverElem string, resourceElem string) bool { diff --git a/pkg/swagger/client/audit_log/list_audit_log_events_responses.go b/pkg/swagger/client/audit_log/list_audit_log_events_responses.go index 3b5b95b4..e6cca071 100644 --- a/pkg/swagger/client/audit_log/list_audit_log_events_responses.go +++ b/pkg/swagger/client/audit_log/list_audit_log_events_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListAuditLogEventsReader is a Reader for the ListAuditLogEvents structure. diff --git a/pkg/swagger/client/custom_rules/create_custom_rule_parameters.go b/pkg/swagger/client/custom_rules/create_custom_rule_parameters.go index ef39e482..12e806f0 100644 --- a/pkg/swagger/client/custom_rules/create_custom_rule_parameters.go +++ b/pkg/swagger/client/custom_rules/create_custom_rule_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateCustomRuleParams creates a new CreateCustomRuleParams object diff --git a/pkg/swagger/client/custom_rules/create_custom_rule_responses.go b/pkg/swagger/client/custom_rules/create_custom_rule_responses.go index ff87633d..a62e6c23 100644 --- a/pkg/swagger/client/custom_rules/create_custom_rule_responses.go +++ b/pkg/swagger/client/custom_rules/create_custom_rule_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateCustomRuleReader is a Reader for the CreateCustomRule structure. diff --git a/pkg/swagger/client/custom_rules/delete_custom_rule_responses.go b/pkg/swagger/client/custom_rules/delete_custom_rule_responses.go index 622ed56a..c0c693e9 100644 --- a/pkg/swagger/client/custom_rules/delete_custom_rule_responses.go +++ b/pkg/swagger/client/custom_rules/delete_custom_rule_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // DeleteCustomRuleReader is a Reader for the DeleteCustomRule structure. diff --git a/pkg/swagger/client/custom_rules/get_custom_rule_responses.go b/pkg/swagger/client/custom_rules/get_custom_rule_responses.go index 4b2cc715..0de5b9eb 100644 --- a/pkg/swagger/client/custom_rules/get_custom_rule_responses.go +++ b/pkg/swagger/client/custom_rules/get_custom_rule_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetCustomRuleReader is a Reader for the GetCustomRule structure. diff --git a/pkg/swagger/client/custom_rules/list_custom_rules_responses.go b/pkg/swagger/client/custom_rules/list_custom_rules_responses.go index bbaf9fd6..b082db87 100644 --- a/pkg/swagger/client/custom_rules/list_custom_rules_responses.go +++ b/pkg/swagger/client/custom_rules/list_custom_rules_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListCustomRulesReader is a Reader for the ListCustomRules structure. diff --git a/pkg/swagger/client/custom_rules/test_custom_rule_input_responses.go b/pkg/swagger/client/custom_rules/test_custom_rule_input_responses.go index afa7db21..01b2b48a 100644 --- a/pkg/swagger/client/custom_rules/test_custom_rule_input_responses.go +++ b/pkg/swagger/client/custom_rules/test_custom_rule_input_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // TestCustomRuleInputReader is a Reader for the TestCustomRuleInput structure. diff --git a/pkg/swagger/client/custom_rules/test_custom_rule_parameters.go b/pkg/swagger/client/custom_rules/test_custom_rule_parameters.go index 56f83cde..d88beff6 100644 --- a/pkg/swagger/client/custom_rules/test_custom_rule_parameters.go +++ b/pkg/swagger/client/custom_rules/test_custom_rule_parameters.go @@ -16,7 +16,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewTestCustomRuleParams creates a new TestCustomRuleParams object diff --git a/pkg/swagger/client/custom_rules/test_custom_rule_responses.go b/pkg/swagger/client/custom_rules/test_custom_rule_responses.go index 7ade393e..1a098975 100644 --- a/pkg/swagger/client/custom_rules/test_custom_rule_responses.go +++ b/pkg/swagger/client/custom_rules/test_custom_rule_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // TestCustomRuleReader is a Reader for the TestCustomRule structure. diff --git a/pkg/swagger/client/custom_rules/update_custom_rule_parameters.go b/pkg/swagger/client/custom_rules/update_custom_rule_parameters.go index 5ebdb9cf..0767af50 100644 --- a/pkg/swagger/client/custom_rules/update_custom_rule_parameters.go +++ b/pkg/swagger/client/custom_rules/update_custom_rule_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewUpdateCustomRuleParams creates a new UpdateCustomRuleParams object diff --git a/pkg/swagger/client/custom_rules/update_custom_rule_responses.go b/pkg/swagger/client/custom_rules/update_custom_rule_responses.go index bbccafda..57760c0b 100644 --- a/pkg/swagger/client/custom_rules/update_custom_rule_responses.go +++ b/pkg/swagger/client/custom_rules/update_custom_rule_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UpdateCustomRuleReader is a Reader for the UpdateCustomRule structure. diff --git a/pkg/swagger/client/environments/create_environment_parameters.go b/pkg/swagger/client/environments/create_environment_parameters.go index 981cdc43..ab1ad531 100644 --- a/pkg/swagger/client/environments/create_environment_parameters.go +++ b/pkg/swagger/client/environments/create_environment_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateEnvironmentParams creates a new CreateEnvironmentParams object diff --git a/pkg/swagger/client/environments/create_environment_responses.go b/pkg/swagger/client/environments/create_environment_responses.go index 1b894b90..1de39dce 100644 --- a/pkg/swagger/client/environments/create_environment_responses.go +++ b/pkg/swagger/client/environments/create_environment_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateEnvironmentReader is a Reader for the CreateEnvironment structure. diff --git a/pkg/swagger/client/environments/delete_environment_responses.go b/pkg/swagger/client/environments/delete_environment_responses.go index 476a3d37..e7ca561d 100644 --- a/pkg/swagger/client/environments/delete_environment_responses.go +++ b/pkg/swagger/client/environments/delete_environment_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // DeleteEnvironmentReader is a Reader for the DeleteEnvironment structure. diff --git a/pkg/swagger/client/environments/get_environment_responses.go b/pkg/swagger/client/environments/get_environment_responses.go index 38969059..67f918b6 100644 --- a/pkg/swagger/client/environments/get_environment_responses.go +++ b/pkg/swagger/client/environments/get_environment_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetEnvironmentReader is a Reader for the GetEnvironment structure. diff --git a/pkg/swagger/client/environments/get_environment_rules_responses.go b/pkg/swagger/client/environments/get_environment_rules_responses.go index 13ce577a..0c00b259 100644 --- a/pkg/swagger/client/environments/get_environment_rules_responses.go +++ b/pkg/swagger/client/environments/get_environment_rules_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetEnvironmentRulesReader is a Reader for the GetEnvironmentRules structure. diff --git a/pkg/swagger/client/environments/list_environments_responses.go b/pkg/swagger/client/environments/list_environments_responses.go index 8a813018..4243eda4 100644 --- a/pkg/swagger/client/environments/list_environments_responses.go +++ b/pkg/swagger/client/environments/list_environments_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListEnvironmentsReader is a Reader for the ListEnvironments structure. diff --git a/pkg/swagger/client/environments/update_environment_parameters.go b/pkg/swagger/client/environments/update_environment_parameters.go index 278ab58a..571285a1 100644 --- a/pkg/swagger/client/environments/update_environment_parameters.go +++ b/pkg/swagger/client/environments/update_environment_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewUpdateEnvironmentParams creates a new UpdateEnvironmentParams object diff --git a/pkg/swagger/client/environments/update_environment_responses.go b/pkg/swagger/client/environments/update_environment_responses.go index a044a632..21815c74 100644 --- a/pkg/swagger/client/environments/update_environment_responses.go +++ b/pkg/swagger/client/environments/update_environment_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UpdateEnvironmentReader is a Reader for the UpdateEnvironment structure. diff --git a/pkg/swagger/client/events/list_events_responses.go b/pkg/swagger/client/events/list_events_responses.go index 1fb76b14..b3882f7f 100644 --- a/pkg/swagger/client/events/list_events_responses.go +++ b/pkg/swagger/client/events/list_events_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListEventsReader is a Reader for the ListEvents structure. diff --git a/pkg/swagger/client/families/create_family_parameters.go b/pkg/swagger/client/families/create_family_parameters.go index a68911ff..95139a68 100644 --- a/pkg/swagger/client/families/create_family_parameters.go +++ b/pkg/swagger/client/families/create_family_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateFamilyParams creates a new CreateFamilyParams object diff --git a/pkg/swagger/client/families/create_family_responses.go b/pkg/swagger/client/families/create_family_responses.go index d6c5ac4c..c2b09bb6 100644 --- a/pkg/swagger/client/families/create_family_responses.go +++ b/pkg/swagger/client/families/create_family_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateFamilyReader is a Reader for the CreateFamily structure. diff --git a/pkg/swagger/client/families/delete_family_responses.go b/pkg/swagger/client/families/delete_family_responses.go index 0bdcbe7d..f9542968 100644 --- a/pkg/swagger/client/families/delete_family_responses.go +++ b/pkg/swagger/client/families/delete_family_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // DeleteFamilyReader is a Reader for the DeleteFamily structure. diff --git a/pkg/swagger/client/families/get_family_responses.go b/pkg/swagger/client/families/get_family_responses.go index 17004bf3..28a26950 100644 --- a/pkg/swagger/client/families/get_family_responses.go +++ b/pkg/swagger/client/families/get_family_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetFamilyReader is a Reader for the GetFamily structure. diff --git a/pkg/swagger/client/families/list_families_responses.go b/pkg/swagger/client/families/list_families_responses.go index a2e80501..64a14e17 100644 --- a/pkg/swagger/client/families/list_families_responses.go +++ b/pkg/swagger/client/families/list_families_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListFamiliesReader is a Reader for the ListFamilies structure. diff --git a/pkg/swagger/client/families/update_family_parameters.go b/pkg/swagger/client/families/update_family_parameters.go index 50868d58..07bc2e85 100644 --- a/pkg/swagger/client/families/update_family_parameters.go +++ b/pkg/swagger/client/families/update_family_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewUpdateFamilyParams creates a new UpdateFamilyParams object diff --git a/pkg/swagger/client/families/update_family_responses.go b/pkg/swagger/client/families/update_family_responses.go index 31a4ac1a..0885813e 100644 --- a/pkg/swagger/client/families/update_family_responses.go +++ b/pkg/swagger/client/families/update_family_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UpdateFamilyReader is a Reader for the UpdateFamily structure. diff --git a/pkg/swagger/client/fugue_client.go b/pkg/swagger/client/fugue_client.go index 8b015b8a..cc33d3a9 100644 --- a/pkg/swagger/client/fugue_client.go +++ b/pkg/swagger/client/fugue_client.go @@ -10,19 +10,19 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/client/audit_log" - "github.com/fugue/regula/v2/pkg/swagger/client/custom_rules" - "github.com/fugue/regula/v2/pkg/swagger/client/environments" - "github.com/fugue/regula/v2/pkg/swagger/client/events" - "github.com/fugue/regula/v2/pkg/swagger/client/families" - "github.com/fugue/regula/v2/pkg/swagger/client/groups" - "github.com/fugue/regula/v2/pkg/swagger/client/invites" - "github.com/fugue/regula/v2/pkg/swagger/client/metadata" - "github.com/fugue/regula/v2/pkg/swagger/client/notifications" - "github.com/fugue/regula/v2/pkg/swagger/client/rule_bundles" - "github.com/fugue/regula/v2/pkg/swagger/client/rule_waivers" - "github.com/fugue/regula/v2/pkg/swagger/client/scans" - "github.com/fugue/regula/v2/pkg/swagger/client/users" + "github.com/fugue/regula/v3/pkg/swagger/client/audit_log" + "github.com/fugue/regula/v3/pkg/swagger/client/custom_rules" + "github.com/fugue/regula/v3/pkg/swagger/client/environments" + "github.com/fugue/regula/v3/pkg/swagger/client/events" + "github.com/fugue/regula/v3/pkg/swagger/client/families" + "github.com/fugue/regula/v3/pkg/swagger/client/groups" + "github.com/fugue/regula/v3/pkg/swagger/client/invites" + "github.com/fugue/regula/v3/pkg/swagger/client/metadata" + "github.com/fugue/regula/v3/pkg/swagger/client/notifications" + "github.com/fugue/regula/v3/pkg/swagger/client/rule_bundles" + "github.com/fugue/regula/v3/pkg/swagger/client/rule_waivers" + "github.com/fugue/regula/v3/pkg/swagger/client/scans" + "github.com/fugue/regula/v3/pkg/swagger/client/users" ) // Default fugue HTTP client. diff --git a/pkg/swagger/client/groups/create_group_parameters.go b/pkg/swagger/client/groups/create_group_parameters.go index 714e105e..728ad026 100644 --- a/pkg/swagger/client/groups/create_group_parameters.go +++ b/pkg/swagger/client/groups/create_group_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateGroupParams creates a new CreateGroupParams object diff --git a/pkg/swagger/client/groups/create_group_responses.go b/pkg/swagger/client/groups/create_group_responses.go index e259d3b2..998eda5a 100644 --- a/pkg/swagger/client/groups/create_group_responses.go +++ b/pkg/swagger/client/groups/create_group_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateGroupReader is a Reader for the CreateGroup structure. diff --git a/pkg/swagger/client/groups/edit_users_group_assignments_parameters.go b/pkg/swagger/client/groups/edit_users_group_assignments_parameters.go index c8dacae6..e1378c39 100644 --- a/pkg/swagger/client/groups/edit_users_group_assignments_parameters.go +++ b/pkg/swagger/client/groups/edit_users_group_assignments_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewEditUsersGroupAssignmentsParams creates a new EditUsersGroupAssignmentsParams object diff --git a/pkg/swagger/client/groups/edit_users_group_assignments_responses.go b/pkg/swagger/client/groups/edit_users_group_assignments_responses.go index eacb40f7..ed37d9e5 100644 --- a/pkg/swagger/client/groups/edit_users_group_assignments_responses.go +++ b/pkg/swagger/client/groups/edit_users_group_assignments_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // EditUsersGroupAssignmentsReader is a Reader for the EditUsersGroupAssignments structure. diff --git a/pkg/swagger/client/groups/list_groups_responses.go b/pkg/swagger/client/groups/list_groups_responses.go index d89878d4..916c6d1b 100644 --- a/pkg/swagger/client/groups/list_groups_responses.go +++ b/pkg/swagger/client/groups/list_groups_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListGroupsReader is a Reader for the ListGroups structure. diff --git a/pkg/swagger/client/invites/create_invite_parameters.go b/pkg/swagger/client/invites/create_invite_parameters.go index f69421fc..4515d076 100644 --- a/pkg/swagger/client/invites/create_invite_parameters.go +++ b/pkg/swagger/client/invites/create_invite_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateInviteParams creates a new CreateInviteParams object diff --git a/pkg/swagger/client/invites/create_invite_responses.go b/pkg/swagger/client/invites/create_invite_responses.go index 90c5d8e6..cee217aa 100644 --- a/pkg/swagger/client/invites/create_invite_responses.go +++ b/pkg/swagger/client/invites/create_invite_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateInviteReader is a Reader for the CreateInvite structure. diff --git a/pkg/swagger/client/invites/get_invite_by_id_responses.go b/pkg/swagger/client/invites/get_invite_by_id_responses.go index b4a1cfea..4557cc58 100644 --- a/pkg/swagger/client/invites/get_invite_by_id_responses.go +++ b/pkg/swagger/client/invites/get_invite_by_id_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetInviteByIDReader is a Reader for the GetInviteByID structure. diff --git a/pkg/swagger/client/invites/list_invites_responses.go b/pkg/swagger/client/invites/list_invites_responses.go index 4e5ae47a..60471851 100644 --- a/pkg/swagger/client/invites/list_invites_responses.go +++ b/pkg/swagger/client/invites/list_invites_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListInvitesReader is a Reader for the ListInvites structure. diff --git a/pkg/swagger/client/metadata/create_policy_parameters.go b/pkg/swagger/client/metadata/create_policy_parameters.go index a30b2bb3..25213013 100644 --- a/pkg/swagger/client/metadata/create_policy_parameters.go +++ b/pkg/swagger/client/metadata/create_policy_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreatePolicyParams creates a new CreatePolicyParams object diff --git a/pkg/swagger/client/metadata/create_policy_responses.go b/pkg/swagger/client/metadata/create_policy_responses.go index aea60730..ff072c3b 100644 --- a/pkg/swagger/client/metadata/create_policy_responses.go +++ b/pkg/swagger/client/metadata/create_policy_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreatePolicyReader is a Reader for the CreatePolicy structure. diff --git a/pkg/swagger/client/metadata/get_resource_types_responses.go b/pkg/swagger/client/metadata/get_resource_types_responses.go index 56dc946c..18faa271 100644 --- a/pkg/swagger/client/metadata/get_resource_types_responses.go +++ b/pkg/swagger/client/metadata/get_resource_types_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetResourceTypesReader is a Reader for the GetResourceTypes structure. diff --git a/pkg/swagger/client/metadata/get_swagger_responses.go b/pkg/swagger/client/metadata/get_swagger_responses.go index 49dc6fef..934149bd 100644 --- a/pkg/swagger/client/metadata/get_swagger_responses.go +++ b/pkg/swagger/client/metadata/get_swagger_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetSwaggerReader is a Reader for the GetSwagger structure. diff --git a/pkg/swagger/client/notifications/create_notification_parameters.go b/pkg/swagger/client/notifications/create_notification_parameters.go index b09116f1..e7ec938d 100644 --- a/pkg/swagger/client/notifications/create_notification_parameters.go +++ b/pkg/swagger/client/notifications/create_notification_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateNotificationParams creates a new CreateNotificationParams object diff --git a/pkg/swagger/client/notifications/create_notification_responses.go b/pkg/swagger/client/notifications/create_notification_responses.go index 1e232244..5bd7d179 100644 --- a/pkg/swagger/client/notifications/create_notification_responses.go +++ b/pkg/swagger/client/notifications/create_notification_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateNotificationReader is a Reader for the CreateNotification structure. diff --git a/pkg/swagger/client/notifications/delete_notification_responses.go b/pkg/swagger/client/notifications/delete_notification_responses.go index f0ca1a81..292b2135 100644 --- a/pkg/swagger/client/notifications/delete_notification_responses.go +++ b/pkg/swagger/client/notifications/delete_notification_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // DeleteNotificationReader is a Reader for the DeleteNotification structure. diff --git a/pkg/swagger/client/notifications/list_notifications_responses.go b/pkg/swagger/client/notifications/list_notifications_responses.go index 0da14be6..e1f6eca7 100644 --- a/pkg/swagger/client/notifications/list_notifications_responses.go +++ b/pkg/swagger/client/notifications/list_notifications_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListNotificationsReader is a Reader for the ListNotifications structure. diff --git a/pkg/swagger/client/notifications/update_notification_parameters.go b/pkg/swagger/client/notifications/update_notification_parameters.go index 937bb1f8..bced134f 100644 --- a/pkg/swagger/client/notifications/update_notification_parameters.go +++ b/pkg/swagger/client/notifications/update_notification_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewUpdateNotificationParams creates a new UpdateNotificationParams object diff --git a/pkg/swagger/client/notifications/update_notification_responses.go b/pkg/swagger/client/notifications/update_notification_responses.go index 4cbfc75e..cef48a40 100644 --- a/pkg/swagger/client/notifications/update_notification_responses.go +++ b/pkg/swagger/client/notifications/update_notification_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UpdateNotificationReader is a Reader for the UpdateNotification structure. diff --git a/pkg/swagger/client/rule_bundles/get_latest_rule_bundle_responses.go b/pkg/swagger/client/rule_bundles/get_latest_rule_bundle_responses.go index 4f99c9fa..a257ed30 100644 --- a/pkg/swagger/client/rule_bundles/get_latest_rule_bundle_responses.go +++ b/pkg/swagger/client/rule_bundles/get_latest_rule_bundle_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetLatestRuleBundleReader is a Reader for the GetLatestRuleBundle structure. diff --git a/pkg/swagger/client/rule_waivers/create_rule_waiver_parameters.go b/pkg/swagger/client/rule_waivers/create_rule_waiver_parameters.go index a3ec6f5b..a53b3ee8 100644 --- a/pkg/swagger/client/rule_waivers/create_rule_waiver_parameters.go +++ b/pkg/swagger/client/rule_waivers/create_rule_waiver_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewCreateRuleWaiverParams creates a new CreateRuleWaiverParams object diff --git a/pkg/swagger/client/rule_waivers/create_rule_waiver_responses.go b/pkg/swagger/client/rule_waivers/create_rule_waiver_responses.go index d7d6a1e5..6790c1a4 100644 --- a/pkg/swagger/client/rule_waivers/create_rule_waiver_responses.go +++ b/pkg/swagger/client/rule_waivers/create_rule_waiver_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateRuleWaiverReader is a Reader for the CreateRuleWaiver structure. diff --git a/pkg/swagger/client/rule_waivers/delete_rule_waiver_responses.go b/pkg/swagger/client/rule_waivers/delete_rule_waiver_responses.go index bd6e7581..2ecccac3 100644 --- a/pkg/swagger/client/rule_waivers/delete_rule_waiver_responses.go +++ b/pkg/swagger/client/rule_waivers/delete_rule_waiver_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // DeleteRuleWaiverReader is a Reader for the DeleteRuleWaiver structure. diff --git a/pkg/swagger/client/rule_waivers/get_rule_waiver_responses.go b/pkg/swagger/client/rule_waivers/get_rule_waiver_responses.go index 3e55e6bc..fc4210a9 100644 --- a/pkg/swagger/client/rule_waivers/get_rule_waiver_responses.go +++ b/pkg/swagger/client/rule_waivers/get_rule_waiver_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetRuleWaiverReader is a Reader for the GetRuleWaiver structure. diff --git a/pkg/swagger/client/rule_waivers/list_rule_waivers_responses.go b/pkg/swagger/client/rule_waivers/list_rule_waivers_responses.go index f4e22982..9f42d8b6 100644 --- a/pkg/swagger/client/rule_waivers/list_rule_waivers_responses.go +++ b/pkg/swagger/client/rule_waivers/list_rule_waivers_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListRuleWaiversReader is a Reader for the ListRuleWaivers structure. diff --git a/pkg/swagger/client/rule_waivers/update_rule_waiver_parameters.go b/pkg/swagger/client/rule_waivers/update_rule_waiver_parameters.go index 8733bdba..3d02dc66 100644 --- a/pkg/swagger/client/rule_waivers/update_rule_waiver_parameters.go +++ b/pkg/swagger/client/rule_waivers/update_rule_waiver_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // NewUpdateRuleWaiverParams creates a new UpdateRuleWaiverParams object diff --git a/pkg/swagger/client/rule_waivers/update_rule_waiver_responses.go b/pkg/swagger/client/rule_waivers/update_rule_waiver_responses.go index 5752ce87..37400e45 100644 --- a/pkg/swagger/client/rule_waivers/update_rule_waiver_responses.go +++ b/pkg/swagger/client/rule_waivers/update_rule_waiver_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UpdateRuleWaiverReader is a Reader for the UpdateRuleWaiver structure. diff --git a/pkg/swagger/client/scans/create_scan_responses.go b/pkg/swagger/client/scans/create_scan_responses.go index 10f55453..d2215610 100644 --- a/pkg/swagger/client/scans/create_scan_responses.go +++ b/pkg/swagger/client/scans/create_scan_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // CreateScanReader is a Reader for the CreateScan structure. diff --git a/pkg/swagger/client/scans/get_compliance_by_resource_types_responses.go b/pkg/swagger/client/scans/get_compliance_by_resource_types_responses.go index 4b133dd6..0c42eb3c 100644 --- a/pkg/swagger/client/scans/get_compliance_by_resource_types_responses.go +++ b/pkg/swagger/client/scans/get_compliance_by_resource_types_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetComplianceByResourceTypesReader is a Reader for the GetComplianceByResourceTypes structure. diff --git a/pkg/swagger/client/scans/get_compliance_by_rules_responses.go b/pkg/swagger/client/scans/get_compliance_by_rules_responses.go index 9cfcb4e6..6880fd12 100644 --- a/pkg/swagger/client/scans/get_compliance_by_rules_responses.go +++ b/pkg/swagger/client/scans/get_compliance_by_rules_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetComplianceByRulesReader is a Reader for the GetComplianceByRules structure. diff --git a/pkg/swagger/client/scans/get_scan_responses.go b/pkg/swagger/client/scans/get_scan_responses.go index 730cee41..62d9b717 100644 --- a/pkg/swagger/client/scans/get_scan_responses.go +++ b/pkg/swagger/client/scans/get_scan_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetScanReader is a Reader for the GetScan structure. diff --git a/pkg/swagger/client/scans/list_scans_responses.go b/pkg/swagger/client/scans/list_scans_responses.go index 8d690eba..de2a4c13 100644 --- a/pkg/swagger/client/scans/list_scans_responses.go +++ b/pkg/swagger/client/scans/list_scans_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListScansReader is a Reader for the ListScans structure. diff --git a/pkg/swagger/client/scans/upload_regula_scan_view_responses.go b/pkg/swagger/client/scans/upload_regula_scan_view_responses.go index 52b44d03..b16efcf4 100644 --- a/pkg/swagger/client/scans/upload_regula_scan_view_responses.go +++ b/pkg/swagger/client/scans/upload_regula_scan_view_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // UploadRegulaScanViewReader is a Reader for the UploadRegulaScanView structure. diff --git a/pkg/swagger/client/users/get_user_by_id_responses.go b/pkg/swagger/client/users/get_user_by_id_responses.go index 519814b4..3a6bb8d2 100644 --- a/pkg/swagger/client/users/get_user_by_id_responses.go +++ b/pkg/swagger/client/users/get_user_by_id_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // GetUserByIDReader is a Reader for the GetUserByID structure. diff --git a/pkg/swagger/client/users/list_users_responses.go b/pkg/swagger/client/users/list_users_responses.go index 117e5736..66d24e41 100644 --- a/pkg/swagger/client/users/list_users_responses.go +++ b/pkg/swagger/client/users/list_users_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/fugue/regula/v2/pkg/swagger/models" + "github.com/fugue/regula/v3/pkg/swagger/models" ) // ListUsersReader is a Reader for the ListUsers structure.