Skip to content

Add support for timedPromoteReleaseRule and repairRolloutRule automation rules and new Deploy Policy resource #9694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged

Add support for timedPromoteReleaseRule and repairRolloutRule automation rules and new Deploy Policy resource #9694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/13494.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:enhancement
cloudedeploy: added `timed_promote_release_rule` and `repair_rollout_rule` to `google_clouddeploy_automation` resource
```
```release-note:new-resource
`google_clouddeploy_deploy_policy`
```
5 changes: 3 additions & 2 deletions google-beta/provider/provider_mmv1_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
}

// Resources
// Generated resources: 634
// Generated resources: 635
// Generated IAM resources: 312
// Total generated resources: 946
// Total generated resources: 947
var generatedResources = map[string]*schema.Resource{
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
Expand Down Expand Up @@ -726,6 +726,7 @@ var generatedResources = map[string]*schema.Resource{
"google_clouddeploy_delivery_pipeline_iam_binding": tpgiamresource.ResourceIamBinding(clouddeploy.ClouddeployDeliveryPipelineIamSchema, clouddeploy.ClouddeployDeliveryPipelineIamUpdaterProducer, clouddeploy.ClouddeployDeliveryPipelineIdParseFunc),
"google_clouddeploy_delivery_pipeline_iam_member": tpgiamresource.ResourceIamMember(clouddeploy.ClouddeployDeliveryPipelineIamSchema, clouddeploy.ClouddeployDeliveryPipelineIamUpdaterProducer, clouddeploy.ClouddeployDeliveryPipelineIdParseFunc),
"google_clouddeploy_delivery_pipeline_iam_policy": tpgiamresource.ResourceIamPolicy(clouddeploy.ClouddeployDeliveryPipelineIamSchema, clouddeploy.ClouddeployDeliveryPipelineIamUpdaterProducer, clouddeploy.ClouddeployDeliveryPipelineIdParseFunc),
"google_clouddeploy_deploy_policy": clouddeploy.ResourceClouddeployDeployPolicy(),
"google_clouddeploy_target_iam_binding": tpgiamresource.ResourceIamBinding(clouddeploy.ClouddeployTargetIamSchema, clouddeploy.ClouddeployTargetIamUpdaterProducer, clouddeploy.ClouddeployTargetIdParseFunc),
"google_clouddeploy_target_iam_member": tpgiamresource.ResourceIamMember(clouddeploy.ClouddeployTargetIamSchema, clouddeploy.ClouddeployTargetIamUpdaterProducer, clouddeploy.ClouddeployTargetIdParseFunc),
"google_clouddeploy_target_iam_policy": tpgiamresource.ResourceIamPolicy(clouddeploy.ClouddeployTargetIamSchema, clouddeploy.ClouddeployTargetIamUpdaterProducer, clouddeploy.ClouddeployTargetIdParseFunc),
Expand Down
514 changes: 512 additions & 2 deletions google-beta/services/clouddeploy/resource_clouddeploy_automation.go
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ fields:
- field: 'rules.promote_release_rule.destination_target_id'
- field: 'rules.promote_release_rule.id'
- field: 'rules.promote_release_rule.wait'
- field: 'rules.repair_rollout_rule.id'
- field: 'rules.repair_rollout_rule.jobs'
- field: 'rules.repair_rollout_rule.phases'
- field: 'rules.repair_rollout_rule.repair_phases.retry.attempts'
- field: 'rules.repair_rollout_rule.repair_phases.retry.backoff_mode'
- field: 'rules.repair_rollout_rule.repair_phases.retry.wait'
- field: 'rules.repair_rollout_rule.repair_phases.rollback.destination_phase'
- field: 'rules.repair_rollout_rule.repair_phases.rollback.disable_rollback_if_rollout_pending'
- field: 'rules.timed_promote_release_rule.destination_phase'
- field: 'rules.timed_promote_release_rule.destination_target_id'
- field: 'rules.timed_promote_release_rule.id'
- field: 'rules.timed_promote_release_rule.schedule'
- field: 'rules.timed_promote_release_rule.time_zone'
- field: 'selector.targets.id'
- field: 'selector.targets.labels'
- field: 'service_account'
Expand Down
31 changes: 30 additions & 1 deletion google-beta/services/clouddeploy/resource_clouddeploy_automation_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,39 @@ resource "google_clouddeploy_automation" "f-automation" {
rules {
advance_rollout_rule {
id = "advance-rollout"
source_phases = ["deploy"]
source_phases = ["canary"]
wait = "200s"
}
}
rules {
repair_rollout_rule {
id = "repair-rollout"
phases = ["stable"]
jobs = ["deploy"]
repair_phases {
retry {
attempts = "1"
wait = "200s"
backoff_mode = "BACKOFF_MODE_LINEAR"
}
}
repair_phases {
rollback {
destination_phase = "stable"
disable_rollback_if_rollout_pending = true
}
}
}
}
rules {
timed_promote_release_rule {
id = "timed-promote-release"
destination_target_id = "@next"
schedule = "0 9 * * 1"
time_zone = "America/New_York"
destination_phase = "stable"
}
}
}

resource "google_clouddeploy_delivery_pipeline" "pipeline" {
Expand Down
28 changes: 28 additions & 0 deletions google-beta/services/clouddeploy/resource_clouddeploy_automation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,34 @@ resource "google_clouddeploy_automation" "automation" {
destination_phase = "stable"
}
}
rules {
repair_rollout_rule {
id = "repair-rollout"
phases = ["stable"]
jobs = ["deploy"]
repair_phases {
retry {
attempts = "1"
wait = "200s"
backoff_mode = "BACKOFF_MODE_LINEAR"
}
}
repair_phases {
rollback {
destination_phase = "stable"
}
}
}
}
rules {
timed_promote_release_rule {
id = "timed-promote-release"
destination_target_id = "@next"
schedule = "0 9 * * 1"
time_zone = "America/New_York"
destination_phase = "stable"
}
}
}

resource "google_clouddeploy_delivery_pipeline" "pipeline" {
Expand Down
Loading
Loading