Skip to content

Commit e498cf9

Browse files
authored
Promote OPA 1.0 (#136)
See https://www.openpolicyagent.org/docs/latest/v0-upgrade/ To promote OPA 1.0, switch the import path to v1, which will result in a parse error for all v0 Rego syntax.
1 parent 262ab8a commit e498cf9

File tree

17 files changed

+26
-333
lines changed

17 files changed

+26
-333
lines changed

integration/integration_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,6 @@ func TestIntegration(t *testing.T) {
236236
dir: "removed",
237237
test: true,
238238
},
239-
{
240-
name: "legacy Rego syntax",
241-
command: exec.Command("tflint", "--format", "json", "--force"),
242-
dir: "legacy_rego_syntax",
243-
},
244-
{
245-
name: "legacy Rego syntax (test)",
246-
command: exec.Command("tflint", "--format", "json", "--force"),
247-
dir: "legacy_rego_syntax",
248-
test: true,
249-
},
250239
{
251240
name: "ephemerals",
252241
command: exec.Command("tflint", "--format", "json", "--force"),

integration/legacy_rego_syntax/.tflint.hcl

Lines changed: 0 additions & 9 deletions
This file was deleted.

integration/legacy_rego_syntax/main.tf

Lines changed: 0 additions & 27 deletions
This file was deleted.

integration/legacy_rego_syntax/policies/main.rego

Lines changed: 0 additions & 28 deletions
This file was deleted.

integration/legacy_rego_syntax/policies/main_test.rego

Lines changed: 0 additions & 62 deletions
This file was deleted.

integration/legacy_rego_syntax/result.json

Lines changed: 0 additions & 105 deletions
This file was deleted.

integration/legacy_rego_syntax/result_test.json

Lines changed: 0 additions & 65 deletions
This file was deleted.

opa/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hashicorp/hcl/v2"
99
"github.com/hashicorp/hcl/v2/ext/typeexpr"
1010
"github.com/hashicorp/hcl/v2/hclsyntax"
11-
"github.com/open-policy-agent/opa/types"
11+
"github.com/open-policy-agent/opa/v1/types"
1212
"github.com/terraform-linters/tflint-plugin-sdk/hclext"
1313
"github.com/terraform-linters/tflint-plugin-sdk/terraform/lang/marks"
1414
"github.com/terraform-linters/tflint-plugin-sdk/tflint"

opa/engine.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99

1010
"github.com/hashicorp/go-hclog"
1111
"github.com/hashicorp/hcl/v2"
12-
"github.com/open-policy-agent/opa/ast"
13-
"github.com/open-policy-agent/opa/loader"
14-
"github.com/open-policy-agent/opa/rego"
15-
"github.com/open-policy-agent/opa/storage"
16-
"github.com/open-policy-agent/opa/tester"
17-
"github.com/open-policy-agent/opa/topdown"
18-
"github.com/open-policy-agent/opa/topdown/print"
19-
"github.com/open-policy-agent/opa/version"
12+
"github.com/open-policy-agent/opa/v1/ast"
13+
"github.com/open-policy-agent/opa/v1/loader"
14+
"github.com/open-policy-agent/opa/v1/rego"
15+
"github.com/open-policy-agent/opa/v1/storage"
16+
"github.com/open-policy-agent/opa/v1/tester"
17+
"github.com/open-policy-agent/opa/v1/topdown"
18+
"github.com/open-policy-agent/opa/v1/topdown/print"
19+
"github.com/open-policy-agent/opa/v1/version"
2020
"github.com/terraform-linters/tflint-plugin-sdk/logger"
2121
"github.com/terraform-linters/tflint-plugin-sdk/tflint"
2222
)

opa/engine_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/hashicorp/hcl/v2"
1010
"github.com/liamg/memoryfs"
11-
"github.com/open-policy-agent/opa/loader"
12-
"github.com/open-policy-agent/opa/version"
11+
"github.com/open-policy-agent/opa/v1/loader"
12+
"github.com/open-policy-agent/opa/v1/version"
1313
)
1414

1515
func TestRunQuery(t *testing.T) {

0 commit comments

Comments
 (0)