feat: [google-cloud-config] Infrastructure manager supports 1.2.3, 1.3.10, 1.4.7, 1.5.7 versions of Terraform when creating a preview of a deployment (#12624)

BEGIN_COMMIT_OVERRIDE feat: Infrastructure manager supports 1.2.3, 1.3.10, 1.4.7, 1.5.7 versions of Terraform when creating a preview of a deployment feat: Annotations are now supported to help client tools identify deployments during automation END_COMMIT_OVERRIDE - [ ] Regenerate this pull request now. feat: Annotations are now supported to help client tools identify deployments during automation PiperOrigin-RevId: 627386467 Source-Link: googleapis/googleapis@64be76a Source-Link: googleapis/googleapis-gen@0491a38 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbmZpZy8uT3dsQm90LnlhbWwiLCJoIjoiMDQ5MWEzOGU3MjdmYmY0ODA4NzUyZjJhM2YxMDIzMjU0ODg2MzVjZSJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: ohmayr <omairnaveed@ymail.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-config/google/cloud/config_v1/types/config.py

@@ -219,6 +219,12 @@ class Deployment(proto.Message):
  resources in terraform configuration files.
  There are limited resources on which quota
  validation applies.
+ annotations (MutableMapping[str, str]):
+ Optional. Arbitrary key-value metadata
+ storage e.g. to help client tools identify
+ deployments during automation. See
+ https://google.aip.dev/148#annotations for
+ details on format and size limitations.
  """
 
  class State(proto.Enum):
@@ -419,6 +425,11 @@ class LockState(proto.Enum):
  number=23,
  enum="QuotaValidation",
  )
+ annotations: MutableMapping[str, str] = proto.MapField(
+ proto.STRING,
+ proto.STRING,
+ number=24,
+ )
 
 
 class TerraformBlueprint(proto.Message):
@@ -2013,6 +2024,15 @@ class Preview(proto.Message):
  logs (str):
  Output only. Location of preview logs in
  ``gs://{bucket}/{object}`` format.
+ tf_version (str):
+ Output only. The current Terraform version
+ set on the preview. It is in the format of
+ "Major.Minor.Patch", for example, "1.3.10".
+ tf_version_constraint (str):
+ Optional. The user-specified Terraform
+ version constraint. Example: "=1.3.10".
+
+ This field is a member of `oneof`_ ``_tf_version_constraint``.
  """
 
  class State(proto.Enum):
@@ -2182,6 +2202,15 @@ class ErrorCode(proto.Enum):
  proto.STRING,
  number=17,
  )
+ tf_version: str = proto.Field(
+ proto.STRING,
+ number=18,
+ )
+ tf_version_constraint: str = proto.Field(
+ proto.STRING,
+ number=19,
+ optional=True,
+ )
 
 
 class PreviewOperationMetadata(proto.Message):

packages/google-cloud-config/tests/unit/gapic/config_v1/test_config.py

@@ -6652,6 +6652,8 @@ def test_get_preview(request_type, transport: str = "grpc"):
  build="build_value",
  error_logs="error_logs_value",
  logs="logs_value",
+ tf_version="tf_version_value",
+ tf_version_constraint="tf_version_constraint_value",
  )
  response = client.get_preview(request)
 
@@ -6674,6 +6676,8 @@ def test_get_preview(request_type, transport: str = "grpc"):
  assert response.build == "build_value"
  assert response.error_logs == "error_logs_value"
  assert response.logs == "logs_value"
+ assert response.tf_version == "tf_version_value"
+ assert response.tf_version_constraint == "tf_version_constraint_value"
 
 
 def test_get_preview_empty_call():
@@ -6742,6 +6746,8 @@ async def test_get_preview_empty_call_async():
  build="build_value",
  error_logs="error_logs_value",
  logs="logs_value",
+ tf_version="tf_version_value",
+ tf_version_constraint="tf_version_constraint_value",
  )
  )
  response = await client.get_preview()
@@ -6779,6 +6785,8 @@ async def test_get_preview_async(
  build="build_value",
  error_logs="error_logs_value",
  logs="logs_value",
+ tf_version="tf_version_value",
+ tf_version_constraint="tf_version_constraint_value",
  )
  )
  response = await client.get_preview(request)
@@ -6802,6 +6810,8 @@ async def test_get_preview_async(
  assert response.build == "build_value"
  assert response.error_logs == "error_logs_value"
  assert response.logs == "logs_value"
+ assert response.tf_version == "tf_version_value"
+ assert response.tf_version_constraint == "tf_version_constraint_value"
 
 
 @pytest.mark.asyncio
@@ -9421,6 +9431,7 @@ def test_create_deployment_rest(request_type):
  "tf_version_constraint": "tf_version_constraint_value",
  "tf_version": "tf_version_value",
  "quota_validation": 1,
+ "annotations": {},
  }
  # The version of a generated dependency at test runtime may differ from the version used during generation.
  # Delete any fields which are not present in the current runtime dependency
@@ -9844,6 +9855,7 @@ def test_update_deployment_rest(request_type):
  "tf_version_constraint": "tf_version_constraint_value",
  "tf_version": "tf_version_value",
  "quota_validation": 1,
+ "annotations": {},
  }
  # The version of a generated dependency at test runtime may differ from the version used during generation.
  # Delete any fields which are not present in the current runtime dependency
@@ -13520,6 +13532,8 @@ def test_create_preview_rest(request_type):
  "artifacts": "artifacts_value",
  },
  "logs": "logs_value",
+ "tf_version": "tf_version_value",
+ "tf_version_constraint": "tf_version_constraint_value",
  }
  # The version of a generated dependency at test runtime may differ from the version used during generation.
  # Delete any fields which are not present in the current runtime dependency
@@ -13888,6 +13902,8 @@ def test_get_preview_rest(request_type):
  build="build_value",
  error_logs="error_logs_value",
  logs="logs_value",
+ tf_version="tf_version_value",
+ tf_version_constraint="tf_version_constraint_value",
  )
 
  # Wrap the value into a proper Response obj
@@ -13914,6 +13930,8 @@ def test_get_preview_rest(request_type):
  assert response.build == "build_value"
  assert response.error_logs == "error_logs_value"
  assert response.logs == "logs_value"
+ assert response.tf_version == "tf_version_value"
+ assert response.tf_version_constraint == "tf_version_constraint_value"
 
 
 def test_get_preview_rest_required_fields(request_type=config.GetPreviewRequest):