Release libterraform 0.14.0

Author: Prodesire

docs/en/index.md

@@ -26,6 +26,7 @@ parsing Terraform configuration directories.
 
 | libterraform | Terraform |
 |---|---|
+| [0.14.0](https://pypi.org/project/libterraform/0.14.0/) | [1.14.9](https://github.com/hashicorp/terraform/tree/v1.14.9) |
 | [0.13.0](https://pypi.org/project/libterraform/0.13.0/) | [1.13.5](https://github.com/hashicorp/terraform/tree/v1.13.5) |
 | [0.12.0](https://pypi.org/project/libterraform/0.12.0/) | [1.12.2](https://github.com/hashicorp/terraform/tree/v1.12.2) |
 | [0.11.0](https://pypi.org/project/libterraform/0.11.0/) | [1.11.4](https://github.com/hashicorp/terraform/tree/v1.11.4) |

docs/en/release-policy.md

@@ -6,9 +6,9 @@ libterraform minor versions track Terraform minor versions:
 
 | libterraform line | Terraform line | Branch |
 |---|---|---|
+| `0.14.x` | `1.14.x` | `release/0.14` |
 | `0.13.x` | `1.13.x` | `release/0.13` |
 | `0.12.x` | `1.12.x` | `release/0.12` |
-| `0.11.x` | `1.11.x` | `release/0.11` |
 
 The exact version mapping is stored in `release-matrix.json`. The matrix is the source of truth; README tables and release notes are summaries.
 

docs/zh/api/terraform-command.md

@@ -152,6 +152,7 @@ Terraform 运行所需的全部本地数据（这些数据通常不提交到版
 | `lockfile` | `str` | 设置 dependency lockfile 模式，目前 Terraform 仅支持 `readonly`。 | `None` |
 | `ignore_remote_version` | `bool` | 仅用于 HCP Terraform 和 remote backend 的少见选项。设置后将忽略本地和远端 Terraform 版本兼容性检查，允许在可能存在 state 表示不匹配时继续操作。 | `None` |
 | `test_directory` | `str` | Terraform test 目录，默认为 `"tests"`。 | `None` |
+| `enable_pluggable_state_storage_experiment` | `bool` | 启用 Terraform 的实验性 pluggable state storage 初始化路径。 | `None` |
 | `**options` | | 额外命令选项。 | |
 
 ::: libterraform.cli.TerraformCommand.validate
@@ -194,6 +195,7 @@ Terraform 运行所需的全部本地数据（这些数据通常不提交到版
 | `no_color` | `bool` | 是否禁用颜色输出。 | `True` |
 | `no_test` | `bool` | 设置后 Terraform 将不校验测试文件。 | `None` |
 | `test_directory` | `str` | 设置 Terraform 测试目录，默认为 `"tests"`。 | `None` |
+| `query` | `bool` | 设置后 Terraform 还会校验 `.tfquery.hcl` 文件。 | `None` |
 | `**options` | | 额外命令选项。 | |
 
 ::: libterraform.cli.TerraformCommand.plan
@@ -255,9 +257,8 @@ Terraform 运行所需的全部本地数据（这些数据通常不提交到版
 
 参考 <https://developer.hashicorp.com/terraform/cli/commands/query>
 
-执行实验性的 Terraform query 命令，根据 `.tfquery.hcl` 文件查询远端基础设施中
-匹配的资源。Terraform 1.13 起提供该命令，但只有启用 Terraform experimental
-features 时才会注册到 CLI。
+执行 Terraform query 命令，根据 `.tfquery.hcl` 文件查询远端基础设施中
+匹配的资源。Terraform 1.13 起实验性提供该命令；Terraform 1.14 起默认注册该命令。
 
 默认以 JSON 格式输出，并按 JSON 行流解析为 Python 列表。传入 `json=False`
 可获取原始文本。
@@ -1186,6 +1187,7 @@ Terraform 会在当前配置和测试目录中搜索 `.tftest.hcl` 文件，然
 | `test_directory` | `str` | 设置 Terraform 测试目录，默认为 `"tests"`。 | `None` |
 | `run_parallelism` | `int` | 限制同一测试文件内可并行执行的 run block 数量，默认 10。 | `None` |
 | `verbose` | `bool` | 在每个测试运行块执行时打印 plan 或 state。 | `None` |
+| `allow_deferral` | `bool` | 允许测试操作使用 deferral。Terraform 仅在实验性构建中接受该选项。 | `None` |
 | `**options` | | 额外命令选项。 | |
 
 ::: libterraform.cli.TerraformCommand.workspace

docs/zh/index.md

@@ -25,6 +25,7 @@
 
 | libterraform | Terraform |
 |---|---|
+| [0.14.0](https://pypi.org/project/libterraform/0.14.0/) | [1.14.9](https://github.com/hashicorp/terraform/tree/v1.14.9) |
 | [0.13.0](https://pypi.org/project/libterraform/0.13.0/) | [1.13.5](https://github.com/hashicorp/terraform/tree/v1.13.5) |
 | [0.12.0](https://pypi.org/project/libterraform/0.12.0/) | [1.12.2](https://github.com/hashicorp/terraform/tree/v1.12.2) |
 | [0.11.0](https://pypi.org/project/libterraform/0.11.0/) | [1.11.4](https://github.com/hashicorp/terraform/tree/v1.11.4) |

docs/zh/release-policy.md

@@ -6,9 +6,9 @@ libterraform 的 minor 版本跟随 Terraform 的 minor 版本：
 
 | libterraform 版本线 | Terraform 版本线 | 分支 |
 |---|---|---|
+| `0.14.x` | `1.14.x` | `release/0.14` |
 | `0.13.x` | `1.13.x` | `release/0.13` |
 | `0.12.x` | `1.12.x` | `release/0.12` |
-| `0.11.x` | `1.11.x` | `release/0.11` |
 
 准确的版本映射存放在 `release-matrix.json`。该矩阵是事实来源；README
 表格和 release notes 只是摘要。

native/go/libterraform.go

@@ -736,6 +736,12 @@ func NewCommands(meta command.Meta) map[string]cli.CommandFactory {
 			}, nil
 		},
 
+		"query": func() (cli.Command, error) {
+			return &command.QueryCommand{
+				Meta: meta,
+			}, nil
+		},
+
 		"refresh": func() (cli.Command, error) {
 			return &command.RefreshCommand{
 				Meta: meta,
@@ -901,8 +907,8 @@ func NewCommands(meta command.Meta) map[string]cli.CommandFactory {
 	}
 
 	if meta.AllowExperimentalFeatures {
-		commands["query"] = func() (cli.Command, error) {
-			return &command.QueryCommand{
+		commands["test cleanup"] = func() (cli.Command, error) {
+			return &command.TestCleanupCommand{
 				Meta: meta,
 			}, nil
 		}

release-matrix.json

@@ -55,7 +55,7 @@
       "go_plugin_version": "1.6.3",
       "branch": "release/0.12",
       "status": "released",
-      "maintenance": "active"
+      "maintenance": "passive"
     },
     {
       "libterraform_minor": "0.13",
@@ -74,8 +74,8 @@
       "terraform_version": "1.14.9",
       "go_plugin_version": "1.7.0",
       "branch": "release/0.14",
-      "status": "planned",
-      "maintenance": "planned"
+      "status": "released",
+      "maintenance": "active"
     },
     {
       "libterraform_minor": "0.15",

src/libterraform/__init__.py

@@ -3,7 +3,7 @@
 
 from libterraform.common import WINDOWS
 
-__version__ = "0.13.0"
+__version__ = "0.14.0"
 
 root = os.path.dirname(os.path.abspath(__file__))
 _lib_filename = "libterraform.dll" if WINDOWS else "libterraform.so"

src/libterraform/cli.py

@@ -231,6 +231,7 @@ def init(
         lockfile: str = None,
         ignore_remote_version: bool = None,
         test_directory: str = None,
+        enable_pluggable_state_storage_experiment: bool = None,
         **options,
     ) -> CommandResult:
         """Refer to https://developer.hashicorp.com/terraform/cli/commands/init
@@ -289,6 +290,8 @@ def init(
             See the documentation on configuring Terraform with
             HCP Terraform or Terraform Enterprise for more information.
         :param test_directory: Set the Terraform test directory, defaults to "tests".
+        :param enable_pluggable_state_storage_experiment: Enable Terraform's
+            experimental pluggable state storage initialization path.
         :param options: More command options.
         """
         options.update(
@@ -308,6 +311,9 @@ def init(
             lockfile=lockfile,
             ignore_remote_version=flag(ignore_remote_version),
             test_directory=test_directory,
+            enable_pluggable_state_storage_experiment=flag(
+                enable_pluggable_state_storage_experiment
+            ),
         )
         retcode, stdout, stderr = self.run(
             "init", options=options, chdir=self.cwd, check=check
@@ -321,6 +327,7 @@ def validate(
         no_color: bool = True,
         no_test: bool = None,
         test_directory: str = None,
+        query: bool = None,
         **options,
     ) -> CommandResult:
         """Refer to https://developer.hashicorp.com/terraform/cli/commands/validate
@@ -354,12 +361,14 @@ def validate(
         :param no_color: True to output not contain any color.
         :param no_test: If specified, Terraform will not validate test files.
         :param test_directory: Set the Terraform test directory, defaults to "tests".
+        :param query: If specified, Terraform will also validate .tfquery.hcl files.
         :param options: More command options.
         """
         options.update(
             no_color=flag(no_color),
             no_test=flag(no_test),
             test_directory=test_directory,
+            query=flag(query),
         )
         retcode, stdout, stderr = self.run(
             "validate", options=options, chdir=self.cwd, check=check, json=json
@@ -1792,6 +1801,7 @@ def test(
         test_directory: str = None,
         run_parallelism: int = None,
         verbose: bool = None,
+        allow_deferral: bool = None,
         **options,
     ):
         """Refer to https://developer.hashicorp.com/terraform/cli/commands/test
@@ -1829,6 +1839,8 @@ def test(
             in parallel within a file. Defaults to 10.
         :param verbose: Print the plan or state for each test run block as it
             executes.
+        :param allow_deferral: Allow deferred actions during test operations.
+            Terraform accepts this flag only in experimental builds.
         :param options: More command options.
         """
         options.update(
@@ -1841,6 +1853,7 @@ def test(
             test_directory=test_directory,
             run_parallelism=run_parallelism,
             verbose=flag(verbose),
+            allow_deferral=flag(allow_deferral),
         )
         retcode, stdout, stderr = self.run(
             "test", options=options, chdir=self.cwd, check=check, json=json

tests/cli/test_init.py

@@ -1,8 +1,39 @@
+import inspect
+
 from libterraform import TerraformCommand
 from tests.consts import TF_SLEEP_DIR
 
 
 class TestTerraformCommandInit:
+    def test_init_declares_pluggable_state_storage_experiment_option(self):
+        params = inspect.signature(TerraformCommand.init).parameters
+
+        assert "enable_pluggable_state_storage_experiment" in params
+
+    def test_init_accepts_pluggable_state_storage_experiment_option(self, monkeypatch):
+        call = {}
+
+        def fake_run(cmd, args=None, options=None, chdir=None, check=False, json=False):
+            call.update(
+                cmd=cmd,
+                args=args,
+                options=options,
+                chdir=chdir,
+                check=check,
+                json=json,
+            )
+            return 0, "", ""
+
+        monkeypatch.setattr(TerraformCommand, "run", staticmethod(fake_run))
+
+        cli = TerraformCommand("/work")
+        r = cli.init(enable_pluggable_state_storage_experiment=True)
+
+        assert r.retcode == 0
+        assert call["cmd"] == "init"
+        assert call["options"]["enable_pluggable_state_storage_experiment"] is ...
+        assert call["chdir"] == "/work"
+
     def test_init(self):
         r = TerraformCommand(TF_SLEEP_DIR).init()
         assert r.retcode == 0, r.error