diff --git a/mmv1/api/async.rb b/mmv1/api/async.rb index 7c018f5d78e5..14fc854bf2c4 100644 --- a/mmv1/api/async.rb +++ b/mmv1/api/async.rb @@ -26,7 +26,7 @@ class Async < Api::Object def validate super - check :operation, type: Operation, required: true + check :operation, type: Operation check :actions, default: %w[create delete update], type: ::Array, item_type: ::String end diff --git a/mmv1/api/timeout.rb b/mmv1/api/timeout.rb index 45c8283ac6dc..103fb83e5045 100644 --- a/mmv1/api/timeout.rb +++ b/mmv1/api/timeout.rb @@ -16,11 +16,11 @@ module Api # Provides timeout information for the different operation types class Timeouts < Api::Object - # Default timeout for all operation types is 4 minutes. This can be - # overridden for each resource. - DEFAULT_INSERT_TIMEOUT_MINUTES = 4 - DEFAULT_UPDATE_TIMEOUT_MINUTES = 4 - DEFAULT_DELETE_TIMEOUT_MINUTES = 4 + # Default timeout for all operation types is 20, the Terraform default (https://www.terraform.io/plugin/sdkv2/resources/retries-and-customizable-timeouts) + # minutes. This can be overridden for each resource. + DEFAULT_INSERT_TIMEOUT_MINUTES = 20 + DEFAULT_UPDATE_TIMEOUT_MINUTES = 20 + DEFAULT_DELETE_TIMEOUT_MINUTES = 20 attr_reader :insert_minutes attr_reader :update_minutes diff --git a/mmv1/products/accesscontextmanager/terraform.yaml b/mmv1/products/accesscontextmanager/terraform.yaml index 645a31876ff4..e89a9cc49df9 100644 --- a/mmv1/products/accesscontextmanager/terraform.yaml +++ b/mmv1/products/accesscontextmanager/terraform.yaml @@ -21,10 +21,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides in the provider configuration. Otherwise the ACM API will return a 403 error. Your account must have the `serviceusage.services.use` permission on the `billing_project` you defined. - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true # Skipping the sweeper due to the non-standard base_url skip_sweeper: true @@ -50,10 +46,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides in the provider configuration. Otherwise the ACM API will return a 403 error. Your account must have the `serviceusage.services.use` permission on the `billing_project` you defined. - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true # Skipping the sweeper due to the non-standard base_url skip_sweeper: true @@ -75,10 +67,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb AccessLevels: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true # Skipping the sweeper due to the non-standard base_url skip_sweeper: true @@ -113,9 +101,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 autogen_async: true exclude_validator: true exclude_import: true # no unique way to specify @@ -139,10 +124,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides in the provider configuration. Otherwise the ACM API will return a 403 error. Your account must have the `serviceusage.services.use` permission on the `billing_project` you defined. - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true # Skipping the sweeper due to the non-standard base_url skip_sweeper: true @@ -183,10 +164,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb ServicePerimeters: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true # Skipping the sweeper due to the non-standard base_url skip_sweeper: true diff --git a/mmv1/products/activedirectory/api.yaml b/mmv1/products/activedirectory/api.yaml index 62ba87e23b0e..5b3ea565515b 100644 --- a/mmv1/products/activedirectory/api.yaml +++ b/mmv1/products/activedirectory/api.yaml @@ -129,10 +129,6 @@ objects: path: 'name' base_url: '{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 - delete_minutes: 10 result: !ruby/object:Api::OpAsync::Result path: 'response' resource_inside_response: true @@ -196,4 +192,4 @@ objects: required: true input: true description: | - The trust secret used for the handshake with the target domain. This will not be stored. \ No newline at end of file + The trust secret used for the handshake with the target domain. This will not be stored. diff --git a/mmv1/products/apigateway/terraform.yaml b/mmv1/products/apigateway/terraform.yaml index 8c4deb2b4899..fbcfac138398 100644 --- a/mmv1/products/apigateway/terraform.yaml +++ b/mmv1/products/apigateway/terraform.yaml @@ -14,10 +14,6 @@ --- !ruby/object:Provider::Terraform::Config overrides: !ruby/object:Overrides::ResourceOverrides Api: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true iam_policy: !ruby/object:Api::Resource::IamPolicy allowed_iam_role: 'roles/apigateway.viewer' @@ -49,10 +45,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides optional_properties: | * `api_config_id_prefix` - (Optional) Creates a unique name beginning with the specified prefix. If this and api_config_id are unspecified, a random value is chosen for the name. - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true iam_policy: !ruby/object:Api::Resource::IamPolicy allowed_iam_role: 'roles/apigateway.viewer' @@ -90,10 +82,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides extra_schema_entry: templates/terraform/extra_schema_entry/api_config.erb encoder: 'templates/terraform/encoders/api_config.go.erb' Gateway: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true iam_policy: !ruby/object:Api::Resource::IamPolicy allowed_iam_role: 'roles/apigateway.viewer' diff --git a/mmv1/products/apigee/terraform.yaml b/mmv1/products/apigee/terraform.yaml index b869e992776c..636c3fe11bd0 100644 --- a/mmv1/products/apigee/terraform.yaml +++ b/mmv1/products/apigee/terraform.yaml @@ -47,9 +47,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides min_version: beta # Resource creation race skip_vcr: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - delete_minutes: 10 custom_code: !ruby/object:Provider::Terraform::CustomCode custom_import: templates/terraform/custom_import/apigee_organization.go.erb encoder: templates/terraform/encoders/apigee_organization.go.erb diff --git a/mmv1/products/appengine/api.yaml b/mmv1/products/appengine/api.yaml index 444767022b34..bcae708c9d30 100644 --- a/mmv1/products/appengine/api.yaml +++ b/mmv1/products/appengine/api.yaml @@ -238,6 +238,10 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 + timeouts: !ruby/object:Api::Timeouts + insert_minutes: 20 + update_minutes: 20 + delete_minutes: 20 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -614,10 +618,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 - delete_minutes: 10 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status diff --git a/mmv1/products/appengine/terraform.yaml b/mmv1/products/appengine/terraform.yaml index 2963dad4d3f8..9037e98fe757 100644 --- a/mmv1/products/appengine/terraform.yaml +++ b/mmv1/products/appengine/terraform.yaml @@ -19,11 +19,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 - update_minutes: 4 - delete_minutes: 4 # This resource is a child resource (requires app ID in the URL) skip_sweeper: true examples: diff --git a/mmv1/products/bigquery/terraform.yaml b/mmv1/products/bigquery/terraform.yaml index 97367771416c..61cf43d987e1 100644 --- a/mmv1/products/bigquery/terraform.yaml +++ b/mmv1/products/bigquery/terraform.yaml @@ -135,9 +135,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 examples: - !ruby/object:Provider::Terraform::Examples name: "bigquery_job_query" diff --git a/mmv1/products/cloudidentity/terraform.yaml b/mmv1/products/cloudidentity/terraform.yaml index c5e8ccfdefad..4d784be32396 100644 --- a/mmv1/products/cloudidentity/terraform.yaml +++ b/mmv1/products/cloudidentity/terraform.yaml @@ -18,9 +18,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides check_response_func_existence: PollCheckForExistenceWith403 target_occurrences: 10 actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 docs: !ruby/object:Provider::Terraform::Docs warning: | If you are using User ADCs (Application Default Credentials) with this resource, diff --git a/mmv1/products/cloudrun/terraform.yaml b/mmv1/products/cloudrun/terraform.yaml index 705c73d12137..b728e65bbbe2 100644 --- a/mmv1/products/cloudrun/terraform.yaml +++ b/mmv1/products/cloudrun/terraform.yaml @@ -20,10 +20,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckKnativeStatusFunc(res) actions: ['create', 'update'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 examples: - !ruby/object:Provider::Terraform::Examples name: "cloud_run_domain_mapping_basic" @@ -72,10 +68,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckKnativeStatusFunc(res) actions: ['create', 'update'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 15 examples: - !ruby/object:Provider::Terraform::Examples name: "cloud_run_service_basic" diff --git a/mmv1/products/compute/api.yaml b/mmv1/products/compute/api.yaml index 6dabca13ea1d..3a33222f4161 100644 --- a/mmv1/products/compute/api.yaml +++ b/mmv1/products/compute/api.yaml @@ -3036,9 +3036,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{region}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 - delete_minutes: 4 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -3098,9 +3095,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 - delete_minutes: 4 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -3170,10 +3164,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - # Larger disks were timing out at creation. Bumping up to 5 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/703 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -5940,10 +5930,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -6241,12 +6227,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - # Users were experiencing timeouts. Bumping up to 6 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/852 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -7154,10 +7134,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -7421,9 +7397,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{region}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - delete_minutes: 10 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -7698,10 +7671,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -8060,10 +8029,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -8250,10 +8215,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -8687,10 +8648,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -9292,10 +9249,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/zones/{{zone}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 6 - delete_minutes: 15 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -9410,10 +9363,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{region}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 6 - delete_minutes: 15 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -10160,8 +10109,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{region}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -13224,10 +13171,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{regions}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 - delete_minutes: 10 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -13430,10 +13373,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{regions}}/operations/{{op_id}}' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 - delete_minutes: 10 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -13755,10 +13694,6 @@ objects: path: 'name' full_url: 'selfLink' wait_ms: 1000 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 - update_minutes: 5 - delete_minutes: 5 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status @@ -14004,8 +13939,8 @@ objects: base_url: 'projects/{{project}}/global/operations/{{op_id}}' wait_ms: 1000 timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 + insert_minutes: 30 + update_minutes: 30 # Deletes can take 20-30 minutes to complete, since they depend # on the provisioning process either succeeding or failing completely. delete_minutes: 30 @@ -14637,12 +14572,6 @@ objects: path: 'name' base_url: 'projects/{{project}}/regions/{{region}}/operations/{{op_id}}' wait_ms: 1000 - # Users were experiencing timeout. Bumping up to 6 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/718 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 result: !ruby/object:Api::OpAsync::Result path: 'targetLink' status: !ruby/object:Api::OpAsync::Status diff --git a/mmv1/products/compute/terraform.yaml b/mmv1/products/compute/terraform.yaml index f510ad88cc3e..9d8767aa6b0b 100644 --- a/mmv1/products/compute/terraform.yaml +++ b/mmv1/products/compute/terraform.yaml @@ -555,10 +555,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides required: false default_from_api: true Disk: !ruby/object:Overrides::Terraform::ResourceOverride - # Larger disks were timing out at creation. Bumping up to 5 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/703 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 properties: id: !ruby/object:Overrides::Terraform::PropertyOverride exclude: true @@ -1254,12 +1250,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides sourceType: !ruby/object:Overrides::Terraform::PropertyOverride exclude: true Instance: !ruby/object:Overrides::Terraform::ResourceOverride - # Users were experiencing timeouts. Bumping up to 6 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/852 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 iam_policy: !ruby/object:Api::Resource::IamPolicy allowed_iam_role: 'roles/compute.osLogin' parent_resource_attribute: 'instance_name' @@ -1953,8 +1943,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides required: false default_from_api: true RegionDisk: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 properties: id: !ruby/object:Overrides::Terraform::PropertyOverride exclude: true @@ -2535,10 +2523,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides custom_code: !ruby/object:Provider::Terraform::CustomCode update_encoder: 'templates/terraform/update_encoder/compute_service_attachment.go.erb' Snapshot: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 5 - update_minutes: 5 - delete_minutes: 5 create_url: PRE_CREATE_REPLACE_ME/createSnapshot examples: - !ruby/object:Provider::Terraform::Examples @@ -2579,8 +2563,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides pre_create: templates/terraform/pre_create/compute_snapshot_precreate_url.go.erb ManagedSslCertificate: !ruby/object:Overrides::Terraform::ResourceOverride timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 + insert_minutes: 30 + update_minutes: 30 # Deletes can take 20-30 minutes to complete, since they depend # on the provisioning process either succeeding or failing completely. delete_minutes: 30 @@ -2788,12 +2772,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides warnings: !ruby/object:Overrides::Terraform::PropertyOverride exclude: true Subnetwork: !ruby/object:Overrides::Terraform::ResourceOverride - # Users were experiencing timeout. Bumping up to 6 minutes. - # https://github.com/hashicorp/terraform-provider-google/issues/718 - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 iam_policy: !ruby/object:Api::Resource::IamPolicy allowed_iam_role: 'roles/compute.networkUser' parent_resource_attribute: 'subnetwork' diff --git a/mmv1/products/datastore/terraform.yaml b/mmv1/products/datastore/terraform.yaml index 5adf2fc70ac7..07560ce4a242 100644 --- a/mmv1/products/datastore/terraform.yaml +++ b/mmv1/products/datastore/terraform.yaml @@ -25,7 +25,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides skip_sweeper: true timeouts: !ruby/object:Api::Timeouts insert_minutes: 20 - delete_minutes: 10 + delete_minutes: 20 docs: !ruby/object:Provider::Terraform::Docs warning: | This resource creates a Datastore Index on a project that has already diff --git a/mmv1/products/dlp/terraform.yaml b/mmv1/products/dlp/terraform.yaml index 96bf0eb681c9..a02441aef319 100644 --- a/mmv1/products/dlp/terraform.yaml +++ b/mmv1/products/dlp/terraform.yaml @@ -79,9 +79,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 id_format: "{{parent}}/storedInfoTypes/{{name}}" properties: name: !ruby/object:Overrides::Terraform::PropertyOverride diff --git a/mmv1/products/filestore/terraform.yaml b/mmv1/products/filestore/terraform.yaml index 367b47e25aa8..60bcd07e0076 100644 --- a/mmv1/products/filestore/terraform.yaml +++ b/mmv1/products/filestore/terraform.yaml @@ -16,10 +16,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides Instance: !ruby/object:Overrides::Terraform::ResourceOverride mutex: "filestore/{{project}}" error_retry_predicates: ["isNotFilestoreQuotaError"] - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true schema_version: 1 examples: diff --git a/mmv1/products/firebase/terraform.yaml b/mmv1/products/firebase/terraform.yaml index 951ba95dde45..a612ab91d9ec 100644 --- a/mmv1/products/firebase/terraform.yaml +++ b/mmv1/products/firebase/terraform.yaml @@ -15,8 +15,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides Project: !ruby/object:Overrides::Terraform::ResourceOverride import_format: ["projects/{{project}}", "{{project}}"] - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 autogen_async: true skip_delete: true skip_sweeper: true @@ -31,8 +29,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides org_id: :ORG_ID ProjectLocation: !ruby/object:Overrides::Terraform::ResourceOverride import_format: ['projects/{{project}}', '{{project}}'] - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 skip_delete: true skip_sweeper: true examples: @@ -44,9 +40,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides org_id: :ORG_ID WebApp: !ruby/object:Overrides::Terraform::ResourceOverride import_format: ['{{project}} {{name}}'] - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 autogen_async: true skip_delete: true #currently only able to delete a webapp through the Firebase Admin console skip_sweeper: true diff --git a/mmv1/products/firestore/terraform.yaml b/mmv1/products/firestore/terraform.yaml index c1d6c0fe35c5..6f60e1043674 100644 --- a/mmv1/products/firestore/terraform.yaml +++ b/mmv1/products/firestore/terraform.yaml @@ -14,10 +14,6 @@ --- !ruby/object:Provider::Terraform::Config overrides: !ruby/object:Overrides::ResourceOverrides Index: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 10 - update_minutes: 10 - delete_minutes: 10 autogen_async: true # This resource is a child resource skip_sweeper: true diff --git a/mmv1/products/iap/terraform.yaml b/mmv1/products/iap/terraform.yaml index 9b8daa6d7e96..3d17c74cfac4 100644 --- a/mmv1/products/iap/terraform.yaml +++ b/mmv1/products/iap/terraform.yaml @@ -182,10 +182,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides check_response_func_existence: PollCheckForExistence target_occurrences: 5 actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 - update_minutes: 4 description: | {{description}} diff --git a/mmv1/products/monitoring/terraform.yaml b/mmv1/products/monitoring/terraform.yaml index a2a75c2a6ee8..981528613db4 100644 --- a/mmv1/products/monitoring/terraform.yaml +++ b/mmv1/products/monitoring/terraform.yaml @@ -290,11 +290,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides check_response_func_absence: PollCheckForAbsence target_occurrences: 20 actions: ['create', 'update', 'delete'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 id_format: "{{name}}" import_format: ["{{name}}"] error_retry_predicates: ["isMonitoringConcurrentEditError"] diff --git a/mmv1/products/notebooks/terraform.yaml b/mmv1/products/notebooks/terraform.yaml index 7435863057de..77fa5793ee58 100644 --- a/mmv1/products/notebooks/terraform.yaml +++ b/mmv1/products/notebooks/terraform.yaml @@ -26,10 +26,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides vars: environment_name: "notebooks-environment" Instance: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 15 - delete_minutes: 15 autogen_async: true examples: - !ruby/object:Provider::Terraform::Examples @@ -117,10 +113,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides shieldedInstanceConfig: !ruby/object:Overrides::Terraform::PropertyOverride default_from_api: true Runtime: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 15 - delete_minutes: 15 autogen_async: true examples: - !ruby/object:Provider::Terraform::Examples @@ -183,4 +175,4 @@ files: !ruby/object:Provider::Config::Files # These files have templating (ERB) code that will be run. # This is usually to add licensing info, autogeneration notices, etc. compile: -<%= lines(indent(compile('provider/terraform/product~compile.yaml'), 4)) -%> \ No newline at end of file +<%= lines(indent(compile('provider/terraform/product~compile.yaml'), 4)) -%> diff --git a/mmv1/products/pubsub/terraform.yaml b/mmv1/products/pubsub/terraform.yaml index 8f05dea92973..02a59c6ea384 100644 --- a/mmv1/products/pubsub/terraform.yaml +++ b/mmv1/products/pubsub/terraform.yaml @@ -27,11 +27,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 4 suppress_error: true error_retry_predicates: ["pubsubTopicProjectNotReady"] iam_policy: !ruby/object:Api::Resource::IamPolicy @@ -87,11 +82,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 4 suppress_error: true examples: - !ruby/object:Provider::Terraform::Examples @@ -156,9 +146,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides check_response_func_absence: PollCheckForAbsence target_occurrences: 10 actions: ['delete'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - delete_minutes: 6 examples: - !ruby/object:Provider::Terraform::Examples name: "pubsub_schema_basic" diff --git a/mmv1/products/sql/terraform.yaml b/mmv1/products/sql/terraform.yaml index c3b3f6fb949b..fc43af06824b 100644 --- a/mmv1/products/sql/terraform.yaml +++ b/mmv1/products/sql/terraform.yaml @@ -36,10 +36,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides deletion_protection: "false" oics_vars_overrides: deletion_protection: "false" - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 10 - delete_minutes: 10 properties: collation: !ruby/object:Overrides::Terraform::PropertyOverride default_from_api: true diff --git a/mmv1/products/storage/terraform.yaml b/mmv1/products/storage/terraform.yaml index 2f912e3be9a2..f6d5a782e754 100644 --- a/mmv1/products/storage/terraform.yaml +++ b/mmv1/products/storage/terraform.yaml @@ -113,11 +113,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides async: !ruby/object:Provider::Terraform::PollAsync check_response_func_existence: PollCheckForExistence actions: ['create'] - operation: !ruby/object:Api::Async::Operation - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 4 - update_minutes: 4 - delete_minutes: 4 # This resource does not have a name field skip_sweeper: true examples: diff --git a/mmv1/products/tpu/terraform.yaml b/mmv1/products/tpu/terraform.yaml index ae50962c52b8..9ed12dcf6ff1 100644 --- a/mmv1/products/tpu/terraform.yaml +++ b/mmv1/products/tpu/terraform.yaml @@ -14,10 +14,6 @@ --- !ruby/object:Provider::Terraform::Config overrides: !ruby/object:Overrides::ResourceOverrides Node: !ruby/object:Overrides::Terraform::ResourceOverride - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 - update_minutes: 15 - delete_minutes: 15 autogen_async: true examples: - !ruby/object:Provider::Terraform::Examples diff --git a/mmv1/products/vertexai/terraform.yaml b/mmv1/products/vertexai/terraform.yaml index f502ce472544..1bc90f894376 100644 --- a/mmv1/products/vertexai/terraform.yaml +++ b/mmv1/products/vertexai/terraform.yaml @@ -18,10 +18,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides id_format: '{{name}}' exclude_import: true skip_sweeper: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 10 examples: - !ruby/object:Provider::Terraform::Examples name: "vertex_ai_dataset" @@ -37,10 +33,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides Featurestore: !ruby/object:Overrides::Terraform::ResourceOverride autogen_async: false skip_sweeper: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 10 examples: - !ruby/object:Provider::Terraform::Examples name: "vertex_ai_featurestore" @@ -65,10 +57,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides import_format: ["{{%featurestore}}/entityTypes/{{name}}"] autogen_async: false skip_sweeper: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 10 examples: - !ruby/object:Provider::Terraform::Examples name: "vertex_ai_featurestore_entitytype" @@ -88,9 +76,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides autogen_async: false id_format: '{{name}}' skip_sweeper: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 15 # Inserts with KMS take 10+ minutes - delete_minutes: 15 examples: - !ruby/object:Provider::Terraform::Examples name: "vertex_ai_metadata_store" diff --git a/mmv1/products/vpcaccess/terraform.yaml b/mmv1/products/vpcaccess/terraform.yaml index 0b63fa6957ed..798c5f8fc6b9 100644 --- a/mmv1/products/vpcaccess/terraform.yaml +++ b/mmv1/products/vpcaccess/terraform.yaml @@ -15,10 +15,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides Connector: !ruby/object:Overrides::Terraform::ResourceOverride autogen_async: true - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 10 examples: - !ruby/object:Provider::Terraform::Examples name: "vpc_access_connector" diff --git a/mmv1/products/workflows/terraform.yaml b/mmv1/products/workflows/terraform.yaml index 52f557ce9438..d82db9e5934d 100644 --- a/mmv1/products/workflows/terraform.yaml +++ b/mmv1/products/workflows/terraform.yaml @@ -18,10 +18,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides optional_properties: | * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. If this and name are unspecified, a random value is chosen for the name. - timeouts: !ruby/object:Api::Timeouts - insert_minutes: 6 - update_minutes: 6 - delete_minutes: 6 autogen_async: true id_format: 'projects/{{project}}/locations/{{region}}/workflows/{{name}}' exclude_import: true diff --git a/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown b/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown index 2367baf90b79..ba2b8fd4ddd4 100644 --- a/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown @@ -144,9 +144,9 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy.html.markdown index 4fc6f740d414..ecf39e8392ec 100644 --- a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy.html.markdown @@ -93,9 +93,9 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_association.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_association.html.markdown index 86408b934a9d..4d1fbf7d2144 100644 --- a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_association.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_association.html.markdown @@ -80,8 +80,8 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_rule.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_rule.html.markdown index f308196fe339..5335cd87882b 100644 --- a/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_rule.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/compute_firewall_policy_rule.html.markdown @@ -145,9 +145,9 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/dataproc_workflow_template.html.markdown b/mmv1/third_party/terraform/website/docs/r/dataproc_workflow_template.html.markdown index b8699dfa5b22..0e3924838bb7 100644 --- a/mmv1/third_party/terraform/website/docs/r/dataproc_workflow_template.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/dataproc_workflow_template.html.markdown @@ -909,8 +909,8 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature.html.markdown b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature.html.markdown index 493bfc03fdc6..0f76d0c6511d 100644 --- a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature.html.markdown @@ -121,9 +121,9 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown index 4d1829f0f2ff..8264bcd4c535 100644 --- a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown @@ -221,9 +221,9 @@ In addition to the arguments listed above, the following computed attributes are This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import diff --git a/tpgtools/resource.go b/tpgtools/resource.go index 93e750e45868..6aee206b1ba4 100644 --- a/tpgtools/resource.go +++ b/tpgtools/resource.go @@ -404,9 +404,9 @@ func createResource(schema *openapi.Schema, info *openapi.Info, typeFetcher *Typ versionMetadata: version, Description: info.Description, location: location, - InsertTimeoutMinutes: 10, - UpdateTimeoutMinutes: 10, - DeleteTimeoutMinutes: 10, + InsertTimeoutMinutes: 20, + UpdateTimeoutMinutes: 20, + DeleteTimeoutMinutes: 20, UseDCLID: overrides.ResourceOverride(UseDCLID, location), }