Skip to content

Commit fe64002

Browse files
authored
Remove send_empty_value for suspended and disableRollbackIfRolloutPending fields (#14982)
1 parent c58392b commit fe64002

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

mmv1/products/clouddeploy/Automation.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ properties:
104104
- name: 'suspended'
105105
type: Boolean
106106
description: "Optional. When Suspended, automation is deactivated from execution."
107-
send_empty_value: true
108107
- name: 'serviceAccount'
109108
type: String
110109
description: "Required. Email address of the user-managed IAM service account that creates Cloud Deploy release and rollout resources."
@@ -242,7 +241,6 @@ properties:
242241
description: "Optional. The starting phase ID for the Rollout. If unspecified, the Rollout will start in the stable phase."
243242
- name: 'disableRollbackIfRolloutPending'
244243
type: Boolean
245-
send_empty_value: true
246244
description: "Optional. If pending rollout exists on the target, the rollback operation will be aborted."
247245
- name: 'timedPromoteReleaseRule'
248246
type: NestedObject

mmv1/products/clouddeploy/DeployPolicy.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ properties:
9494
- name: "suspended"
9595
type: Boolean
9696
description: "When suspended, the policy will not prevent actions from occurring, even if the action violates the policy."
97-
send_empty_value: true
9897
- name: "selectors"
9998
type: Array
10099
description: "Selected resources to which the policy will be applied. At least one selector is required. If one selector matches the resource the policy applies. For example, if there are two selectors and the action being attempted matches one of them, the policy will apply to that action."

mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_automation_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ func TestAccClouddeployAutomation_update(t *testing.T) {
4040
ImportStateVerify: true,
4141
ImportStateVerifyIgnore: []string{"location", "delivery_pipeline", "annotations", "labels", "terraform_labels"},
4242
},
43+
{
44+
Config: testAccClouddeployAutomation_basic(context),
45+
},
46+
{
47+
ResourceName: "google_clouddeploy_automation.automation",
48+
ImportState: true,
49+
ImportStateVerify: true,
50+
ImportStateVerifyIgnore: []string{"location", "delivery_pipeline", "annotations", "labels", "terraform_labels"},
51+
},
4352
},
4453
})
4554
}

mmv1/third_party/terraform/services/clouddeploy/resource_clouddeploy_deploy_policy_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ func TestAccClouddeployDeployPolicy_update(t *testing.T) {
3838
ImportStateVerify: true,
3939
ImportStateVerifyIgnore: []string{"location", "annotations", "labels", "terraform_labels"},
4040
},
41+
{
42+
Config: testAccClouddeployDeployPolicy_basic(context),
43+
},
44+
{
45+
ResourceName: "google_clouddeploy_deploy_policy.deploy_policy",
46+
ImportState: true,
47+
ImportStateVerify: true,
48+
ImportStateVerifyIgnore: []string{"location", "annotations", "labels", "terraform_labels"},
49+
},
4150
},
4251
})
4352
}
@@ -85,6 +94,7 @@ resource "google_clouddeploy_deploy_policy" "deploy_policy" {
8594
id = "tf-test-cd-pipeline%{random_suffix}"
8695
}
8796
}
97+
suspended = true
8898
rules {
8999
rollout_restriction {
90100
id = "rule"

0 commit comments

Comments
 (0)