diff --git a/gotfparse/go.mod b/gotfparse/go.mod index 997a19b..282a7ec 100644 --- a/gotfparse/go.mod +++ b/gotfparse/go.mod @@ -74,4 +74,4 @@ require ( google.golang.org/protobuf v1.33.0 // indirect ) -replace github.com/aquasecurity/trivy v0.50.1 => github.com/cloud-custodian/trivy v0.0.0-20240422223801-45654bcc9a75 +replace github.com/aquasecurity/trivy v0.50.1 => github.com/cloud-custodian/trivy v0.0.0-20240422230231-5a1ce5660434 diff --git a/gotfparse/go.sum b/gotfparse/go.sum index f494e9a..ee4368d 100644 --- a/gotfparse/go.sum +++ b/gotfparse/go.sum @@ -229,8 +229,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloud-custodian/trivy v0.0.0-20240422223801-45654bcc9a75 h1:kjrrSfK3HnR80hDdznjsDgCnYSWES+UvfHBXxIRcRwg= -github.com/cloud-custodian/trivy v0.0.0-20240422223801-45654bcc9a75/go.mod h1:J1fAS5qlA63Amg4RP5fF8QsF67xvZC5RPZORsibbQQs= +github.com/cloud-custodian/trivy v0.0.0-20240422230231-5a1ce5660434 h1:GAOoFQZkBt8ACgQnSvruLewSUiapESwFpPgrSoLr95E= +github.com/cloud-custodian/trivy v0.0.0-20240422230231-5a1ce5660434/go.mod h1:J1fAS5qlA63Amg4RP5fF8QsF67xvZC5RPZORsibbQQs= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/tests/test_tfparse.py b/tests/test_tfparse.py index 5f8ebe8..ea3c750 100644 --- a/tests/test_tfparse.py +++ b/tests/test_tfparse.py @@ -499,14 +499,12 @@ def test_funcs(tmp_path): "check_toset_int": [1, 2, 3], "check_toset_str": ["a", "b", "c"], "check_trimprefix": "/def", - "lambdas_list": ANY, + "lambdas_list": ["abc", "xyz"], "modules_list": ["x", "y", "z"], } if platform.system() == "Windows": assert actual["check_file"] == "test\r\n\r\n" - # fileset outside root doesn't currently work on windows - return - - assert actual["check_file"] == "test\n\n" - assert len(actual["check_fileset_abs_path"]) > 0 - assert actual["lambdas_list"] == ["abc", "xyz"] + # don't know where to guarantee files will exist on windows + else: + assert actual["check_file"] == "test\n\n" + assert len(actual["check_fileset_abs_path"]) > 0