diff --git a/README.md b/README.md index 2493543eb..06b440105 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Requirements ------------ - [Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible) -- [Go](https://golang.org/doc/install) 1.22.6 (to build the provider plugin) +- [Go](https://golang.org/doc/install) 1.13 (to build the provider plugin) Building The Provider (Terraform v0.12+) ---------------------------------------- diff --git a/avi/data_source_avi_alertconfig_test.go b/avi/data_source_avi_alertconfig_test.go index 7909d6911..70a882345 100644 --- a/avi/data_source_avi_alertconfig_test.go +++ b/avi/data_source_avi_alertconfig_test.go @@ -86,14 +86,6 @@ sys_event_rule { event_id = "VCENTER_ACCESS_SLOW" not_cond = false } -sys_event_rule { - event_id = "OPENSTACK_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "AWS_ACCESS_FAILURE" not_cond = false @@ -142,14 +134,6 @@ sys_event_rule { event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "DOCKER_UCP_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "VCA_ACCESS_FAILURE" not_cond = false @@ -166,14 +150,6 @@ sys_event_rule { event_id = "LS_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "MESOS_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "MESOS_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "CC_SE_CREATION_FAILURE" not_cond = false diff --git a/avi/data_source_avi_applicationprofile_test.go b/avi/data_source_avi_applicationprofile_test.go index 408f93a81..cc3604bfc 100644 --- a/avi/data_source_avi_applicationprofile_test.go +++ b/avi/data_source_avi_applicationprofile_test.go @@ -93,6 +93,13 @@ resource "avi_applicationprofile" "testApplicationProfile" { mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id] } http2_profile { + http2_initial_window_size = "64" + max_http2_concurrent_streams_per_connection = "128" + max_http2_control_frames_per_connection = "1000" + max_http2_empty_data_frames_per_connection = "1000" + max_http2_header_field_size = "4096" + max_http2_queued_frames_to_client_per_connection = "1000" + max_http2_requests_per_connection = "1000" } max_rps_unknown_uri = "0" post_accept_timeout = "30000" @@ -108,6 +115,9 @@ resource "avi_applicationprofile" "testApplicationProfile" { use_app_keepalive_timeout = false } preserve_client_port = false + l4_ssl_profile { + ssl_stream_idle_timeout = "3600" + } } data "avi_applicationprofile" "testApplicationProfile" { diff --git a/avi/data_source_avi_certificatemanagementprofile_test.go b/avi/data_source_avi_certificatemanagementprofile_test.go index 07d438a6b..d88d8f9ed 100644 --- a/avi/data_source_avi_certificatemanagementprofile_test.go +++ b/avi/data_source_avi_certificatemanagementprofile_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/data_source_avi_cluster_test.go b/avi/data_source_avi_cluster_test.go index 51390ab0a..fbd0d4130 100644 --- a/avi/data_source_avi_cluster_test.go +++ b/avi/data_source_avi_cluster_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/data_source_avi_pool_test.go b/avi/data_source_avi_pool_test.go index b3be54926..bf3654163 100644 --- a/avi/data_source_avi_pool_test.go +++ b/avi/data_source_avi_pool_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/data_source_avi_snmptrapprofile_test.go b/avi/data_source_avi_snmptrapprofile_test.go index 26399b32c..f4c0490ff 100644 --- a/avi/data_source_avi_snmptrapprofile_test.go +++ b/avi/data_source_avi_snmptrapprofile_test.go @@ -33,6 +33,15 @@ data "avi_tenant" "default_tenant"{ resource "avi_snmptrapprofile" "testSnmpTrapProfile" { name = "test-snmp-test-abc" tenant_ref = data.avi_tenant.default_tenant.id + trap_servers { + community = "abc" + ip_addr { + addr = "10.10.10.2" + type = "V4" + } + port = "162" + version = "SNMP_VER2" +} } data "avi_snmptrapprofile" "testSnmpTrapProfile" { diff --git a/avi/data_source_avi_useraccount_test.go b/avi/data_source_avi_useraccount_test.go index 1517efd41..7653c3697 100644 --- a/avi/data_source_avi_useraccount_test.go +++ b/avi/data_source_avi_useraccount_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/datasource_avi_alertscriptconfig.go b/avi/datasource_avi_alertscriptconfig.go index 7c290b62a..5b2c84850 100644 --- a/avi/datasource_avi_alertscriptconfig.go +++ b/avi/datasource_avi_alertscriptconfig.go @@ -32,6 +32,10 @@ func dataSourceAviAlertScriptConfig() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "user_ref": { + Type: schema.TypeString, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_analyticsprofile.go b/avi/datasource_avi_analyticsprofile.go index 7221dd9ed..13c0f58b8 100644 --- a/avi/datasource_avi_analyticsprofile.go +++ b/avi/datasource_avi_analyticsprofile.go @@ -128,6 +128,10 @@ func dataSourceAviAnalyticsProfile() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "exclude_conn_drop_client_small_window_as_error": { + Type: schema.TypeString, + Computed: true, + }, "exclude_dns_policy_drop_as_significant": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_federationcheckpoint.go b/avi/datasource_avi_apiratelimitprofile.go similarity index 77% rename from avi/datasource_avi_federationcheckpoint.go rename to avi/datasource_avi_apiratelimitprofile.go index 275fc859a..ea379b305 100644 --- a/avi/datasource_avi_federationcheckpoint.go +++ b/avi/datasource_avi_apiratelimitprofile.go @@ -5,24 +5,20 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -func dataSourceAviFederationCheckpoint() *schema.Resource { +func dataSourceAviApiRateLimitProfile() *schema.Resource { return &schema.Resource{ - Read: ResourceAviFederationCheckpointRead, + Read: ResourceAviApiRateLimitProfileRead, Schema: map[string]*schema.Schema{ "configpb_attributes": { Type: schema.TypeSet, Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "date": { - Type: schema.TypeString, - Computed: true, - }, "description": { Type: schema.TypeString, Computed: true, }, - "is_federated": { + "enabled": { Type: schema.TypeString, Computed: true, }, @@ -31,6 +27,11 @@ func dataSourceAviFederationCheckpoint() *schema.Resource { Optional: true, Computed: true, }, + "rate_limit_configuration_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "tenant_ref": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_applicationpersistenceprofile.go b/avi/datasource_avi_applicationpersistenceprofile.go index 27b39059d..3a2947800 100644 --- a/avi/datasource_avi_applicationpersistenceprofile.go +++ b/avi/datasource_avi_applicationpersistenceprofile.go @@ -23,6 +23,11 @@ func dataSourceAviApplicationPersistenceProfile() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "diameter_app_persistence_profile": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceDiameterAVPPersistenceProfileSchema(), + }, "hdr_persistence_profile": { Type: schema.TypeSet, Computed: true, @@ -56,6 +61,10 @@ func dataSourceAviApplicationPersistenceProfile() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "persistence_update_interval": { + Type: schema.TypeString, + Computed: true, + }, "server_hm_down_recovery": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_applicationprofile.go b/avi/datasource_avi_applicationprofile.go index 8ddc2628d..29fcd24ec 100644 --- a/avi/datasource_avi_applicationprofile.go +++ b/avi/datasource_avi_applicationprofile.go @@ -30,6 +30,11 @@ func dataSourceAviApplicationProfile() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "diameter_service_profile": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceDiameterServiceApplicationProfileSchema(), + }, "dns_service_profile": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_availabilityzone.go b/avi/datasource_avi_availabilityzone.go index b204ed34d..25b8bb099 100644 --- a/avi/datasource_avi_availabilityzone.go +++ b/avi/datasource_avi_availabilityzone.go @@ -9,6 +9,21 @@ func dataSourceAviAvailabilityZone() *schema.Resource { return &schema.Resource{ Read: ResourceAviAvailabilityZoneRead, Schema: map[string]*schema.Schema{ + "az_clusters": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceAZClusterSchema(), + }, + "az_datastores": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceAZDatastoreSchema(), + }, + "az_hosts": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceAZHostSchema(), + }, "cloud_ref": { Type: schema.TypeString, Optional: true, @@ -34,11 +49,6 @@ func dataSourceAviAvailabilityZone() *schema.Resource { Optional: true, Computed: true, }, - "vcenter_refs": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, }, } } diff --git a/avi/datasource_avi_backupconfiguration.go b/avi/datasource_avi_backupconfiguration.go index e77ec9e80..b23d76674 100644 --- a/avi/datasource_avi_backupconfiguration.go +++ b/avi/datasource_avi_backupconfiguration.go @@ -33,6 +33,10 @@ func dataSourceAviBackupConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "bundle_mode": { + Type: schema.TypeString, + Computed: true, + }, "configpb_attributes": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_botconfigconsolidator.go b/avi/datasource_avi_botconfigconsolidator.go index 2c2314c61..e3ec533a2 100644 --- a/avi/datasource_avi_botconfigconsolidator.go +++ b/avi/datasource_avi_botconfigconsolidator.go @@ -9,6 +9,11 @@ func dataSourceAviBotConfigConsolidator() *schema.Resource { return &schema.Resource{ Read: ResourceAviBotConfigConsolidatorRead, Schema: map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "description": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_botdetectionpolicy.go b/avi/datasource_avi_botdetectionpolicy.go index 0adfcca04..7bbc44b7b 100644 --- a/avi/datasource_avi_botdetectionpolicy.go +++ b/avi/datasource_avi_botdetectionpolicy.go @@ -19,6 +19,11 @@ func dataSourceAviBotDetectionPolicy() *schema.Resource { Computed: true, Elem: ResourceBotConfigClientBehaviorSchema(), }, + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "description": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_botipreputationtypemapping.go b/avi/datasource_avi_botipreputationtypemapping.go index 06062fb88..a53503f52 100644 --- a/avi/datasource_avi_botipreputationtypemapping.go +++ b/avi/datasource_avi_botipreputationtypemapping.go @@ -9,6 +9,11 @@ func dataSourceAviBotIPReputationTypeMapping() *schema.Resource { return &schema.Resource{ Read: ResourceAviBotIPReputationTypeMappingRead, Schema: map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "ip_reputation_mappings": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_botmapping.go b/avi/datasource_avi_botmapping.go index 94a87c305..8b8c7af78 100644 --- a/avi/datasource_avi_botmapping.go +++ b/avi/datasource_avi_botmapping.go @@ -9,6 +9,11 @@ func dataSourceAviBotMapping() *schema.Resource { return &schema.Resource{ Read: ResourceAviBotMappingRead, Schema: map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "mapping_rules": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_cloud.go b/avi/datasource_avi_cloud.go index 752cc15d6..8b4bcad63 100644 --- a/avi/datasource_avi_cloud.go +++ b/avi/datasource_avi_cloud.go @@ -146,11 +146,6 @@ func dataSourceAviCloud() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "openstack_configuration": { - Type: schema.TypeSet, - Computed: true, - Elem: ResourceOpenStackConfigurationSchema(), - }, "prefer_static_routes": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_cloudconnectoruser.go b/avi/datasource_avi_cloudconnectoruser.go index e95584361..195b1a14b 100644 --- a/avi/datasource_avi_cloudconnectoruser.go +++ b/avi/datasource_avi_cloudconnectoruser.go @@ -39,11 +39,6 @@ func dataSourceAviCloudConnectorUser() *schema.Resource { Computed: true, Elem: ResourceNsxtCredentialsSchema(), }, - "oci_credentials": { - Type: schema.TypeSet, - Computed: true, - Elem: ResourceOCICredentialsSchema(), - }, "password": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index 6ca1fc386..638a1c1ba 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -41,6 +41,14 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "archive_retention_framework_period": { + Type: schema.TypeString, + Computed: true, + }, + "async_cert_chaining_interval": { + Type: schema.TypeString, + Computed: true, + }, "async_patch_merge_period": { Type: schema.TypeString, Computed: true, @@ -150,6 +158,10 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_nsx_streaming_agent": { + Type: schema.TypeString, + Computed: true, + }, "enable_per_process_stop": { Type: schema.TypeString, Computed: true, @@ -191,6 +203,10 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "gslb_fileobject_max_version_count": { + Type: schema.TypeString, + Computed: true, + }, "gslb_purge_batch_size": { Type: schema.TypeString, Computed: true, @@ -203,6 +219,26 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "log_records_allocated_size": { + Type: schema.TypeString, + Computed: true, + }, + "log_records_allocation_percentage_for_events": { + Type: schema.TypeString, + Computed: true, + }, + "log_records_cleanup_target_percentage": { + Type: schema.TypeString, + Computed: true, + }, + "log_records_frequent_cleanup_event_generation_threshold": { + Type: schema.TypeString, + Computed: true, + }, + "log_records_purge_interval": { + Type: schema.TypeString, + Computed: true, + }, "max_dead_se_in_grp": { Type: schema.TypeString, Computed: true, @@ -319,23 +355,11 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "seupgrade_copy_buffer_size": { - Type: schema.TypeString, - Computed: true, - }, - "seupgrade_copy_pool_size": { - Type: schema.TypeString, - Computed: true, - }, - "seupgrade_fabric_pool_size": { - Type: schema.TypeString, - Computed: true, - }, - "seupgrade_segroup_min_dead_timeout": { + "shared_ssl_certificates": { Type: schema.TypeString, Computed: true, }, - "shared_ssl_certificates": { + "skip_beego_perf_collection": { Type: schema.TypeString, Computed: true, }, @@ -348,11 +372,12 @@ func dataSourceAviControllerProperties() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeInt}, }, - "system_report_cleanup_interval": { - Type: schema.TypeString, + "statecache_properties": { + Type: schema.TypeSet, Computed: true, + Elem: ResourceSCPropertiesSchema(), }, - "system_report_limit": { + "telemetry_interval": { Type: schema.TypeString, Computed: true, }, @@ -372,14 +397,6 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "upgrade_fat_se_lease_time": { - Type: schema.TypeString, - Computed: true, - }, - "upgrade_lease_time": { - Type: schema.TypeString, - Computed: true, - }, "upgrade_se_per_vs_scale_ops_txn_time": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_csrfpolicy.go b/avi/datasource_avi_csrfpolicy.go index 0367e44ac..4cbfc1d63 100644 --- a/avi/datasource_avi_csrfpolicy.go +++ b/avi/datasource_avi_csrfpolicy.go @@ -18,6 +18,10 @@ func dataSourceAviCSRFPolicy() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "csrf_file_ref": { + Type: schema.TypeString, + Computed: true, + }, "description": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_fileobject.go b/avi/datasource_avi_fileobject.go index da8f352a4..ae408f150 100644 --- a/avi/datasource_avi_fileobject.go +++ b/avi/datasource_avi_fileobject.go @@ -13,6 +13,11 @@ func dataSourceAviFileObject() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "child_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "compressed": { Type: schema.TypeString, Computed: true, @@ -35,10 +40,23 @@ func dataSourceAviFileObject() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "events": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceFileObjectEventMapSchema(), + }, "expires_at": { Type: schema.TypeString, Computed: true, }, + "gslb_geodb_format": { + Type: schema.TypeString, + Computed: true, + }, + "has_parent": { + Type: schema.TypeString, + Computed: true, + }, "is_federated": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_fileservice.go b/avi/datasource_avi_fileservice.go index 4f844ae21..608b7953b 100755 --- a/avi/datasource_avi_fileservice.go +++ b/avi/datasource_avi_fileservice.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go index 84f1992d6..73ad3cfcc 100644 --- a/avi/datasource_avi_gslb.go +++ b/avi/datasource_avi_gslb.go @@ -13,6 +13,11 @@ func dataSourceAviGslb() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "auto_tune_send_interval": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceAutoTuneSendIntervalSchema(), + }, "clear_on_max_retries": { Type: schema.TypeString, Computed: true, @@ -48,10 +53,19 @@ func dataSourceAviGslb() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "gs_member_fqdn_resolution_on_se": { + Type: schema.TypeString, + Computed: true, + }, "is_federated": { Type: schema.TypeString, Computed: true, }, + "leader_change_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceLeaderChangeInfoSchema(), + }, "leader_cluster_uuid": { Type: schema.TypeString, Computed: true, @@ -65,11 +79,6 @@ func dataSourceAviGslb() *schema.Resource { Optional: true, Computed: true, }, - "replication_policy": { - Type: schema.TypeSet, - Computed: true, - Elem: ResourceReplicationPolicySchema(), - }, "send_interval": { Type: schema.TypeString, Computed: true, @@ -78,6 +87,10 @@ func dataSourceAviGslb() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "short_probe_interval": { + Type: schema.TypeString, + Computed: true, + }, "sites": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_gslbcrmruntime.go b/avi/datasource_avi_gslbcrmruntime.go new file mode 100644 index 000000000..3cd24022e --- /dev/null +++ b/avi/datasource_avi_gslbcrmruntime.go @@ -0,0 +1,71 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviGslbCRMRuntime() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviGslbCRMRuntimeRead, + Schema: map[string]*schema.Schema{ + "cluster_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "events": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceEventInfoSchema(), + }, + "fds_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceFdsInfoSchema(), + }, + "local_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceLocalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "remote_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "replication_policy": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceReplicationPolicySchema(), + }, + "site_name": { + Type: schema.TypeString, + Computed: true, + }, + "status_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_gslbhsmruntime.go b/avi/datasource_avi_gslbhsmruntime.go new file mode 100644 index 000000000..3bdfe35d8 --- /dev/null +++ b/avi/datasource_avi_gslbhsmruntime.go @@ -0,0 +1,69 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviGslbHSMRuntime() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviGslbHSMRuntimeRead, + Schema: map[string]*schema.Schema{ + "cluster_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "enabled": { + Type: schema.TypeString, + Computed: true, + }, + "events": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceEventInfoSchema(), + }, + "local_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceLocalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "oper_status": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "remote_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "send_interval": { + Type: schema.TypeString, + Computed: true, + }, + "site_name": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_gslbservice.go b/avi/datasource_avi_gslbservice.go index 6347cd351..c52c05565 100644 --- a/avi/datasource_avi_gslbservice.go +++ b/avi/datasource_avi_gslbservice.go @@ -62,6 +62,10 @@ func dataSourceAviGslbService() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "include_additional_records": { + Type: schema.TypeString, + Computed: true, + }, "is_federated": { Type: schema.TypeString, Computed: true, @@ -92,6 +96,10 @@ func dataSourceAviGslbService() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "record_type": { + Type: schema.TypeString, + Computed: true, + }, "resolve_cname": { Type: schema.TypeString, Computed: true, @@ -122,6 +130,10 @@ func dataSourceAviGslbService() *schema.Resource { Optional: true, Computed: true, }, + "vrf_uuid_for_gs": { + Type: schema.TypeString, + Computed: true, + }, "wildcard_match": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_gslbsmruntime.go b/avi/datasource_avi_gslbsmruntime.go new file mode 100644 index 000000000..339b79389 --- /dev/null +++ b/avi/datasource_avi_gslbsmruntime.go @@ -0,0 +1,119 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviGslbSMRuntime() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviGslbSMRuntimeRead, + Schema: map[string]*schema.Schema{ + "cluster_leader": { + Type: schema.TypeString, + Computed: true, + }, + "cluster_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "controller_size": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceControllerSizeSchema(), + }, + "dns_configs": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceDNSConfigSchema(), + }, + "dns_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceGslbDnsInfoSchema(), + }, + "enabled": { + Type: schema.TypeString, + Computed: true, + }, + "events": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceEventInfoSchema(), + }, + "health_monitor_info": { + Type: schema.TypeString, + Computed: true, + }, + "leader_cluster_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "member_type": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "node_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "num_of_retries": { + Type: schema.TypeString, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "oper_status": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "remote_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "role": { + Type: schema.TypeString, + Computed: true, + }, + "site_name": { + Type: schema.TypeString, + Computed: true, + }, + "site_type": { + Type: schema.TypeString, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Computed: true, + }, + "sw_version": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "view_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_hardwaresecuritymodulegroup.go b/avi/datasource_avi_hardwaresecuritymodulegroup.go index 049f2bda3..203929ae1 100644 --- a/avi/datasource_avi_hardwaresecuritymodulegroup.go +++ b/avi/datasource_avi_hardwaresecuritymodulegroup.go @@ -9,6 +9,11 @@ func dataSourceAviHardwareSecurityModuleGroup() *schema.Resource { return &schema.Resource{ Read: ResourceAviHardwareSecurityModuleGroupRead, Schema: map[string]*schema.Schema{ + "ca_certs": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceSSLCertificateSchema(), + }, "configpb_attributes": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_healthmonitor.go b/avi/datasource_avi_healthmonitor.go index f79f17815..fa8e6511e 100644 --- a/avi/datasource_avi_healthmonitor.go +++ b/avi/datasource_avi_healthmonitor.go @@ -55,6 +55,16 @@ func dataSourceAviHealthMonitor() *schema.Resource { Computed: true, Elem: ResourceHealthMonitorFtpSchema(), }, + "http2_monitor": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceHealthMonitorHttpSchema(), + }, + "http2s_monitor": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceHealthMonitorHttpSchema(), + }, "http_monitor": { Type: schema.TypeSet, Computed: true, @@ -94,6 +104,11 @@ func dataSourceAviHealthMonitor() *schema.Resource { Computed: true, Elem: ResourceRoleFilterMatchLabelSchema(), }, + "monitor_ip": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, "monitor_port": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_image.go b/avi/datasource_avi_image.go index ce5cb0655..59d6ceab1 100644 --- a/avi/datasource_avi_image.go +++ b/avi/datasource_avi_image.go @@ -27,6 +27,11 @@ func dataSourceAviImage() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "dryrun_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourcePackageDetailsSchema(), + }, "duration": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_ipreputationdb.go b/avi/datasource_avi_ipreputationdb.go index 9219ad2cd..f6f066d28 100644 --- a/avi/datasource_avi_ipreputationdb.go +++ b/avi/datasource_avi_ipreputationdb.go @@ -14,6 +14,11 @@ func dataSourceAviIPReputationDB() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "base_file_v6_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "configpb_attributes": { Type: schema.TypeSet, Computed: true, @@ -28,6 +33,11 @@ func dataSourceAviIPReputationDB() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "incremental_file_v6_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "markers": { Type: schema.TypeList, Computed: true, @@ -53,6 +63,10 @@ func dataSourceAviIPReputationDB() *schema.Resource { Optional: true, Computed: true, }, + "v6_version": { + Type: schema.TypeString, + Computed: true, + }, "vendor": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_licenseledgerdetails.go b/avi/datasource_avi_licenseledgerdetails.go index c1fb940cc..6bb9ceb4e 100644 --- a/avi/datasource_avi_licenseledgerdetails.go +++ b/avi/datasource_avi_licenseledgerdetails.go @@ -14,16 +14,30 @@ func dataSourceAviLicenseLedgerDetails() *schema.Resource { Computed: true, Elem: ResourceLicenseInfoSchema(), }, + "se_group_infos": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceSeGroupInfoSchema(), + }, "se_infos": { Type: schema.TypeList, Computed: true, Elem: ResourceLicenseInfoSchema(), }, + "tenant_infos": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceLicenseReservationInfoSchema(), + }, "tier_usages": { Type: schema.TypeList, Computed: true, Elem: ResourceLicenseTierUsageSchema(), }, + "total_licenses_reserved": { + Type: schema.TypeString, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_licensestatus.go b/avi/datasource_avi_licensestatus.go index 58fa91685..119d31744 100644 --- a/avi/datasource_avi_licensestatus.go +++ b/avi/datasource_avi_licensestatus.go @@ -14,10 +14,6 @@ func dataSourceAviLicenseStatus() *schema.Resource { Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "essentials_enforced_at": { - Type: schema.TypeString, - Computed: true, - }, "saas_status": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_localworkerfdsversion.go b/avi/datasource_avi_localworkerfdsversion.go new file mode 100644 index 000000000..bad8ff4fa --- /dev/null +++ b/avi/datasource_avi_localworkerfdsversion.go @@ -0,0 +1,37 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviLocalWorkerFdsVersion() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviLocalWorkerFdsVersionRead, + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timeline": { + Type: schema.TypeString, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "version": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_pool.go b/avi/datasource_avi_pool.go index 7fbb2ffd3..83e543aae 100644 --- a/avi/datasource_avi_pool.go +++ b/avi/datasource_avi_pool.go @@ -122,7 +122,7 @@ func dataSourceAviPool() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "graceful_disable_timeout": { + "graceful_disable_timeout_sec": { Type: schema.TypeString, Computed: true, }, @@ -130,6 +130,10 @@ func dataSourceAviPool() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "gslb_pool_type": { + Type: schema.TypeString, + Computed: true, + }, "gslb_sp_enabled": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_pool_server.go b/avi/datasource_avi_pool_server.go index 5cf847499..fde234cc4 100644 --- a/avi/datasource_avi_pool_server.go +++ b/avi/datasource_avi_pool_server.go @@ -50,6 +50,11 @@ func dataSourceAviServer() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "health_monitor_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "hostname": { Type: schema.TypeString, Computed: true, @@ -95,6 +100,11 @@ func dataSourceAviServer() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "srv_rdata": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceGslbServiceSrvRdataSchema(), + }, "static": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_ratelimitconfiguration.go b/avi/datasource_avi_ratelimitconfiguration.go new file mode 100644 index 000000000..8bda4ed64 --- /dev/null +++ b/avi/datasource_avi_ratelimitconfiguration.go @@ -0,0 +1,60 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviRateLimitConfiguration() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviRateLimitConfigurationRead, + Schema: map[string]*schema.Schema{ + "burst": { + Type: schema.TypeString, + Computed: true, + }, + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "http_methods": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "resource": { + Type: schema.TypeString, + Computed: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "token_refill_rate": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceTokenRefillRateSchema(), + }, + "type": { + Type: schema.TypeString, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_retentionpolicy.go b/avi/datasource_avi_retentionpolicy.go new file mode 100644 index 000000000..e41dc7d57 --- /dev/null +++ b/avi/datasource_avi_retentionpolicy.go @@ -0,0 +1,48 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviRetentionPolicy() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviRetentionPolicyRead, + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeString, + Computed: true, + }, + "history": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceRetentionSummarySchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "policy": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourcePolicySpecSchema(), + }, + "summary": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceRetentionSummarySchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_rmcloudopsproto.go b/avi/datasource_avi_rmcloudopsproto.go index 72c785072..340005974 100644 --- a/avi/datasource_avi_rmcloudopsproto.go +++ b/avi/datasource_avi_rmcloudopsproto.go @@ -26,6 +26,10 @@ func dataSourceAviRmCloudOpsProto() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "se_create_limit_reached": { + Type: schema.TypeString, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go index e9b337cd7..c753be545 100644 --- a/avi/datasource_avi_serviceenginegroup.go +++ b/avi/datasource_avi_serviceenginegroup.go @@ -45,6 +45,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "arp_cache_timeout": { + Type: schema.TypeString, + Computed: true, + }, "async_ssl": { Type: schema.TypeString, Computed: true, @@ -62,15 +66,27 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeInt}, }, + "auto_rebalance_cool_down_time": { + Type: schema.TypeString, + Computed: true, + }, "auto_rebalance_criteria": { Type: schema.TypeList, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "auto_rebalance_dry_run_enabled": { + Type: schema.TypeString, + Computed: true, + }, "auto_rebalance_interval": { Type: schema.TypeString, Computed: true, }, + "auto_rebalance_raise_events_for_actions": { + Type: schema.TypeString, + Computed: true, + }, "auto_redistribute_active_standby_load": { Type: schema.TypeString, Computed: true, @@ -189,6 +205,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "disable_qat_bulk_crypto": { + Type: schema.TypeString, + Computed: true, + }, "disable_se_memory_check": { Type: schema.TypeString, Computed: true, @@ -273,6 +293,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_qat": { + Type: schema.TypeString, + Computed: true, + }, "ephemeral_portrange_end": { Type: schema.TypeString, Computed: true, @@ -397,6 +421,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Computed: true, Elem: ResourceKniPortRangeSchema(), }, + "kv_val_max_len": { + Type: schema.TypeString, + Computed: true, + }, "l7_conns_per_core": { Type: schema.TypeString, Computed: true, @@ -422,6 +450,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "license_quota": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceQuotaConfigSchema(), + }, "license_tier": { Type: schema.TypeString, Computed: true, @@ -507,6 +540,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "max_cpu_load_adaptive_sampling": { + Type: schema.TypeString, + Computed: true, + }, "max_cpu_usage": { Type: schema.TypeString, Computed: true, @@ -605,6 +642,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Optional: true, Computed: true, }, + "nd6_cache_timeout": { + Type: schema.TypeString, + Computed: true, + }, "netlink_poller_threads": { Type: schema.TypeString, Computed: true, @@ -650,6 +691,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Computed: true, Elem: ResourceObjSyncConfigSchema(), }, + "objsync_mode": { + Type: schema.TypeString, + Computed: true, + }, "objsync_port": { Type: schema.TypeString, Computed: true, @@ -699,6 +744,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "pre_upgrade_se_available_mem_threshold": { + Type: schema.TypeString, + Computed: true, + }, "realtime_se_metrics": { Type: schema.TypeSet, Computed: true, @@ -712,6 +761,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "reserved_configuration": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceReservedConfigurationSchema(), + }, "resync_time_interval": { Type: schema.TypeString, Computed: true, @@ -720,6 +774,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "sdb_key_timeout": { + Type: schema.TypeString, + Computed: true, + }, "sdb_pipeline_size": { Type: schema.TypeString, Computed: true, @@ -830,6 +888,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "se_kernel_rss": { + Type: schema.TypeString, + Computed: true, + }, "se_kni_burst_factor": { Type: schema.TypeString, Computed: true, @@ -1056,10 +1118,6 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "use_objsync": { - Type: schema.TypeString, - Computed: true, - }, "use_standard_alb": { Type: schema.TypeString, Computed: true, @@ -1183,6 +1241,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "vsphere_storage_policies": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceVsphereStoragePolicySchema(), + }, "vss_placement": { Type: schema.TypeSet, Computed: true, @@ -1200,6 +1263,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "waf_use_jit_for_pcre": { + Type: schema.TypeString, + Computed: true, + }, }, } } diff --git a/avi/datasource_avi_sslprofile.go b/avi/datasource_avi_sslprofile.go index 9a44e06ec..dd60bb88f 100644 --- a/avi/datasource_avi_sslprofile.go +++ b/avi/datasource_avi_sslprofile.go @@ -18,6 +18,10 @@ func dataSourceAviSSLProfile() *schema.Resource { Computed: true, Elem: ResourceSSLVersionSchema(), }, + "allow_legacy_renegotiation": { + Type: schema.TypeString, + Computed: true, + }, "cipher_enums": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go index 201bc4339..a5220e19f 100644 --- a/avi/datasource_avi_systemconfiguration.go +++ b/avi/datasource_avi_systemconfiguration.go @@ -14,6 +14,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Computed: true, Elem: ResourceAdminAuthConfigurationSchema(), }, + "avi_email_login_password": { + Type: schema.TypeString, + Computed: true, + }, "common_criteria_mode": { Type: schema.TypeString, Computed: true, @@ -59,7 +63,7 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "enable_telemetry": { + "enable_license_quota": { Type: schema.TypeString, Computed: true, }, @@ -80,6 +84,15 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "legacy_ssl_support": { + Type: schema.TypeString, + Computed: true, + }, + "license_quota": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceQuotaConfigSchema(), + }, "linux_configuration": { Type: schema.TypeSet, Computed: true, @@ -113,6 +126,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "sddcmanager_fqdn": { + Type: schema.TypeString, + Computed: true, + }, "secure_channel_configuration": { Type: schema.TypeSet, Computed: true, @@ -133,11 +150,37 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "sync_dns_to_se": { + Type: schema.TypeString, + Computed: true, + }, + "sync_kex_host_to_se": { + Type: schema.TypeString, + Computed: true, + }, + "sync_syslog_to_se": { + Type: schema.TypeString, + Computed: true, + }, + "syslog_servers": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, + "telemetry_configuration": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceTelemetryConfigurationSchema(), + }, "trusted_host_profiles_refs": { Type: schema.TypeList, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "truststore_pkiprofile_ref": { + Type: schema.TypeString, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_systemreport.go b/avi/datasource_avi_systemreport.go index 97af21a7e..8b5ecc38d 100644 --- a/avi/datasource_avi_systemreport.go +++ b/avi/datasource_avi_systemreport.go @@ -21,6 +21,11 @@ func dataSourceAviSystemReport() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "dryrun_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceDryrunInfoSchema(), + }, "events": { Type: schema.TypeList, Computed: true, @@ -35,6 +40,10 @@ func dataSourceAviSystemReport() *schema.Resource { Optional: true, Computed: true, }, + "operation": { + Type: schema.TypeString, + Computed: true, + }, "readiness_reports": { Type: schema.TypeList, Computed: true, @@ -64,6 +73,10 @@ func dataSourceAviSystemReport() *schema.Resource { Optional: true, Computed: true, }, + "type": { + Type: schema.TypeString, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_taskjournal.go b/avi/datasource_avi_taskjournal.go index 6dc41d82d..e5029f67e 100644 --- a/avi/datasource_avi_taskjournal.go +++ b/avi/datasource_avi_taskjournal.go @@ -45,6 +45,11 @@ func dataSourceAviTaskJournal() *schema.Resource { Computed: true, Elem: ResourceJournalSummarySchema(), }, + "tasks": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceJournalTaskSchema(), + }, "tenant_ref": { Type: schema.TypeString, Optional: true, @@ -55,6 +60,11 @@ func dataSourceAviTaskJournal() *schema.Resource { Optional: true, Computed: true, }, + "warnings": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceJournalErrorSchema(), + }, }, } } diff --git a/avi/datasource_avi_techsupport.go b/avi/datasource_avi_techsupport.go new file mode 100644 index 000000000..54a19af5a --- /dev/null +++ b/avi/datasource_avi_techsupport.go @@ -0,0 +1,115 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviTechSupport() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviTechSupportRead, + Schema: map[string]*schema.Schema{ + "case_number": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "duration": { + Type: schema.TypeString, + Computed: true, + }, + "end_time": { + Type: schema.TypeString, + Computed: true, + }, + "errors": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "level": { + Type: schema.TypeString, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "node": { + Type: schema.TypeString, + Computed: true, + }, + "obj_name": { + Type: schema.TypeString, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Computed: true, + }, + "output": { + Type: schema.TypeString, + Computed: true, + }, + "params": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceTechSupportParamsSchema(), + }, + "progress": { + Type: schema.TypeString, + Computed: true, + }, + "size": { + Type: schema.TypeString, + Computed: true, + }, + "start_time": { + Type: schema.TypeString, + Computed: true, + }, + "state": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceTechSupportStateSchema(), + }, + "tasks": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceTechSupportEventMapSchema(), + }, + "tasks_completed": { + Type: schema.TypeString, + Computed: true, + }, + "techsupport_readiness": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceReadinessCheckObjSchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "total_tasks": { + Type: schema.TypeString, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "warnings": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} diff --git a/avi/datasource_avi_techsupportmessage.go b/avi/datasource_avi_techsupportmessage.go new file mode 100644 index 000000000..a0a30b4c5 --- /dev/null +++ b/avi/datasource_avi_techsupportmessage.go @@ -0,0 +1,26 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviTechSupportMessage() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviTechSupportMessageRead, + Schema: map[string]*schema.Schema{ + "status": { + Type: schema.TypeString, + Computed: true, + }, + "status_code": { + Type: schema.TypeString, + Computed: true, + }, + "tech_support_ref": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_techsupportprofile.go b/avi/datasource_avi_techsupportprofile.go new file mode 100644 index 000000000..af3eeb9fc --- /dev/null +++ b/avi/datasource_avi_techsupportprofile.go @@ -0,0 +1,53 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviTechSupportProfile() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviTechSupportProfileRead, + Schema: map[string]*schema.Schema{ + "archive_rules": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceArchiveRulesSchema(), + }, + "event_params": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceTechSupportEventParamsSchema(), + }, + "file_size_threshold": { + Type: schema.TypeString, + Computed: true, + }, + "max_disk_size_percent": { + Type: schema.TypeString, + Computed: true, + }, + "min_free_disk_required": { + Type: schema.TypeString, + Computed: true, + }, + "no_of_techsupport_retentions": { + Type: schema.TypeString, + Computed: true, + }, + "simultaneous_invocations": { + Type: schema.TypeString, + Computed: true, + }, + "task_timeout": { + Type: schema.TypeString, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_trustedhostprofile.go b/avi/datasource_avi_trustedhostprofile.go index 705cb6998..7a21732c8 100644 --- a/avi/datasource_avi_trustedhostprofile.go +++ b/avi/datasource_avi_trustedhostprofile.go @@ -17,7 +17,7 @@ func dataSourceAviTrustedHostProfile() *schema.Resource { "hosts": { Type: schema.TypeList, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: ResourceTrustedHostSchema(), }, "name": { Type: schema.TypeString, diff --git a/avi/datasource_avi_upgradeprofile.go b/avi/datasource_avi_upgradeprofile.go new file mode 100644 index 000000000..fddad0433 --- /dev/null +++ b/avi/datasource_avi_upgradeprofile.go @@ -0,0 +1,44 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + +func dataSourceAviUpgradeProfile() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviUpgradeProfileRead, + Schema: map[string]*schema.Schema{ + "controller_params": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceControllerParamsSchema(), + }, + "dry_run": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceDryRunParamsSchema(), + }, + "image": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceImageParamsSchema(), + }, + "pre_checks": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourcePreChecksParamsSchema(), + }, + "service_engine": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceServiceEngineParamsSchema(), + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/datasource_avi_upgradestatusinfo.go b/avi/datasource_avi_upgradestatusinfo.go index b561e94e3..044701a3b 100644 --- a/avi/datasource_avi_upgradestatusinfo.go +++ b/avi/datasource_avi_upgradestatusinfo.go @@ -21,6 +21,11 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "dryrun_info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceDryrunInfoSchema(), + }, "duration": { Type: schema.TypeString, Computed: true, @@ -105,6 +110,10 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "prev_remote_image_ref": { + Type: schema.TypeString, + Computed: true, + }, "previous_image_ref": { Type: schema.TypeString, Computed: true, @@ -134,6 +143,10 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "remote_image_ref": { + Type: schema.TypeString, + Computed: true, + }, "se_patch_image_path": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_user.go b/avi/datasource_avi_user.go index a9a5b9a69..1a51bdae3 100644 --- a/avi/datasource_avi_user.go +++ b/avi/datasource_avi_user.go @@ -30,6 +30,10 @@ func dataSourceAviUser() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_config_warnings": { + Type: schema.TypeString, + Computed: true, + }, "full_name": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_virtualservice.go b/avi/datasource_avi_virtualservice.go index f7aaba730..371693d83 100644 --- a/avi/datasource_avi_virtualservice.go +++ b/avi/datasource_avi_virtualservice.go @@ -224,11 +224,6 @@ func dataSourceAviVirtualService() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "nsx_securitygroup": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, "oauth_vs_config": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_vsdatascriptset.go b/avi/datasource_avi_vsdatascriptset.go index 2dc035f62..77bfb59c6 100644 --- a/avi/datasource_avi_vsdatascriptset.go +++ b/avi/datasource_avi_vsdatascriptset.go @@ -75,6 +75,16 @@ func dataSourceAviVSDataScriptSet() *schema.Resource { Computed: true, Elem: ResourceRateLimiterSchema(), }, + "snat_ip6s": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, + "snat_ips": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, "ssl_key_certificate_refs": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_vsvip.go b/avi/datasource_avi_vsvip.go index 2f5612ec9..c6084c50a 100644 --- a/avi/datasource_avi_vsvip.go +++ b/avi/datasource_avi_vsvip.go @@ -65,10 +65,6 @@ func dataSourceAviVsVip() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "use_standard_alb": { - Type: schema.TypeString, - Computed: true, - }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_wafpolicy.go b/avi/datasource_avi_wafpolicy.go index 9029f10b9..19aed0335 100644 --- a/avi/datasource_avi_wafpolicy.go +++ b/avi/datasource_avi_wafpolicy.go @@ -66,10 +66,18 @@ func dataSourceAviWafPolicy() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_streaming": { + Type: schema.TypeString, + Computed: true, + }, "failure_mode": { Type: schema.TypeString, Computed: true, }, + "fixed_sampling_rate": { + Type: schema.TypeString, + Computed: true, + }, "geo_db_ref": { Type: schema.TypeString, Computed: true, @@ -121,12 +129,16 @@ func dataSourceAviWafPolicy() *schema.Resource { Computed: true, Elem: ResourceWafPolicyRequiredDataFileSchema(), }, + "sampling_mode": { + Type: schema.TypeString, + Computed: true, + }, "tenant_ref": { Type: schema.TypeString, Optional: true, Computed: true, }, - "updated_crs_rules_in_detection_mode": { + "use_evaluation_mode_on_crs_update": { Type: schema.TypeString, Computed: true, }, diff --git a/avi/datasource_avi_wafpolicypsmgroup.go b/avi/datasource_avi_wafpolicypsmgroup.go index 7c392840d..1e3c90eec 100644 --- a/avi/datasource_avi_wafpolicypsmgroup.go +++ b/avi/datasource_avi_wafpolicypsmgroup.go @@ -9,6 +9,11 @@ func dataSourceAviWafPolicyPSMGroup() *schema.Resource { return &schema.Resource{ Read: ResourceAviWafPolicyPSMGroupRead, Schema: map[string]*schema.Schema{ + "completely_described_match_elements": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "configpb_attributes": { Type: schema.TypeSet, Computed: true, @@ -30,6 +35,10 @@ func dataSourceAviWafPolicyPSMGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "location_match_miss_action": { + Type: schema.TypeString, + Computed: true, + }, "locations": { Type: schema.TypeList, Computed: true, diff --git a/avi/datasource_avi_webapput.go b/avi/datasource_avi_webapput.go index c66a430fd..d71982729 100644 --- a/avi/datasource_avi_webapput.go +++ b/avi/datasource_avi_webapput.go @@ -9,24 +9,29 @@ func dataSourceAviWebappUT() *schema.Resource { return &schema.Resource{ Read: ResourceAviWebappUTRead, Schema: map[string]*schema.Schema{ + "cloud_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "configpb_attributes": { Type: schema.TypeSet, Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "default_first_int": { + "default_fifth_int": { Type: schema.TypeString, Computed: true, }, - "default_second_int": { + "default_first_int": { Type: schema.TypeString, Computed: true, }, - "default_string": { + "default_fourth_int": { Type: schema.TypeString, Computed: true, }, - "default_third_int": { + "default_string": { Type: schema.TypeString, Computed: true, }, diff --git a/avi/diff_suppress_func.go b/avi/diff_suppress_func.go index ff9ba2281..fa5d64129 100644 --- a/avi/diff_suppress_func.go +++ b/avi/diff_suppress_func.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/provider.go b/avi/provider.go index d62eaf0d4..5199c276e 100644 --- a/avi/provider.go +++ b/avi/provider.go @@ -71,244 +71,264 @@ func Provider() *schema.Provider { }, }, DataSourcesMap: map[string]*schema.Resource{ + "avi_autoscalelaunchconfig": dataSourceAviAutoScaleLaunchConfig(), + "avi_serverautoscalepolicy": dataSourceAviServerAutoScalePolicy(), "avi_rmcloudopsproto": dataSourceAviRmCloudOpsProto(), - "avi_snmptrapprofile": dataSourceAviSnmpTrapProfile(), - "avi_gslb": dataSourceAviGslb(), - "avi_gslbservice": dataSourceAviGslbService(), - "avi_gslbgeodbprofile": dataSourceAviGslbGeoDbProfile(), - "avi_healthmonitor": dataSourceAviHealthMonitor(), - "avi_albservicesconfig": dataSourceAviALBServicesConfig(), - "avi_network": dataSourceAviNetwork(), - "avi_federationcheckpoint": dataSourceAviFederationCheckpoint(), - "avi_siteversion": dataSourceAviSiteVersion(), - "avi_networkservice": dataSourceAviNetworkService(), - "avi_securitypolicy": dataSourceAviSecurityPolicy(), "avi_statediffoperation": dataSourceAviStatediffOperation(), "avi_statediffsnapshot": dataSourceAviStatediffSnapshot(), - "avi_csrfpolicy": dataSourceAviCSRFPolicy(), - "avi_vsvip": dataSourceAviVsVip(), - "avi_virtualservice": dataSourceAviVirtualService(), - "avi_serviceenginegroup": dataSourceAviServiceEngineGroup(), - "avi_errorpagebody": dataSourceAviErrorPageBody(), - "avi_errorpageprofile": dataSourceAviErrorPageProfile(), - "avi_fileobject": dataSourceAviFileObject(), + "avi_analyticsprofile": dataSourceAviAnalyticsProfile(), + "avi_gslbsmruntime": dataSourceAviGslbSMRuntime(), + "avi_gslbcrmruntime": dataSourceAviGslbCRMRuntime(), + "avi_gslbhsmruntime": dataSourceAviGslbHSMRuntime(), + "avi_localworkerfdsversion": dataSourceAviLocalWorkerFdsVersion(), "avi_httppolicyset": dataSourceAviHTTPPolicySet(), - "avi_systemlimits": dataSourceAviSystemLimits(), - "avi_controllerportalregistration": dataSourceAviControllerPortalRegistration(), - "avi_upgradestatusinfo": dataSourceAviUpgradeStatusInfo(), - "avi_upgradestatussummary": dataSourceAviUpgradeStatusSummary(), - "avi_licenseledgerdetails": dataSourceAviLicenseLedgerDetails(), - "avi_ssopolicy": dataSourceAviSSOPolicy(), "avi_systemreport": dataSourceAviSystemReport(), "avi_taskjournal": dataSourceAviTaskJournal(), "avi_authprofile": dataSourceAviAuthProfile(), "avi_authmappingprofile": dataSourceAviAuthMappingProfile(), "avi_serviceauthprofile": dataSourceAviServiceAuthProfile(), - "avi_controllerproperties": dataSourceAviControllerProperties(), + "avi_icapprofile": dataSourceAviIcapProfile(), + "avi_ipreputationdb": dataSourceAviIPReputationDB(), + "avi_snmptrapprofile": dataSourceAviSnmpTrapProfile(), + "avi_dnspolicy": dataSourceAviDnsPolicy(), "avi_l4policyset": dataSourceAviL4PolicySet(), - "avi_trustedhostprofile": dataSourceAviTrustedHostProfile(), - "avi_systemconfiguration": dataSourceAviSystemConfiguration(), - "avi_controllersite": dataSourceAviControllerSite(), - "avi_alertsyslogconfig": dataSourceAviAlertSyslogConfig(), - "avi_alertemailconfig": dataSourceAviAlertEmailConfig(), - "avi_alertscriptconfig": dataSourceAviAlertScriptConfig(), - "avi_actiongroupconfig": dataSourceAviActionGroupConfig(), - "avi_alertconfig": dataSourceAviAlertConfig(), - "avi_inventoryfaultconfig": dataSourceAviInventoryFaultConfig(), - "avi_vrfcontext": dataSourceAviVrfContext(), - "avi_applicationprofile": dataSourceAviApplicationProfile(), + "avi_vsvip": dataSourceAviVsVip(), + "avi_virtualservice": dataSourceAviVirtualService(), "avi_ipaddrgroup": dataSourceAviIpAddrGroup(), "avi_stringgroup": dataSourceAviStringGroup(), "avi_microservicegroup": dataSourceAviMicroServiceGroup(), + "avi_gslb": dataSourceAviGslb(), + "avi_gslbservice": dataSourceAviGslbService(), + "avi_gslbgeodbprofile": dataSourceAviGslbGeoDbProfile(), + "avi_vrfcontext": dataSourceAviVrfContext(), + "avi_pool": dataSourceAviPool(), + "avi_prioritylabels": dataSourceAviPriorityLabels(), + "avi_poolgroupdeploymentpolicy": dataSourceAviPoolGroupDeploymentPolicy(), + "avi_poolgroup": dataSourceAviPoolGroup(), + "avi_botmapping": dataSourceAviBotMapping(), + "avi_botipreputationtypemapping": dataSourceAviBotIPReputationTypeMapping(), + "avi_botconfigconsolidator": dataSourceAviBotConfigConsolidator(), + "avi_botdetectionpolicy": dataSourceAviBotDetectionPolicy(), + "avi_geodb": dataSourceAviGeoDB(), + "avi_ipamdnsproviderprofile": dataSourceAviIpamDnsProviderProfile(), + "avi_customipamdnsprofile": dataSourceAviCustomIpamDnsProfile(), + "avi_vsgs": dataSourceAviVsGs(), + "avi_upgradestatusinfo": dataSourceAviUpgradeStatusInfo(), + "avi_upgradestatussummary": dataSourceAviUpgradeStatusSummary(), + "avi_csrfpolicy": dataSourceAviCSRFPolicy(), + "avi_networkservice": dataSourceAviNetworkService(), + "avi_serviceenginegroup": dataSourceAviServiceEngineGroup(), + "avi_ssopolicy": dataSourceAviSSOPolicy(), "avi_sslprofile": dataSourceAviSSLProfile(), "avi_certificatemanagementprofile": dataSourceAviCertificateManagementProfile(), "avi_sslkeyandcertificate": dataSourceAviSSLKeyAndCertificate(), "avi_pkiprofile": dataSourceAviPKIProfile(), + "avi_role": dataSourceAviRole(), + "avi_useraccountprofile": dataSourceAviUserAccountProfile(), + "avi_user": dataSourceAviUser(), + "avi_healthmonitor": dataSourceAviHealthMonitor(), + "avi_errorpagebody": dataSourceAviErrorPageBody(), + "avi_errorpageprofile": dataSourceAviErrorPageProfile(), + "avi_systemlimits": dataSourceAviSystemLimits(), "avi_tenant": dataSourceAviTenant(), - "avi_vsdatascriptset": dataSourceAviVSDataScriptSet(), + "avi_siteversion": dataSourceAviSiteVersion(), + "avi_hardwaresecuritymodulegroup": dataSourceAviHardwareSecurityModuleGroup(), + "avi_applicationpersistenceprofile": dataSourceAviApplicationPersistenceProfile(), + "avi_memorybalancerrequest": dataSourceAviMemoryBalancerRequest(), + "avi_alertsyslogconfig": dataSourceAviAlertSyslogConfig(), + "avi_alertemailconfig": dataSourceAviAlertEmailConfig(), + "avi_alertscriptconfig": dataSourceAviAlertScriptConfig(), + "avi_actiongroupconfig": dataSourceAviActionGroupConfig(), + "avi_alertconfig": dataSourceAviAlertConfig(), + "avi_inventoryfaultconfig": dataSourceAviInventoryFaultConfig(), "avi_cluster": dataSourceAviCluster(), "avi_clusterclouddetails": dataSourceAviClusterCloudDetails(), + "avi_retentionpolicy": dataSourceAviRetentionPolicy(), "avi_licensestatus": dataSourceAviLicenseStatus(), - "avi_role": dataSourceAviRole(), - "avi_useraccountprofile": dataSourceAviUserAccountProfile(), - "avi_user": dataSourceAviUser(), - "avi_analyticsprofile": dataSourceAviAnalyticsProfile(), - "avi_wafprofile": dataSourceAviWafProfile(), - "avi_wafcrs": dataSourceAviWafCRS(), - "avi_wafpolicypsmgroup": dataSourceAviWafPolicyPSMGroup(), - "avi_wafapplicationsignatureprovider": dataSourceAviWafApplicationSignatureProvider(), - "avi_wafpolicy": dataSourceAviWafPolicy(), - "avi_botmapping": dataSourceAviBotMapping(), - "avi_botipreputationtypemapping": dataSourceAviBotIPReputationTypeMapping(), - "avi_botconfigconsolidator": dataSourceAviBotConfigConsolidator(), - "avi_botdetectionpolicy": dataSourceAviBotDetectionPolicy(), - "avi_vsgs": dataSourceAviVsGs(), - "avi_pool": dataSourceAviPool(), - "avi_prioritylabels": dataSourceAviPriorityLabels(), - "avi_poolgroupdeploymentpolicy": dataSourceAviPoolGroupDeploymentPolicy(), - "avi_poolgroup": dataSourceAviPoolGroup(), - "avi_networksecuritypolicy": dataSourceAviNetworkSecurityPolicy(), + "avi_controllerproperties": dataSourceAviControllerProperties(), "avi_serviceengine": dataSourceAviServiceEngine(), - "avi_geodb": dataSourceAviGeoDB(), - "avi_icapprofile": dataSourceAviIcapProfile(), - "avi_hardwaresecuritymodulegroup": dataSourceAviHardwareSecurityModuleGroup(), - "avi_autoscalelaunchconfig": dataSourceAviAutoScaleLaunchConfig(), - "avi_serverautoscalepolicy": dataSourceAviServerAutoScalePolicy(), + "avi_network": dataSourceAviNetwork(), + "avi_networksecuritypolicy": dataSourceAviNetworkSecurityPolicy(), "avi_image": dataSourceAviImage(), - "avi_memorybalancerrequest": dataSourceAviMemoryBalancerRequest(), + "avi_securitypolicy": dataSourceAviSecurityPolicy(), + "avi_controllerportalregistration": dataSourceAviControllerPortalRegistration(), + "avi_applicationprofile": dataSourceAviApplicationProfile(), + "avi_albservicesjob": dataSourceAviALBServicesJob(), + "avi_jwtserverprofile": dataSourceAviJWTServerProfile(), + "avi_ratelimitconfiguration": dataSourceAviRateLimitConfiguration(), + "avi_apiratelimitprofile": dataSourceAviApiRateLimitProfile(), "avi_cloud": dataSourceAviCloud(), "avi_cloudconnectoruser": dataSourceAviCloudConnectorUser(), "avi_availabilityzone": dataSourceAviAvailabilityZone(), "avi_vcenterserver": dataSourceAviVCenterServer(), - "avi_networkprofile": dataSourceAviNetworkProfile(), - "avi_dnspolicy": dataSourceAviDnsPolicy(), - "avi_jwtserverprofile": dataSourceAviJWTServerProfile(), - "avi_albservicesjob": dataSourceAviALBServicesJob(), - "avi_nsxtsegmentruntime": dataSourceAviNsxtSegmentRuntime(), - "avi_ipamdnsproviderprofile": dataSourceAviIpamDnsProviderProfile(), - "avi_customipamdnsprofile": dataSourceAviCustomIpamDnsProfile(), "avi_backupconfiguration": dataSourceAviBackupConfiguration(), "avi_scheduler": dataSourceAviScheduler(), - "avi_ipreputationdb": dataSourceAviIPReputationDB(), - "avi_applicationpersistenceprofile": dataSourceAviApplicationPersistenceProfile(), + "avi_wafprofile": dataSourceAviWafProfile(), + "avi_wafcrs": dataSourceAviWafCRS(), + "avi_wafpolicypsmgroup": dataSourceAviWafPolicyPSMGroup(), + "avi_wafapplicationsignatureprovider": dataSourceAviWafApplicationSignatureProvider(), + "avi_wafpolicy": dataSourceAviWafPolicy(), + "avi_albservicesconfig": dataSourceAviALBServicesConfig(), + "avi_licenseledgerdetails": dataSourceAviLicenseLedgerDetails(), + "avi_fileobject": dataSourceAviFileObject(), + "avi_trustedhostprofile": dataSourceAviTrustedHostProfile(), + "avi_systemconfiguration": dataSourceAviSystemConfiguration(), + "avi_controllersite": dataSourceAviControllerSite(), + "avi_nsxtsegmentruntime": dataSourceAviNsxtSegmentRuntime(), "avi_natpolicy": dataSourceAviNatPolicy(), - "avi_webapput": dataSourceAviWebappUT(), - "avi_labelgroup": dataSourceAviLabelGroup(), - "avi_trafficcloneprofile": dataSourceAviTrafficCloneProfile(), + "avi_vsdatascriptset": dataSourceAviVSDataScriptSet(), + "avi_networkprofile": dataSourceAviNetworkProfile(), + "avi_webhook": dataSourceAviWebhook(), "avi_testsedatastorelevel1": dataSourceAviTestSeDatastoreLevel1(), "avi_testsedatastorelevel2": dataSourceAviTestSeDatastoreLevel2(), "avi_testsedatastorelevel3": dataSourceAviTestSeDatastoreLevel3(), - "avi_albservicesfileupload": dataSourceAviALBServicesFileUpload(), "avi_dynamicdnsrecord": dataSourceAviDynamicDnsRecord(), + "avi_techsupportmessage": dataSourceAviTechSupportMessage(), + "avi_techsupportprofile": dataSourceAviTechSupportProfile(), + "avi_techsupport": dataSourceAviTechSupport(), + "avi_albservicesfiledownload": dataSourceAviALBServicesFileDownload(), + "avi_labelgroup": dataSourceAviLabelGroup(), "avi_seproperties": dataSourceAviSeProperties(), "avi_cloudproperties": dataSourceAviCloudProperties(), - "avi_albservicesfiledownload": dataSourceAviALBServicesFileDownload(), + "avi_trafficcloneprofile": dataSourceAviTrafficCloneProfile(), + "avi_upgradeprofile": dataSourceAviUpgradeProfile(), "avi_protocolparser": dataSourceAviProtocolParser(), - "avi_webhook": dataSourceAviWebhook(), - "avi_backup": dataSourceAviBackup(), - "avi_securitymanagerdata": dataSourceAviSecurityManagerData(), "avi_tenantsystemconfiguration": dataSourceAviTenantSystemConfiguration(), + "avi_albservicesfileupload": dataSourceAviALBServicesFileUpload(), + "avi_webapput": dataSourceAviWebappUT(), + "avi_securitymanagerdata": dataSourceAviSecurityManagerData(), + "avi_backup": dataSourceAviBackup(), "avi_fileservice": dataSourceAviFileService(), "avi_server": dataSourceAviServer(), }, ResourcesMap: map[string]*schema.Resource{ + "avi_autoscalelaunchconfig": resourceAviAutoScaleLaunchConfig(), + "avi_serverautoscalepolicy": resourceAviServerAutoScalePolicy(), "avi_rmcloudopsproto": resourceAviRmCloudOpsProto(), - "avi_snmptrapprofile": resourceAviSnmpTrapProfile(), - "avi_gslb": resourceAviGslb(), - "avi_gslbservice": resourceAviGslbService(), - "avi_gslbgeodbprofile": resourceAviGslbGeoDbProfile(), - "avi_healthmonitor": resourceAviHealthMonitor(), - "avi_albservicesconfig": resourceAviALBServicesConfig(), - "avi_network": resourceAviNetwork(), - "avi_federationcheckpoint": resourceAviFederationCheckpoint(), - "avi_siteversion": resourceAviSiteVersion(), - "avi_networkservice": resourceAviNetworkService(), - "avi_securitypolicy": resourceAviSecurityPolicy(), "avi_statediffoperation": resourceAviStatediffOperation(), "avi_statediffsnapshot": resourceAviStatediffSnapshot(), - "avi_csrfpolicy": resourceAviCSRFPolicy(), - "avi_vsvip": resourceAviVsVip(), - "avi_virtualservice": resourceAviVirtualService(), - "avi_serviceenginegroup": resourceAviServiceEngineGroup(), - "avi_errorpagebody": resourceAviErrorPageBody(), - "avi_errorpageprofile": resourceAviErrorPageProfile(), - "avi_fileobject": resourceAviFileObject(), + "avi_analyticsprofile": resourceAviAnalyticsProfile(), + "avi_gslbsmruntime": resourceAviGslbSMRuntime(), + "avi_gslbcrmruntime": resourceAviGslbCRMRuntime(), + "avi_gslbhsmruntime": resourceAviGslbHSMRuntime(), + "avi_localworkerfdsversion": resourceAviLocalWorkerFdsVersion(), "avi_httppolicyset": resourceAviHTTPPolicySet(), - "avi_systemlimits": resourceAviSystemLimits(), - "avi_controllerportalregistration": resourceAviControllerPortalRegistration(), - "avi_upgradestatusinfo": resourceAviUpgradeStatusInfo(), - "avi_upgradestatussummary": resourceAviUpgradeStatusSummary(), - "avi_licenseledgerdetails": resourceAviLicenseLedgerDetails(), - "avi_ssopolicy": resourceAviSSOPolicy(), "avi_systemreport": resourceAviSystemReport(), "avi_taskjournal": resourceAviTaskJournal(), "avi_authprofile": resourceAviAuthProfile(), "avi_authmappingprofile": resourceAviAuthMappingProfile(), "avi_serviceauthprofile": resourceAviServiceAuthProfile(), - "avi_controllerproperties": resourceAviControllerProperties(), + "avi_icapprofile": resourceAviIcapProfile(), + "avi_ipreputationdb": resourceAviIPReputationDB(), + "avi_snmptrapprofile": resourceAviSnmpTrapProfile(), + "avi_dnspolicy": resourceAviDnsPolicy(), "avi_l4policyset": resourceAviL4PolicySet(), - "avi_trustedhostprofile": resourceAviTrustedHostProfile(), - "avi_systemconfiguration": resourceAviSystemConfiguration(), - "avi_controllersite": resourceAviControllerSite(), - "avi_alertsyslogconfig": resourceAviAlertSyslogConfig(), - "avi_alertemailconfig": resourceAviAlertEmailConfig(), - "avi_alertscriptconfig": resourceAviAlertScriptConfig(), - "avi_actiongroupconfig": resourceAviActionGroupConfig(), - "avi_alertconfig": resourceAviAlertConfig(), - "avi_inventoryfaultconfig": resourceAviInventoryFaultConfig(), - "avi_vrfcontext": resourceAviVrfContext(), - "avi_applicationprofile": resourceAviApplicationProfile(), + "avi_vsvip": resourceAviVsVip(), + "avi_virtualservice": resourceAviVirtualService(), "avi_ipaddrgroup": resourceAviIpAddrGroup(), "avi_stringgroup": resourceAviStringGroup(), "avi_microservicegroup": resourceAviMicroServiceGroup(), + "avi_gslb": resourceAviGslb(), + "avi_gslbservice": resourceAviGslbService(), + "avi_gslbgeodbprofile": resourceAviGslbGeoDbProfile(), + "avi_vrfcontext": resourceAviVrfContext(), + "avi_pool": resourceAviPool(), + "avi_prioritylabels": resourceAviPriorityLabels(), + "avi_poolgroupdeploymentpolicy": resourceAviPoolGroupDeploymentPolicy(), + "avi_poolgroup": resourceAviPoolGroup(), + "avi_botmapping": resourceAviBotMapping(), + "avi_botipreputationtypemapping": resourceAviBotIPReputationTypeMapping(), + "avi_botconfigconsolidator": resourceAviBotConfigConsolidator(), + "avi_botdetectionpolicy": resourceAviBotDetectionPolicy(), + "avi_geodb": resourceAviGeoDB(), + "avi_ipamdnsproviderprofile": resourceAviIpamDnsProviderProfile(), + "avi_customipamdnsprofile": resourceAviCustomIpamDnsProfile(), + "avi_vsgs": resourceAviVsGs(), + "avi_upgradestatusinfo": resourceAviUpgradeStatusInfo(), + "avi_upgradestatussummary": resourceAviUpgradeStatusSummary(), + "avi_csrfpolicy": resourceAviCSRFPolicy(), + "avi_networkservice": resourceAviNetworkService(), + "avi_serviceenginegroup": resourceAviServiceEngineGroup(), + "avi_ssopolicy": resourceAviSSOPolicy(), "avi_sslprofile": resourceAviSSLProfile(), "avi_certificatemanagementprofile": resourceAviCertificateManagementProfile(), "avi_sslkeyandcertificate": resourceAviSSLKeyAndCertificate(), "avi_pkiprofile": resourceAviPKIProfile(), + "avi_role": resourceAviRole(), + "avi_useraccountprofile": resourceAviUserAccountProfile(), + "avi_user": resourceAviUser(), + "avi_healthmonitor": resourceAviHealthMonitor(), + "avi_errorpagebody": resourceAviErrorPageBody(), + "avi_errorpageprofile": resourceAviErrorPageProfile(), + "avi_systemlimits": resourceAviSystemLimits(), "avi_tenant": resourceAviTenant(), - "avi_vsdatascriptset": resourceAviVSDataScriptSet(), + "avi_siteversion": resourceAviSiteVersion(), + "avi_hardwaresecuritymodulegroup": resourceAviHardwareSecurityModuleGroup(), + "avi_applicationpersistenceprofile": resourceAviApplicationPersistenceProfile(), + "avi_memorybalancerrequest": resourceAviMemoryBalancerRequest(), + "avi_alertsyslogconfig": resourceAviAlertSyslogConfig(), + "avi_alertemailconfig": resourceAviAlertEmailConfig(), + "avi_alertscriptconfig": resourceAviAlertScriptConfig(), + "avi_actiongroupconfig": resourceAviActionGroupConfig(), + "avi_alertconfig": resourceAviAlertConfig(), + "avi_inventoryfaultconfig": resourceAviInventoryFaultConfig(), "avi_cluster": resourceAviCluster(), "avi_clusterclouddetails": resourceAviClusterCloudDetails(), + "avi_retentionpolicy": resourceAviRetentionPolicy(), "avi_licensestatus": resourceAviLicenseStatus(), - "avi_role": resourceAviRole(), - "avi_useraccountprofile": resourceAviUserAccountProfile(), - "avi_user": resourceAviUser(), - "avi_analyticsprofile": resourceAviAnalyticsProfile(), - "avi_wafprofile": resourceAviWafProfile(), - "avi_wafcrs": resourceAviWafCRS(), - "avi_wafpolicypsmgroup": resourceAviWafPolicyPSMGroup(), - "avi_wafapplicationsignatureprovider": resourceAviWafApplicationSignatureProvider(), - "avi_wafpolicy": resourceAviWafPolicy(), - "avi_botmapping": resourceAviBotMapping(), - "avi_botipreputationtypemapping": resourceAviBotIPReputationTypeMapping(), - "avi_botconfigconsolidator": resourceAviBotConfigConsolidator(), - "avi_botdetectionpolicy": resourceAviBotDetectionPolicy(), - "avi_vsgs": resourceAviVsGs(), - "avi_pool": resourceAviPool(), - "avi_prioritylabels": resourceAviPriorityLabels(), - "avi_poolgroupdeploymentpolicy": resourceAviPoolGroupDeploymentPolicy(), - "avi_poolgroup": resourceAviPoolGroup(), - "avi_networksecuritypolicy": resourceAviNetworkSecurityPolicy(), + "avi_controllerproperties": resourceAviControllerProperties(), "avi_serviceengine": resourceAviServiceEngine(), - "avi_geodb": resourceAviGeoDB(), - "avi_icapprofile": resourceAviIcapProfile(), - "avi_hardwaresecuritymodulegroup": resourceAviHardwareSecurityModuleGroup(), - "avi_autoscalelaunchconfig": resourceAviAutoScaleLaunchConfig(), - "avi_serverautoscalepolicy": resourceAviServerAutoScalePolicy(), + "avi_network": resourceAviNetwork(), + "avi_networksecuritypolicy": resourceAviNetworkSecurityPolicy(), "avi_image": resourceAviImage(), - "avi_memorybalancerrequest": resourceAviMemoryBalancerRequest(), + "avi_securitypolicy": resourceAviSecurityPolicy(), + "avi_controllerportalregistration": resourceAviControllerPortalRegistration(), + "avi_applicationprofile": resourceAviApplicationProfile(), + "avi_albservicesjob": resourceAviALBServicesJob(), + "avi_jwtserverprofile": resourceAviJWTServerProfile(), + "avi_ratelimitconfiguration": resourceAviRateLimitConfiguration(), + "avi_apiratelimitprofile": resourceAviApiRateLimitProfile(), "avi_cloud": resourceAviCloud(), "avi_cloudconnectoruser": resourceAviCloudConnectorUser(), "avi_availabilityzone": resourceAviAvailabilityZone(), "avi_vcenterserver": resourceAviVCenterServer(), - "avi_networkprofile": resourceAviNetworkProfile(), - "avi_dnspolicy": resourceAviDnsPolicy(), - "avi_jwtserverprofile": resourceAviJWTServerProfile(), - "avi_albservicesjob": resourceAviALBServicesJob(), - "avi_nsxtsegmentruntime": resourceAviNsxtSegmentRuntime(), - "avi_ipamdnsproviderprofile": resourceAviIpamDnsProviderProfile(), - "avi_customipamdnsprofile": resourceAviCustomIpamDnsProfile(), "avi_backupconfiguration": resourceAviBackupConfiguration(), "avi_scheduler": resourceAviScheduler(), - "avi_ipreputationdb": resourceAviIPReputationDB(), - "avi_applicationpersistenceprofile": resourceAviApplicationPersistenceProfile(), + "avi_wafprofile": resourceAviWafProfile(), + "avi_wafcrs": resourceAviWafCRS(), + "avi_wafpolicypsmgroup": resourceAviWafPolicyPSMGroup(), + "avi_wafapplicationsignatureprovider": resourceAviWafApplicationSignatureProvider(), + "avi_wafpolicy": resourceAviWafPolicy(), + "avi_albservicesconfig": resourceAviALBServicesConfig(), + "avi_licenseledgerdetails": resourceAviLicenseLedgerDetails(), + "avi_fileobject": resourceAviFileObject(), + "avi_trustedhostprofile": resourceAviTrustedHostProfile(), + "avi_systemconfiguration": resourceAviSystemConfiguration(), + "avi_controllersite": resourceAviControllerSite(), + "avi_nsxtsegmentruntime": resourceAviNsxtSegmentRuntime(), "avi_natpolicy": resourceAviNatPolicy(), - "avi_webapput": resourceAviWebappUT(), - "avi_labelgroup": resourceAviLabelGroup(), - "avi_trafficcloneprofile": resourceAviTrafficCloneProfile(), + "avi_vsdatascriptset": resourceAviVSDataScriptSet(), + "avi_networkprofile": resourceAviNetworkProfile(), + "avi_webhook": resourceAviWebhook(), "avi_testsedatastorelevel1": resourceAviTestSeDatastoreLevel1(), "avi_testsedatastorelevel2": resourceAviTestSeDatastoreLevel2(), "avi_testsedatastorelevel3": resourceAviTestSeDatastoreLevel3(), - "avi_albservicesfileupload": resourceAviALBServicesFileUpload(), "avi_dynamicdnsrecord": resourceAviDynamicDnsRecord(), + "avi_techsupportmessage": resourceAviTechSupportMessage(), + "avi_techsupportprofile": resourceAviTechSupportProfile(), + "avi_techsupport": resourceAviTechSupport(), + "avi_albservicesfiledownload": resourceAviALBServicesFileDownload(), + "avi_labelgroup": resourceAviLabelGroup(), "avi_seproperties": resourceAviSeProperties(), "avi_cloudproperties": resourceAviCloudProperties(), - "avi_albservicesfiledownload": resourceAviALBServicesFileDownload(), + "avi_trafficcloneprofile": resourceAviTrafficCloneProfile(), + "avi_upgradeprofile": resourceAviUpgradeProfile(), "avi_protocolparser": resourceAviProtocolParser(), - "avi_webhook": resourceAviWebhook(), - "avi_backup": resourceAviBackup(), - "avi_securitymanagerdata": resourceAviSecurityManagerData(), "avi_tenantsystemconfiguration": resourceAviTenantSystemConfiguration(), + "avi_albservicesfileupload": resourceAviALBServicesFileUpload(), + "avi_webapput": resourceAviWebappUT(), + "avi_securitymanagerdata": resourceAviSecurityManagerData(), + "avi_backup": resourceAviBackup(), "avi_useraccount": resourceAviUserAccount(), "avi_fileservice": resourceAviFileService(), "avi_server": resourceAviServer(), diff --git a/avi/provider_test.go b/avi/provider_test.go index 73394a9bf..518b50e22 100644 --- a/avi/provider_test.go +++ b/avi/provider_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_alertconfig_test.go b/avi/resource_avi_alertconfig_test.go index 15ca83ed3..7b79da3e3 100644 --- a/avi/resource_avi_alertconfig_test.go +++ b/avi/resource_avi_alertconfig_test.go @@ -160,14 +160,6 @@ sys_event_rule { event_id = "VCENTER_ACCESS_SLOW" not_cond = false } -sys_event_rule { - event_id = "OPENSTACK_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "AWS_ACCESS_FAILURE" not_cond = false @@ -216,14 +208,6 @@ sys_event_rule { event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "DOCKER_UCP_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "VCA_ACCESS_FAILURE" not_cond = false @@ -240,14 +224,6 @@ sys_event_rule { event_id = "LS_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "MESOS_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "MESOS_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "CC_SE_CREATION_FAILURE" not_cond = false @@ -425,14 +401,6 @@ sys_event_rule { event_id = "VCENTER_ACCESS_SLOW" not_cond = false } -sys_event_rule { - event_id = "OPENSTACK_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "AWS_ACCESS_FAILURE" not_cond = false @@ -481,14 +449,6 @@ sys_event_rule { event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "DOCKER_UCP_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "VCA_ACCESS_FAILURE" not_cond = false @@ -505,14 +465,6 @@ sys_event_rule { event_id = "LS_IMAGE_UPLOAD_FAILURE" not_cond = false } -sys_event_rule { - event_id = "MESOS_ACCESS_FAILURE" - not_cond = false -} -sys_event_rule { - event_id = "MESOS_IMAGE_UPLOAD_FAILURE" - not_cond = false -} sys_event_rule { event_id = "CC_SE_CREATION_FAILURE" not_cond = false diff --git a/avi/resource_avi_alertscriptconfig.go b/avi/resource_avi_alertscriptconfig.go index 871b09040..4bc39cf36 100644 --- a/avi/resource_avi_alertscriptconfig.go +++ b/avi/resource_avi_alertscriptconfig.go @@ -36,6 +36,11 @@ func ResourceAlertScriptConfigSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateInteger, }, + "user_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_alertsyslogconfig_test.go b/avi/resource_avi_alertsyslogconfig_test.go index 815898791..5576c6ae5 100644 --- a/avi/resource_avi_alertsyslogconfig_test.go +++ b/avi/resource_avi_alertsyslogconfig_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ @@ -98,6 +98,11 @@ resource "avi_alertsyslogconfig" "testalertsyslogconfig" { name = "asyc-test" description= "test alert syslog" tenant_ref= "${data.avi_tenant.default_tenant.id}" + syslog_servers { + udp = "true" + syslog_server_port = "443" + syslog_server = "10.10.3.10" + } } ` @@ -110,5 +115,10 @@ resource "avi_alertsyslogconfig" "testalertsyslogconfig" { name = "asyc-abc" description= "test alert syslog" tenant_ref= "${data.avi_tenant.default_tenant.id}" + syslog_servers { + udp = "true" + syslog_server_port = "443" + syslog_server = "10.10.3.10" + } } ` diff --git a/avi/resource_avi_analyticsprofile.go b/avi/resource_avi_analyticsprofile.go index 48214838f..1dd13373a 100644 --- a/avi/resource_avi_analyticsprofile.go +++ b/avi/resource_avi_analyticsprofile.go @@ -183,6 +183,12 @@ func ResourceAnalyticsProfileSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "exclude_conn_drop_client_small_window_as_error": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "exclude_dns_policy_drop_as_significant": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_apiratelimitprofile.go b/avi/resource_avi_apiratelimitprofile.go new file mode 100644 index 000000000..013e2bf3d --- /dev/null +++ b/avi/resource_avi_apiratelimitprofile.go @@ -0,0 +1,108 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceApiRateLimitProfileSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, + "description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "enabled": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + "name": { + Type: schema.TypeString, + Required: true, + }, + "rate_limit_configuration_refs": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviApiRateLimitProfile() *schema.Resource { + return &schema.Resource{ + Create: resourceAviApiRateLimitProfileCreate, + Read: ResourceAviApiRateLimitProfileRead, + Update: resourceAviApiRateLimitProfileUpdate, + Delete: resourceAviApiRateLimitProfileDelete, + Schema: ResourceApiRateLimitProfileSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceApiRateLimitProfileImporter, + }, + } +} + +func ResourceApiRateLimitProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceApiRateLimitProfileSchema() + return ResourceImporter(d, m, "apiratelimitprofile", s) +} + +func ResourceAviApiRateLimitProfileRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceApiRateLimitProfileSchema() + err := APIRead(d, meta, "apiratelimitprofile", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviApiRateLimitProfileCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceApiRateLimitProfileSchema() + err := APICreate(d, meta, "apiratelimitprofile", s) + if err == nil { + err = ResourceAviApiRateLimitProfileRead(d, meta) + } + return err +} + +func resourceAviApiRateLimitProfileUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceApiRateLimitProfileSchema() + var err error + err = APIUpdate(d, meta, "apiratelimitprofile", s) + if err == nil { + err = ResourceAviApiRateLimitProfileRead(d, meta) + } + return err +} + +func resourceAviApiRateLimitProfileDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "apiratelimitprofile") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_applicationpersistenceprofile.go b/avi/resource_avi_applicationpersistenceprofile.go index bc553fea7..f9b74685e 100644 --- a/avi/resource_avi_applicationpersistenceprofile.go +++ b/avi/resource_avi_applicationpersistenceprofile.go @@ -27,6 +27,12 @@ func ResourceApplicationPersistenceProfileSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "diameter_app_persistence_profile": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDiameterAVPPersistenceProfileSchema(), + }, "hdr_persistence_profile": { Type: schema.TypeSet, Optional: true, @@ -64,6 +70,12 @@ func ResourceApplicationPersistenceProfileSchema() map[string]*schema.Schema { Type: schema.TypeString, Required: true, }, + "persistence_update_interval": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "server_hm_down_recovery": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_applicationprofile.go b/avi/resource_avi_applicationprofile.go index a7dc62db4..c19c2a2fa 100644 --- a/avi/resource_avi_applicationprofile.go +++ b/avi/resource_avi_applicationprofile.go @@ -36,6 +36,12 @@ func ResourceApplicationProfileSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "diameter_service_profile": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDiameterServiceApplicationProfileSchema(), + }, "dns_service_profile": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_applicationprofile_test.go b/avi/resource_avi_applicationprofile_test.go index c7d0c44bf..91d06aaca 100644 --- a/avi/resource_avi_applicationprofile_test.go +++ b/avi/resource_avi_applicationprofile_test.go @@ -161,6 +161,13 @@ resource "avi_applicationprofile" "testApplicationProfile" { mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id] } http2_profile { + http2_initial_window_size = "64" + max_http2_concurrent_streams_per_connection = "128" + max_http2_control_frames_per_connection = "1000" + max_http2_empty_data_frames_per_connection = "1000" + max_http2_header_field_size = "4096" + max_http2_queued_frames_to_client_per_connection = "1000" + max_http2_requests_per_connection = "1000" } max_rps_unknown_uri = "0" post_accept_timeout = "30000" @@ -176,6 +183,9 @@ resource "avi_applicationprofile" "testApplicationProfile" { use_app_keepalive_timeout = false } preserve_client_port = false + l4_ssl_profile { + ssl_stream_idle_timeout = "3600" + } } ` @@ -242,6 +252,13 @@ resource "avi_applicationprofile" "testApplicationProfile" { mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id] } http2_profile { + http2_initial_window_size = "64" + max_http2_concurrent_streams_per_connection = "128" + max_http2_control_frames_per_connection = "1000" + max_http2_empty_data_frames_per_connection = "1000" + max_http2_header_field_size = "4096" + max_http2_queued_frames_to_client_per_connection = "1000" + max_http2_requests_per_connection = "1000" } max_rps_unknown_uri = "0" post_accept_timeout = "30000" @@ -257,5 +274,8 @@ resource "avi_applicationprofile" "testApplicationProfile" { use_app_keepalive_timeout = false } preserve_client_port = false + l4_ssl_profile { + ssl_stream_idle_timeout = "3600" + } } ` diff --git a/avi/resource_avi_availabilityzone.go b/avi/resource_avi_availabilityzone.go index be2b54822..88da239f4 100644 --- a/avi/resource_avi_availabilityzone.go +++ b/avi/resource_avi_availabilityzone.go @@ -10,6 +10,21 @@ import ( func ResourceAvailabilityZoneSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "az_clusters": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceAZClusterSchema(), + }, + "az_datastores": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceAZDatastoreSchema(), + }, + "az_hosts": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceAZHostSchema(), + }, "cloud_ref": { Type: schema.TypeString, Optional: true, @@ -35,11 +50,6 @@ func ResourceAvailabilityZoneSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, - "vcenter_refs": { - Type: schema.TypeList, - Required: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, } } diff --git a/avi/resource_avi_backupconfiguration.go b/avi/resource_avi_backupconfiguration.go index 0f9175a60..526b04406 100644 --- a/avi/resource_avi_backupconfiguration.go +++ b/avi/resource_avi_backupconfiguration.go @@ -46,6 +46,12 @@ func ResourceBackupConfigurationSchema() map[string]*schema.Schema { Sensitive: true, DiffSuppressFunc: suppressSensitiveFieldDiffs, }, + "bundle_mode": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "configpb_attributes": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_botconfigconsolidator.go b/avi/resource_avi_botconfigconsolidator.go index ad714e4d6..2987906e0 100644 --- a/avi/resource_avi_botconfigconsolidator.go +++ b/avi/resource_avi_botconfigconsolidator.go @@ -10,6 +10,12 @@ import ( func ResourceBotConfigConsolidatorSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "description": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_botdetectionpolicy.go b/avi/resource_avi_botdetectionpolicy.go index 25f7222eb..be66b1c31 100644 --- a/avi/resource_avi_botdetectionpolicy.go +++ b/avi/resource_avi_botdetectionpolicy.go @@ -22,6 +22,12 @@ func ResourceBotDetectionPolicySchema() map[string]*schema.Schema { Computed: true, Elem: ResourceBotConfigClientBehaviorSchema(), }, + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "description": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_botipreputationtypemapping.go b/avi/resource_avi_botipreputationtypemapping.go index 5dedacfce..1cfc02699 100644 --- a/avi/resource_avi_botipreputationtypemapping.go +++ b/avi/resource_avi_botipreputationtypemapping.go @@ -10,6 +10,12 @@ import ( func ResourceBotIPReputationTypeMappingSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "ip_reputation_mappings": { Type: schema.TypeList, Optional: true, diff --git a/avi/resource_avi_botmapping.go b/avi/resource_avi_botmapping.go index bedc5f6dc..10a9d2449 100644 --- a/avi/resource_avi_botmapping.go +++ b/avi/resource_avi_botmapping.go @@ -10,6 +10,12 @@ import ( func ResourceBotMappingSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, "mapping_rules": { Type: schema.TypeList, Optional: true, diff --git a/avi/resource_avi_certificatemanagementprofile_test.go b/avi/resource_avi_certificatemanagementprofile_test.go index d4c88c897..f6399aaae 100644 --- a/avi/resource_avi_certificatemanagementprofile_test.go +++ b/avi/resource_avi_certificatemanagementprofile_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_cloud.go b/avi/resource_avi_cloud.go index 3945da3cf..898b29ad6 100644 --- a/avi/resource_avi_cloud.go +++ b/avi/resource_avi_cloud.go @@ -192,12 +192,6 @@ func ResourceCloudSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, - "openstack_configuration": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: ResourceOpenStackConfigurationSchema(), - }, "prefer_static_routes": { Type: schema.TypeString, Optional: true, @@ -296,16 +290,16 @@ func ResourceAviCloudRead(d *schema.ResourceData, meta interface{}) error { } // Wait until cloud is ready for the placement -func waitForCloudState(cloudUUID string, expectedCloudState string, client *clients.AviClient, maxRetry int) error { +func waitForCloudState(cloudUUID string, cloudName string, expectedCloudState string, client *clients.AviClient, maxRetry int) error { var robj interface{} var err error var cloudState string + var resp *models.CloudInventory path := "api/cloud-inventory?uuid=" + cloudUUID i := 0 for ; i < maxRetry; i++ { if err = client.AviSession.Get(path, &robj); err == nil { if objCount := robj.(map[string]interface{})["count"].(float64); objCount == float64(1) { - var resp *models.CloudInventory jsonString, marshalErr := json.Marshal(robj.(map[string]interface{})["results"].([]interface{})[0]) if marshalErr != nil { log.Printf("[Error] Got error while marshaling the response from the cloud-inventory api. %s", marshalErr.Error()) @@ -331,7 +325,12 @@ func waitForCloudState(cloudUUID string, expectedCloudState string, client *clie time.Sleep(10 * time.Second) } if i == maxRetry && err == nil { - err = errors.New("didn't get expected state CLOUD_STATE_PLACEMENT_READY in cloud-inventory. Current State: " + cloudState) + if resp.Status != nil && resp.Status.Reason != nil { + reason := *((*resp).Status.Reason) + err = errors.New("Cloud Status is not as expected or reason not null. Expected=" + expectedCloudState + " Received=" + cloudState + ", reason=" + reason) + } else { + err = errors.New("Failed to fetch the status of the cloud.:" + cloudName) + } } return err } @@ -353,18 +352,26 @@ func setupVcenterMgmtNetwork(d *schema.ResourceData, meta interface{}) error { client := meta.(*clients.AviClient) vcenterConfig, _ := d.GetOk("vcenter_configuration") mgmtNetwork := vcenterConfig.(*schema.Set).List()[0].(map[string]interface{})["management_network"].(string) - if err := APIUpdate(d, meta, "cloud", s); err != nil { - log.Printf("[Error] Got error for cloud create/update. Error: %s", err.Error()) - return err + if _, ok := d.GetOk("uuid"); ok { + if err := APIUpdate(d, meta, "cloud", s); err != nil { + log.Printf("[Error] Got error for cloud update. Error: %s", err.Error()) + return err + } + } else { + if err := APICreate(d, meta, "cloud", s); err != nil { + log.Printf("[Error] Got error for cloud create. Error: %s", err.Error()) + return err + } } uuid := d.Get("uuid").(string) + name := d.Get("name").(string) if ok := strings.Contains(mgmtNetwork, "api/"); !ok { mgmtNetwork = "vimgrruntime?name=" + mgmtNetwork vcenterConfig.(*schema.Set).List()[0].(map[string]interface{})["management_network"] = mgmtNetwork if err := d.Set("vcenter_configuration", vcenterConfig); err != nil { return err } - if err := waitForCloudState(uuid, "CLOUD_STATE_FAILED", client, maxRetry); err != nil { + if err := waitForCloudState(uuid, name, "CLOUD_STATE_FAILED", client, maxRetry); err != nil { return err } if err := APIUpdate(d, meta, "cloud", s); err != nil { @@ -372,7 +379,7 @@ func setupVcenterMgmtNetwork(d *schema.ResourceData, meta interface{}) error { return err } } - if err := waitForCloudState(uuid, "CLOUD_STATE_PLACEMENT_READY", client, maxRetry); err != nil { + if err := waitForCloudState(uuid, name, "CLOUD_STATE_PLACEMENT_READY", client, maxRetry); err != nil { return err } return nil diff --git a/avi/resource_avi_cloudconnectoruser.go b/avi/resource_avi_cloudconnectoruser.go index bb034c7a4..1bfd2a1d6 100644 --- a/avi/resource_avi_cloudconnectoruser.go +++ b/avi/resource_avi_cloudconnectoruser.go @@ -44,12 +44,6 @@ func ResourceCloudConnectorUserSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceNsxtCredentialsSchema(), }, - "oci_credentials": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: ResourceOCICredentialsSchema(), - }, "password": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 8d1c16544..d43c8bd33 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -58,6 +58,18 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "archive_retention_framework_period": { + Type: schema.TypeString, + Optional: true, + Default: "60", + ValidateFunc: validateInteger, + }, + "async_cert_chaining_interval": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, "async_patch_merge_period": { Type: schema.TypeString, Optional: true, @@ -220,6 +232,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "true", ValidateFunc: validateBool, }, + "enable_nsx_streaming_agent": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "enable_per_process_stop": { Type: schema.TypeString, Optional: true, @@ -280,6 +298,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "3", ValidateFunc: validateInteger, }, + "gslb_fileobject_max_version_count": { + Type: schema.TypeString, + Optional: true, + Default: "3", + ValidateFunc: validateInteger, + }, "gslb_purge_batch_size": { Type: schema.TypeString, Optional: true, @@ -298,6 +322,36 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "log_records_allocated_size": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "log_records_allocation_percentage_for_events": { + Type: schema.TypeString, + Optional: true, + Default: "20", + ValidateFunc: validateInteger, + }, + "log_records_cleanup_target_percentage": { + Type: schema.TypeString, + Optional: true, + Default: "90", + ValidateFunc: validateInteger, + }, + "log_records_frequent_cleanup_event_generation_threshold": { + Type: schema.TypeString, + Optional: true, + Default: "2", + ValidateFunc: validateInteger, + }, + "log_records_purge_interval": { + Type: schema.TypeString, + Optional: true, + Default: "300", + ValidateFunc: validateInteger, + }, "max_dead_se_in_grp": { Type: schema.TypeString, Optional: true, @@ -471,31 +525,13 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "60", ValidateFunc: validateInteger, }, - "seupgrade_copy_buffer_size": { - Type: schema.TypeString, - Optional: true, - Default: "512", - ValidateFunc: validateInteger, - }, - "seupgrade_copy_pool_size": { - Type: schema.TypeString, - Optional: true, - Default: "5", - ValidateFunc: validateInteger, - }, - "seupgrade_fabric_pool_size": { - Type: schema.TypeString, - Optional: true, - Default: "20", - ValidateFunc: validateInteger, - }, - "seupgrade_segroup_min_dead_timeout": { + "shared_ssl_certificates": { Type: schema.TypeString, Optional: true, - Default: "360", - ValidateFunc: validateInteger, + Default: "false", + ValidateFunc: validateBool, }, - "shared_ssl_certificates": { + "skip_beego_perf_collection": { Type: schema.TypeString, Optional: true, Default: "false", @@ -512,16 +548,16 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeInt}, }, - "system_report_cleanup_interval": { - Type: schema.TypeString, - Optional: true, - Default: "60", - ValidateFunc: validateInteger, + "statecache_properties": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSCPropertiesSchema(), }, - "system_report_limit": { + "telemetry_interval": { Type: schema.TypeString, Optional: true, - Default: "10", + Default: "1440", ValidateFunc: validateInteger, }, "unresponsive_se_reboot": { @@ -548,18 +584,6 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "5", ValidateFunc: validateInteger, }, - "upgrade_fat_se_lease_time": { - Type: schema.TypeString, - Optional: true, - Default: "1200", - ValidateFunc: validateInteger, - }, - "upgrade_lease_time": { - Type: schema.TypeString, - Optional: true, - Default: "600", - ValidateFunc: validateInteger, - }, "upgrade_se_per_vs_scale_ops_txn_time": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_csrfpolicy.go b/avi/resource_avi_csrfpolicy.go index d940f0c5f..0e22fca3c 100644 --- a/avi/resource_avi_csrfpolicy.go +++ b/avi/resource_avi_csrfpolicy.go @@ -21,6 +21,11 @@ func ResourceCSRFPolicySchema() map[string]*schema.Schema { Optional: true, Default: "X-CSRF-TOKEN", }, + "csrf_file_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "description": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_federationcheckpoint.go b/avi/resource_avi_federationcheckpoint.go deleted file mode 100644 index b291e4691..000000000 --- a/avi/resource_avi_federationcheckpoint.go +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2019 VMware, Inc. -// SPDX-License-Identifier: Mozilla Public License 2.0 - -package avi - -import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "log" -) - -func ResourceFederationCheckpointSchema() map[string]*schema.Schema { - return map[string]*schema.Schema{ - "configpb_attributes": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: ResourceConfigPbAttributesSchema(), - }, - "date": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - "description": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - "is_federated": { - Type: schema.TypeString, - Optional: true, - Default: "true", - ValidateFunc: validateBool, - }, - "name": { - Type: schema.TypeString, - Required: true, - }, - "tenant_ref": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - "uuid": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, - } -} - -func resourceAviFederationCheckpoint() *schema.Resource { - return &schema.Resource{ - Create: resourceAviFederationCheckpointCreate, - Read: ResourceAviFederationCheckpointRead, - Update: resourceAviFederationCheckpointUpdate, - Delete: resourceAviFederationCheckpointDelete, - Schema: ResourceFederationCheckpointSchema(), - Importer: &schema.ResourceImporter{ - State: ResourceFederationCheckpointImporter, - }, - } -} - -func ResourceFederationCheckpointImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { - s := ResourceFederationCheckpointSchema() - return ResourceImporter(d, m, "federationcheckpoint", s) -} - -func ResourceAviFederationCheckpointRead(d *schema.ResourceData, meta interface{}) error { - s := ResourceFederationCheckpointSchema() - err := APIRead(d, meta, "federationcheckpoint", s) - if err != nil { - log.Printf("[ERROR] in reading object %v\n", err) - } - return err -} - -func resourceAviFederationCheckpointCreate(d *schema.ResourceData, meta interface{}) error { - s := ResourceFederationCheckpointSchema() - err := APICreate(d, meta, "federationcheckpoint", s) - if err == nil { - err = ResourceAviFederationCheckpointRead(d, meta) - } - return err -} - -func resourceAviFederationCheckpointUpdate(d *schema.ResourceData, meta interface{}) error { - s := ResourceFederationCheckpointSchema() - var err error - err = APIUpdate(d, meta, "federationcheckpoint", s) - if err == nil { - err = ResourceAviFederationCheckpointRead(d, meta) - } - return err -} - -func resourceAviFederationCheckpointDelete(d *schema.ResourceData, meta interface{}) error { - var err error - if APIDeleteSystemDefaultCheck(d) { - return nil - } - err = APIDelete(d, meta, "federationcheckpoint") - if err != nil { - log.Printf("[ERROR] in deleting object %v\n", err) - } - return err -} diff --git a/avi/resource_avi_fileobject.go b/avi/resource_avi_fileobject.go index 9815805db..73e1e2966 100644 --- a/avi/resource_avi_fileobject.go +++ b/avi/resource_avi_fileobject.go @@ -15,6 +15,11 @@ func ResourceFileObjectSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "child_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "compressed": { Type: schema.TypeString, Optional: true, @@ -43,11 +48,27 @@ func ResourceFileObjectSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceFileObjectEventMapSchema(), + }, "expires_at": { Type: schema.TypeString, Optional: true, Computed: true, }, + "gslb_geodb_format": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "has_parent": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "is_federated": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_fileservice.go b/avi/resource_avi_fileservice.go index fff4b4585..ffc04a515 100755 --- a/avi/resource_avi_fileservice.go +++ b/avi/resource_avi_fileservice.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_gslb.go b/avi/resource_avi_gslb.go index 065a5f7c9..637688692 100644 --- a/avi/resource_avi_gslb.go +++ b/avi/resource_avi_gslb.go @@ -16,6 +16,12 @@ func ResourceGslbSchema() map[string]*schema.Schema { Default: "0", ValidateFunc: validateInteger, }, + "auto_tune_send_interval": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceAutoTuneSendIntervalSchema(), + }, "clear_on_max_retries": { Type: schema.TypeString, Optional: true, @@ -62,12 +68,24 @@ func ResourceGslbSchema() map[string]*schema.Schema { Default: "3", ValidateFunc: validateInteger, }, + "gs_member_fqdn_resolution_on_se": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "is_federated": { Type: schema.TypeString, Optional: true, Default: "true", ValidateFunc: validateBool, }, + "leader_change_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceLeaderChangeInfoSchema(), + }, "leader_cluster_uuid": { Type: schema.TypeString, Required: true, @@ -82,12 +100,6 @@ func ResourceGslbSchema() map[string]*schema.Schema { Type: schema.TypeString, Required: true, }, - "replication_policy": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: ResourceReplicationPolicySchema(), - }, "send_interval": { Type: schema.TypeString, Optional: true, @@ -100,6 +112,12 @@ func ResourceGslbSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateInteger, }, + "short_probe_interval": { + Type: schema.TypeString, + Optional: true, + Default: "30", + ValidateFunc: validateInteger, + }, "sites": { Type: schema.TypeList, Required: true, diff --git a/avi/resource_avi_gslbcrmruntime.go b/avi/resource_avi_gslbcrmruntime.go new file mode 100644 index 000000000..5f6324153 --- /dev/null +++ b/avi/resource_avi_gslbcrmruntime.go @@ -0,0 +1,137 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceGslbCRMRuntimeSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "cluster_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceEventInfoSchema(), + }, + "fds_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceFdsInfoSchema(), + }, + "local_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceLocalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "remote_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "replication_policy": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceReplicationPolicySchema(), + }, + "site_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviGslbCRMRuntime() *schema.Resource { + return &schema.Resource{ + Create: resourceAviGslbCRMRuntimeCreate, + Read: ResourceAviGslbCRMRuntimeRead, + Update: resourceAviGslbCRMRuntimeUpdate, + Delete: resourceAviGslbCRMRuntimeDelete, + Schema: ResourceGslbCRMRuntimeSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceGslbCRMRuntimeImporter, + }, + } +} + +func ResourceGslbCRMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceGslbCRMRuntimeSchema() + return ResourceImporter(d, m, "gslbcrmruntime", s) +} + +func ResourceAviGslbCRMRuntimeRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbCRMRuntimeSchema() + err := APIRead(d, meta, "gslbcrmruntime", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviGslbCRMRuntimeCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbCRMRuntimeSchema() + err := APICreate(d, meta, "gslbcrmruntime", s) + if err == nil { + err = ResourceAviGslbCRMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbCRMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbCRMRuntimeSchema() + var err error + err = APIUpdate(d, meta, "gslbcrmruntime", s) + if err == nil { + err = ResourceAviGslbCRMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbCRMRuntimeDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "gslbcrmruntime") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_gslbhsmruntime.go b/avi/resource_avi_gslbhsmruntime.go new file mode 100644 index 000000000..ab9d36254 --- /dev/null +++ b/avi/resource_avi_gslbhsmruntime.go @@ -0,0 +1,137 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceGslbHSMRuntimeSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "cluster_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "enabled": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceEventInfoSchema(), + }, + "local_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceLocalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "oper_status": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "remote_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "send_interval": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "site_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviGslbHSMRuntime() *schema.Resource { + return &schema.Resource{ + Create: resourceAviGslbHSMRuntimeCreate, + Read: ResourceAviGslbHSMRuntimeRead, + Update: resourceAviGslbHSMRuntimeUpdate, + Delete: resourceAviGslbHSMRuntimeDelete, + Schema: ResourceGslbHSMRuntimeSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceGslbHSMRuntimeImporter, + }, + } +} + +func ResourceGslbHSMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceGslbHSMRuntimeSchema() + return ResourceImporter(d, m, "gslbhsmruntime", s) +} + +func ResourceAviGslbHSMRuntimeRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbHSMRuntimeSchema() + err := APIRead(d, meta, "gslbhsmruntime", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviGslbHSMRuntimeCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbHSMRuntimeSchema() + err := APICreate(d, meta, "gslbhsmruntime", s) + if err == nil { + err = ResourceAviGslbHSMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbHSMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbHSMRuntimeSchema() + var err error + err = APIUpdate(d, meta, "gslbhsmruntime", s) + if err == nil { + err = ResourceAviGslbHSMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbHSMRuntimeDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "gslbhsmruntime") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_gslbservice.go b/avi/resource_avi_gslbservice.go index b022426d5..7e0edafa8 100644 --- a/avi/resource_avi_gslbservice.go +++ b/avi/resource_avi_gslbservice.go @@ -75,6 +75,12 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateBool, }, + "include_additional_records": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "is_federated": { Type: schema.TypeString, Optional: true, @@ -112,6 +118,11 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema { Optional: true, Default: "GSLB_SERVICE_ALGORITHM_PRIORITY", }, + "record_type": { + Type: schema.TypeString, + Optional: true, + Default: "GSLB_SERVICE_RECORD_TYPE_A_AAAA_CNAME", + }, "resolve_cname": { Type: schema.TypeString, Optional: true, @@ -152,6 +163,11 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "vrf_uuid_for_gs": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "wildcard_match": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_gslbsmruntime.go b/avi/resource_avi_gslbsmruntime.go new file mode 100644 index 000000000..b481f30d8 --- /dev/null +++ b/avi/resource_avi_gslbsmruntime.go @@ -0,0 +1,198 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceGslbSMRuntimeSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "cluster_leader": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "cluster_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "controller_size": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceControllerSizeSchema(), + }, + "dns_configs": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceDNSConfigSchema(), + }, + "dns_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbDnsInfoSchema(), + }, + "enabled": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceEventInfoSchema(), + }, + "health_monitor_info": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "leader_cluster_uuid": { + Type: schema.TypeString, + Required: true, + }, + "member_type": { + Type: schema.TypeString, + Optional: true, + Default: "GSLB_PASSIVE_MEMBER", + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "node_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "num_of_retries": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "oper_status": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceOperationalStatusSchema(), + }, + "remote_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRemoteInfoSchema(), + }, + "role": { + Type: schema.TypeString, + Optional: true, + Default: "GSLB_NOT_A_MEMBER", + }, + "site_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "site_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Optional: true, + Default: "SITE_STATE_NULL", + }, + "sw_version": { + Type: schema.TypeString, + Optional: true, + Default: "Not-Initialized", + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "view_id": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + } +} + +func resourceAviGslbSMRuntime() *schema.Resource { + return &schema.Resource{ + Create: resourceAviGslbSMRuntimeCreate, + Read: ResourceAviGslbSMRuntimeRead, + Update: resourceAviGslbSMRuntimeUpdate, + Delete: resourceAviGslbSMRuntimeDelete, + Schema: ResourceGslbSMRuntimeSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceGslbSMRuntimeImporter, + }, + } +} + +func ResourceGslbSMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceGslbSMRuntimeSchema() + return ResourceImporter(d, m, "gslbsmruntime", s) +} + +func ResourceAviGslbSMRuntimeRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbSMRuntimeSchema() + err := APIRead(d, meta, "gslbsmruntime", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviGslbSMRuntimeCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbSMRuntimeSchema() + err := APICreate(d, meta, "gslbsmruntime", s) + if err == nil { + err = ResourceAviGslbSMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbSMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceGslbSMRuntimeSchema() + var err error + err = APIUpdate(d, meta, "gslbsmruntime", s) + if err == nil { + err = ResourceAviGslbSMRuntimeRead(d, meta) + } + return err +} + +func resourceAviGslbSMRuntimeDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "gslbsmruntime") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_hardwaresecuritymodulegroup.go b/avi/resource_avi_hardwaresecuritymodulegroup.go index 263c83f8f..00ab069ea 100644 --- a/avi/resource_avi_hardwaresecuritymodulegroup.go +++ b/avi/resource_avi_hardwaresecuritymodulegroup.go @@ -10,6 +10,11 @@ import ( func ResourceHardwareSecurityModuleGroupSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "ca_certs": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSSLCertificateSchema(), + }, "configpb_attributes": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_healthmonitor.go b/avi/resource_avi_healthmonitor.go index ba620796a..5fc4cc22a 100644 --- a/avi/resource_avi_healthmonitor.go +++ b/avi/resource_avi_healthmonitor.go @@ -69,6 +69,18 @@ func ResourceHealthMonitorSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceHealthMonitorFtpSchema(), }, + "http2_monitor": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceHealthMonitorHttpSchema(), + }, + "http2s_monitor": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceHealthMonitorHttpSchema(), + }, "http_monitor": { Type: schema.TypeSet, Optional: true, @@ -116,6 +128,12 @@ func ResourceHealthMonitorSchema() map[string]*schema.Schema { Optional: true, Elem: ResourceRoleFilterMatchLabelSchema(), }, + "monitor_ip": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, "monitor_port": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_httppolicyset_test.go b/avi/resource_avi_httppolicyset_test.go index ae599d16c..c7200a6ea 100644 --- a/avi/resource_avi_httppolicyset_test.go +++ b/avi/resource_avi_httppolicyset_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_image.go b/avi/resource_avi_image.go index f13f26654..5a8639c03 100644 --- a/avi/resource_avi_image.go +++ b/avi/resource_avi_image.go @@ -31,6 +31,12 @@ func ResourceImageSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "dryrun_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourcePackageDetailsSchema(), + }, "duration": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_ipreputationdb.go b/avi/resource_avi_ipreputationdb.go index 40a909a1e..332987558 100644 --- a/avi/resource_avi_ipreputationdb.go +++ b/avi/resource_avi_ipreputationdb.go @@ -15,6 +15,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "base_file_v6_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "configpb_attributes": { Type: schema.TypeSet, Optional: true, @@ -31,6 +36,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "incremental_file_v6_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "markers": { Type: schema.TypeList, Optional: true, @@ -56,6 +66,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "v6_version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "vendor": { Type: schema.TypeString, Required: true, diff --git a/avi/resource_avi_licenseledgerdetails.go b/avi/resource_avi_licenseledgerdetails.go index bfe79fa65..b2f197c63 100644 --- a/avi/resource_avi_licenseledgerdetails.go +++ b/avi/resource_avi_licenseledgerdetails.go @@ -15,16 +15,32 @@ func ResourceLicenseLedgerDetailsSchema() map[string]*schema.Schema { Optional: true, Elem: ResourceLicenseInfoSchema(), }, + "se_group_infos": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSeGroupInfoSchema(), + }, "se_infos": { Type: schema.TypeList, Optional: true, Elem: ResourceLicenseInfoSchema(), }, + "tenant_infos": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceLicenseReservationInfoSchema(), + }, "tier_usages": { Type: schema.TypeList, Optional: true, Elem: ResourceLicenseTierUsageSchema(), }, + "total_licenses_reserved": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_licensestatus.go b/avi/resource_avi_licensestatus.go index a422cc02a..ad2257857 100644 --- a/avi/resource_avi_licensestatus.go +++ b/avi/resource_avi_licensestatus.go @@ -16,11 +16,6 @@ func ResourceLicenseStatusSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "essentials_enforced_at": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "saas_status": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_localworkerfdsversion.go b/avi/resource_avi_localworkerfdsversion.go new file mode 100644 index 000000000..768a5c39e --- /dev/null +++ b/avi/resource_avi_localworkerfdsversion.go @@ -0,0 +1,98 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceLocalWorkerFdsVersionSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + Default: "default", + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timeline": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "version": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + } +} + +func resourceAviLocalWorkerFdsVersion() *schema.Resource { + return &schema.Resource{ + Create: resourceAviLocalWorkerFdsVersionCreate, + Read: ResourceAviLocalWorkerFdsVersionRead, + Update: resourceAviLocalWorkerFdsVersionUpdate, + Delete: resourceAviLocalWorkerFdsVersionDelete, + Schema: ResourceLocalWorkerFdsVersionSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceLocalWorkerFdsVersionImporter, + }, + } +} + +func ResourceLocalWorkerFdsVersionImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceLocalWorkerFdsVersionSchema() + return ResourceImporter(d, m, "localworkerfdsversion", s) +} + +func ResourceAviLocalWorkerFdsVersionRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceLocalWorkerFdsVersionSchema() + err := APIRead(d, meta, "localworkerfdsversion", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviLocalWorkerFdsVersionCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceLocalWorkerFdsVersionSchema() + err := APICreate(d, meta, "localworkerfdsversion", s) + if err == nil { + err = ResourceAviLocalWorkerFdsVersionRead(d, meta) + } + return err +} + +func resourceAviLocalWorkerFdsVersionUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceLocalWorkerFdsVersionSchema() + var err error + err = APIUpdate(d, meta, "localworkerfdsversion", s) + if err == nil { + err = ResourceAviLocalWorkerFdsVersionRead(d, meta) + } + return err +} + +func resourceAviLocalWorkerFdsVersionDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "localworkerfdsversion") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_pool.go b/avi/resource_avi_pool.go index 413e14bb3..b2918c440 100644 --- a/avi/resource_avi_pool.go +++ b/avi/resource_avi_pool.go @@ -154,10 +154,10 @@ func ResourcePoolSchema() map[string]*schema.Schema { Default: "10", ValidateFunc: validateInteger, }, - "graceful_disable_timeout": { + "graceful_disable_timeout_sec": { Type: schema.TypeString, Optional: true, - Default: "1", + Default: "60", ValidateFunc: validateInteger, }, "graceful_hm_down_disable_timeout": { @@ -166,6 +166,11 @@ func ResourcePoolSchema() map[string]*schema.Schema { Default: "-1", ValidateFunc: validateInteger, }, + "gslb_pool_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "gslb_sp_enabled": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_pool_server.go b/avi/resource_avi_pool_server.go index d4510a42a..d449346c7 100644 --- a/avi/resource_avi_pool_server.go +++ b/avi/resource_avi_pool_server.go @@ -63,6 +63,11 @@ func ResourceAviPoolServerSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "health_monitor_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "hostname": { Type: schema.TypeString, Optional: true, @@ -124,6 +129,12 @@ func ResourceAviPoolServerSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "srv_rdata": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbServiceSrvRdataSchema(), + }, "static": { Type: schema.TypeString, Optional: true, @@ -375,6 +386,10 @@ func resourceAviServerReadAPI(d *schema.ResourceData, meta interface{}) (string, ip := d.Get("ip").(string) port := d.Get("port") + if port == "" { + port = nil + } + // find the server in the pool object. var matchedServer *models.Server = nil for i := 0; i < len(poolObj.Servers); i++ { diff --git a/avi/resource_avi_ratelimitconfiguration.go b/avi/resource_avi_ratelimitconfiguration.go new file mode 100644 index 000000000..31f35d3f5 --- /dev/null +++ b/avi/resource_avi_ratelimitconfiguration.go @@ -0,0 +1,122 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceRateLimitConfigurationSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "burst": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, + "description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "http_methods": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "name": { + Type: schema.TypeString, + Required: true, + }, + "resource": { + Type: schema.TypeString, + Required: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "token_refill_rate": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceTokenRefillRateSchema(), + }, + "type": { + Type: schema.TypeString, + Optional: true, + Default: "RATE_LIMITER_API_CATEGORY", + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviRateLimitConfiguration() *schema.Resource { + return &schema.Resource{ + Create: resourceAviRateLimitConfigurationCreate, + Read: ResourceAviRateLimitConfigurationRead, + Update: resourceAviRateLimitConfigurationUpdate, + Delete: resourceAviRateLimitConfigurationDelete, + Schema: ResourceRateLimitConfigurationSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceRateLimitConfigurationImporter, + }, + } +} + +func ResourceRateLimitConfigurationImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceRateLimitConfigurationSchema() + return ResourceImporter(d, m, "ratelimitconfiguration", s) +} + +func ResourceAviRateLimitConfigurationRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceRateLimitConfigurationSchema() + err := APIRead(d, meta, "ratelimitconfiguration", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviRateLimitConfigurationCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceRateLimitConfigurationSchema() + err := APICreate(d, meta, "ratelimitconfiguration", s) + if err == nil { + err = ResourceAviRateLimitConfigurationRead(d, meta) + } + return err +} + +func resourceAviRateLimitConfigurationUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceRateLimitConfigurationSchema() + var err error + err = APIUpdate(d, meta, "ratelimitconfiguration", s) + if err == nil { + err = ResourceAviRateLimitConfigurationRead(d, meta) + } + return err +} + +func resourceAviRateLimitConfigurationDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "ratelimitconfiguration") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 6eaab551f..1c985dc7c 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -469,6 +469,63 @@ func ResourceAWSSetupSchema() *schema.Resource { } } +func ResourceAZClusterSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cluster_ids": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "vcenter_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceAZDatastoreSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ds_ids": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "include": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "vcenter_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceAZHostSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "host_ids": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "vcenter_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceAbPoolSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -486,6 +543,23 @@ func ResourceAbPoolSchema() *schema.Resource { } } +func ResourceActionArgsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "value": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceAdaptReplEventInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -1192,7 +1266,7 @@ func ResourceAppLearningParamsSchema() *schema.Resource { "enable_learn_from_bots": { Type: schema.TypeString, Optional: true, - Default: "true", + Default: "false", ValidateFunc: validateBool, }, "enable_per_uri_learning": { @@ -1213,6 +1287,12 @@ func ResourceAppLearningParamsSchema() *schema.Resource { Computed: true, Elem: ResourceBotDetectionMatchSchema(), }, + "learn_from_urls_without_args": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "max_params": { Type: schema.TypeString, Optional: true, @@ -1629,6 +1709,11 @@ func ResourceApplicationLogSchema() *schema.Resource { Optional: true, Computed: true, }, + "named_group": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "network_security_policy_rule_name": { Type: schema.TypeString, Optional: true, @@ -1706,6 +1791,11 @@ func ResourceApplicationLogSchema() *schema.Resource { Required: true, ValidateFunc: validateInteger, }, + "request_body_updated": { + Type: schema.TypeString, + Optional: true, + Default: "REQ_BODY_NOT_UPDATED", + }, "request_content_type": { Type: schema.TypeString, Optional: true, @@ -1938,6 +2028,11 @@ func ResourceApplicationLogSchema() *schema.Resource { Optional: true, Computed: true, }, + "signature_algorithm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "significance": { Type: schema.TypeString, Optional: true, @@ -2060,6 +2155,36 @@ func ResourceApplicationLogSchema() *schema.Resource { } } +func ResourceArchivePolicySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "file_path": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "threshold": { + Type: schema.TypeString, + Optional: true, + Default: "128", + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceArchiveRulesSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "rules": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceArchivePolicySchema(), + }, + }, + } +} + func ResourceAsyncPatchStateSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -2758,6 +2883,25 @@ func ResourceAutoScaleOpenStackSettingsSchema() *schema.Resource { } } +func ResourceAutoTuneSendIntervalSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "auto_tune_send_interval_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "300", + ValidateFunc: validateInteger, + }, + "enabled": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + }, + } +} + func ResourceAvgUptimeChangeDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -4839,6 +4983,12 @@ func ResourceCfgStateSchema() *schema.Resource { Computed: true, Elem: ResourceTimeStampSchema(), }, + "local_config": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceLocalConfigSchema(), + }, "reason": { Type: schema.TypeString, Optional: true, @@ -7040,6 +7190,12 @@ func ResourceConnectionLogSchema() *schema.Resource { Required: true, ValidateFunc: validateBool, }, + "diameter_log": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDiameterLogSchema(), + }, "dns_etype": { Type: schema.TypeString, Optional: true, @@ -7055,6 +7211,16 @@ func ResourceConnectionLogSchema() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeInt}, }, + "dns_policy": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "dns_policy_rule_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "dns_qtype": { Type: schema.TypeString, Optional: true, @@ -7130,6 +7296,11 @@ func ResourceConnectionLogSchema() *schema.Resource { Required: true, ValidateFunc: validateInteger, }, + "named_group": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "network_security_policy_rule_name": { Type: schema.TypeString, Optional: true, @@ -7311,6 +7482,11 @@ func ResourceConnectionLogSchema() *schema.Resource { Optional: true, Computed: true, }, + "signature_algorithm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "significance": { Type: schema.TypeString, Optional: true, @@ -7362,6 +7538,11 @@ func ResourceConnectionLogSchema() *schema.Resource { Required: true, ValidateFunc: validateInteger, }, + "topology_policy_rule_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "total_bytes": { Type: schema.TypeString, Optional: true, @@ -7557,10 +7738,10 @@ func ResourceContentLibConfigSchema() *schema.Resource { func ResourceContentRewriteProfileSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "rewritable_content_ref": { - Type: schema.TypeString, + "req_rewrite_rules": { + Type: schema.TypeList, Optional: true, - Computed: true, + Elem: ResourceReqContentRewriteRuleSchema(), }, "rsp_rewrite_rules": { Type: schema.TypeList, @@ -7673,6 +7854,12 @@ func ResourceControllerFaultsSchema() *schema.Resource { Default: "true", ValidateFunc: validateBool, }, + "system_limits_faults": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, }, } } @@ -8082,6 +8269,25 @@ func ResourceControllerLimitsSchema() *schema.Resource { Computed: true, Elem: ResourceWAFLimitsSchema(), }, + "waf_rule_metrics_enabled_vs": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceControllerParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "task_base_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "300", + ValidateFunc: validateInteger, + }, }, } } @@ -8243,6 +8449,12 @@ func ResourceControllerSizingLimitsSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "num_virtualservices_rtmetrics_waf": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "num_vrfs": { Type: schema.TypeString, Optional: true, @@ -8285,6 +8497,29 @@ func ResourceControllerVersionSchema() *schema.Resource { } } +func ResourceControlscriptDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "exitcode": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "stderr": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "stdout": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceCookieMatchSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -9113,11 +9348,29 @@ func ResourceDebugServiceEngineSchema() *schema.Resource { Optional: true, Elem: ResourceDebugSeDataplaneSchema(), }, + "high_cpu_script_config": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDebugServiceEngineSustainedCpuSpikeSchema(), + }, + "mock_dl_fail_obj": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDebugServiceEngineSeDataStoreMockDlFailSchema(), + }, "name": { Type: schema.TypeString, Optional: true, Default: "VM name unknown", }, + "objsync": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDebugServiceEngineObjSyncSchema(), + }, "seagent_debug": { Type: schema.TypeList, Optional: true, @@ -9149,6 +9402,100 @@ func ResourceDebugServiceEngineSchema() *schema.Resource { } } +func ResourceDebugServiceEngineObjSyncSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "log_level": { + Type: schema.TypeString, + Optional: true, + Default: "LOG_LVL_INFO", + }, + "publish_packet_drops": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceDebugServiceEngineSeDataStoreMockDlFailSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "is_sedatastore_update_rpc": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "object_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceDebugServiceEngineSustainedCpuSpikeSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cpu_filter": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "cpu_spike_percent": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "dis_enable": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "manual_start": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "pids": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeInt}, + }, + "process_names": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "sample_cooldown": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "sample_duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "spike_duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceDebugTraceMallocTypesSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -9459,6 +9806,125 @@ func ResourceDetachIpStatusEventDetailsSchema() *schema.Resource { } } +func ResourceDiameterAVPPersistenceProfileSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "avp_key_type": { + Type: schema.TypeString, + Optional: true, + Default: "SESSION_ID", + }, + "timeout": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceDiameterLogSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "application_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "avp_key_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "command_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "destination_host": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "destination_realm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "end_to_end_identifier": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "hop_by_hop_identifier": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "origin_host": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "origin_realm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceDiameterServiceApplicationProfileSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "client_origin_host": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "client_origin_realm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "host_ip_addr_rewrite": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "max_outstanding_req": { + Type: schema.TypeString, + Optional: true, + Default: "4096", + ValidateFunc: validateInteger, + }, + "req_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "60", + ValidateFunc: validateInteger, + }, + "server_origin_host": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "server_origin_realm": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceDisableSeMigrateEventDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -9497,6 +9963,41 @@ func ResourceDiscoveredNetworkSchema() *schema.Resource { } } +func ResourceDiskThresholdSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceRetentionActionSchema(), + }, + "filepath": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "max_disk_percent": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "min_free_disk_percent": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "retain": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceDiskUsageSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -11140,6 +11641,104 @@ func ResourceDosThresholdProfileSchema() *schema.Resource { } } +func ResourceDryRunParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "allow_single_node": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "memory": { + Type: schema.TypeString, + Optional: true, + Default: "6", + ValidateFunc: validateFloat, + }, + "num_cpu": { + Type: schema.TypeString, + Optional: true, + Default: "2", + ValidateFunc: validateInteger, + }, + "preferred_worker": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceDryrunInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "operation": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceUpgradeParamsSchema(), + }, + "progress": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceUpgradeOpsStateSchema(), + }, + "tasks_completed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "total_tasks": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "upgrade_events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceEventMapSchema(), + }, + "worker": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceDsrProfileSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -11334,6 +11933,24 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceApiVersionDeprecatedSchema(), }, + "apiserver_request_queue_full_event_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRequestLimiterEventInfoSchema(), + }, + "apiserver_request_queue_recovery_event_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRequestLimiterEventInfoSchema(), + }, + "apiserver_request_ratelimit_event_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRequestLimiterEventInfoSchema(), + }, "app_signature_event_data": { Type: schema.TypeSet, Optional: true, @@ -11688,6 +12305,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceControllerLicenseReconcileDetailsSchema(), }, + "controlscript_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceControlscriptDetailsSchema(), + }, "crs_deployment_failure": { Type: schema.TypeSet, Optional: true, @@ -11946,6 +12569,30 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceNetworkSubnetInfoSchema(), }, + "nsxt_dfw_group_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceNsxtDFWGroupDetailsSchema(), + }, + "nsxt_dfw_service_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceNsxtDFWServiceDetailsSchema(), + }, + "nsxt_dfw_tag_segment_port": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceNsxtDFWTagSegmentPortSchema(), + }, + "nsxt_dfw_tag_vm_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceNsxtDFWTagVMSchema(), + }, "nsxt_endpoint_details": { Type: schema.TypeSet, Optional: true, @@ -12084,6 +12731,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceVinfraPoolServerDeleteDetailsSchema(), }, + "postgres_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourcePostgresEventInfoSchema(), + }, "psm_program_details": { Type: schema.TypeSet, Optional: true, @@ -12132,6 +12785,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceSchedulerActionDetailsSchema(), }, + "se_autoscaler_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSeAutoScalerEventDetailsSchema(), + }, "se_bgp_peer_down_details": { Type: schema.TypeSet, Optional: true, @@ -12144,6 +12803,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceSeBgpPeerStateChangeDetailsSchema(), }, + "se_config_sedatastore_dl_fail": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSeVsConfigSeDatastoreDownloadFailedSchema(), + }, "se_debug_mode_event_detail": { Type: schema.TypeSet, Optional: true, @@ -12294,6 +12959,18 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceSePoolLbEventDetailsSchema(), }, + "se_process_crashed_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSeProcessCrashedDetailsSchema(), + }, + "se_rate_limiter_drop_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSeRateLimiterDropDetailsSchema(), + }, "se_reconcile_details": { Type: schema.TypeSet, Optional: true, @@ -12486,18 +13163,36 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceCloudSyncServicesSchema(), }, + "system_limit_object_counts": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSystemLimitObjectCountsSchema(), + }, "system_report_event_details": { Type: schema.TypeSet, Optional: true, Computed: true, Elem: ResourceSystemReportSchema(), }, + "task_journal_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTaskJournalSchema(), + }, "tech_support_event": { Type: schema.TypeSet, Optional: true, Computed: true, Elem: ResourceTechSupportEventSchema(), }, + "tech_support_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportSchema(), + }, "tencent_info": { Type: schema.TypeSet, Optional: true, @@ -12528,6 +13223,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceUpgradeStatusInfoSchema(), }, + "usage_metering_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceUsageMeteringEventDetailsSchema(), + }, "vca_infra_details": { Type: schema.TypeSet, Optional: true, @@ -12618,6 +13319,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceVsAwaitingSeEventDetailsSchema(), }, + "vs_config_sedatastore_dl_fail": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSeVsConfigSeDatastoreDownloadFailedSchema(), + }, "vs_error_details": { Type: schema.TypeSet, Optional: true, @@ -12666,6 +13373,18 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceVsSwitchoverEventDetailsSchema(), }, + "vsgs_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceVsGsStatusSchema(), + }, + "warning_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceWarningEventDetailsSchema(), + }, }, } } @@ -12689,6 +13408,34 @@ func ResourceEventDetailsFilterSchema() *schema.Resource { } } +func ResourceEventInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "msg": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timestamp": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTimeStampSchema(), + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceEventLogSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -12758,11 +13505,6 @@ func ResourceEventLogSchema() *schema.Resource { Optional: true, Computed: true, }, - "reason_code": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "related_uuids": { Type: schema.TypeList, Optional: true, @@ -13116,6 +13858,23 @@ func ResourceFbVsInfoSchema() *schema.Resource { } } +func ResourceFdsInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "objects": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "timeline": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceFeProxyRoutePublishConfigSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -13162,6 +13921,56 @@ func ResourceFileObjectDetailsSchema() *schema.Resource { } } +func ResourceFileObjectEventSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "message": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceFileObjectEventMapSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "task_event": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceFileObjectEventSchema(), + }, + "task_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceFileReferenceMappingSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -13965,18 +14774,6 @@ func ResourceGslbDnsInfoSchema() *schema.Resource { Optional: true, Elem: ResourceGslbPerDnsStateSchema(), }, - "gs_status": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: ResourceGslbDnsGsStatusSchema(), - }, - "retry_count": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateInteger, - }, }, } } @@ -14052,10 +14849,10 @@ func ResourceGslbDownloadStatusSchema() *schema.Resource { func ResourceGslbGeoDbEntrySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "file": { - Type: schema.TypeSet, - Required: true, - Elem: ResourceGslbGeoDbFileSchema(), + "file_obj_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, }, "priority": { Type: schema.TypeString, @@ -14174,6 +14971,19 @@ func ResourceGslbObjSchema() *schema.Resource { } } +func ResourceGslbObjInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "repl_state": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceCfgStateSchema(), + }, + }, + } +} + func ResourceGslbObjectInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -14289,6 +15099,11 @@ func ResourceGslbPoolSchema() *schema.Resource { Optional: true, Computed: true, }, + "gslb_pool_type": { + Type: schema.TypeString, + Optional: true, + Default: "GSLB_POOL_TYPE_GENERIC", + }, "manual_resume": { Type: schema.TypeString, Optional: true, @@ -14390,6 +15205,12 @@ func ResourceGslbPoolMemberSchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "srv_rdata": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbServiceSrvRdataSchema(), + }, "vs_uuid": { Type: schema.TypeString, Optional: true, @@ -14620,6 +15441,21 @@ func ResourceGslbRuntimeSchema() *schema.Resource { Optional: true, Elem: ResourceCfgStateSchema(), }, + "gslb_crm_runtime": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceGslbCRMRuntimeSchema(), + }, + "gslb_hsm_runtime": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceGslbHSMRuntimeSchema(), + }, + "gslb_sm_runtime": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceGslbSMRuntimeSchema(), + }, "ldr_state": { Type: schema.TypeSet, Optional: true, @@ -14675,6 +15511,18 @@ func ResourceGslbServiceDownResponseSchema() *schema.Resource { Computed: true, Elem: ResourceIpAddrSchema(), }, + "public_fallback_ip": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, + "public_fallback_ip6": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceIpAddrSchema(), + }, "type": { Type: schema.TypeString, Optional: true, @@ -14687,7 +15535,7 @@ func ResourceGslbServiceDownResponseSchema() *schema.Resource { func ResourceGslbServiceRuntimeSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "checksum": { + "cluster_uuid": { Type: schema.TypeString, Optional: true, Computed: true, @@ -14697,23 +15545,17 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, - "flr_state": { - Type: schema.TypeList, - Optional: true, - Elem: ResourceCfgStateSchema(), - }, "groups": { Type: schema.TypeList, Optional: true, Elem: ResourceGslbPoolRuntimeSchema(), }, - "ldr_state": { - Type: schema.TypeSet, + "name": { + Type: schema.TypeString, Optional: true, Computed: true, - Elem: ResourceCfgStateSchema(), }, - "name": { + "obj_uuid": { Type: schema.TypeString, Optional: true, Computed: true, @@ -14724,6 +15566,12 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource { Computed: true, Elem: ResourceOperationalStatusSchema(), }, + "repl_state": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceCfgStateSchema(), + }, "send_event": { Type: schema.TypeString, Optional: true, @@ -14752,6 +15600,11 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource { Optional: true, Computed: true, }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, @@ -14787,10 +15640,10 @@ func ResourceGslbServiceSitePersistencePoolSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, - "servers": { + "server_info": { Type: schema.TypeList, Optional: true, - Elem: ResourceServerConfigSchema(), + Elem: ResourceServerRuntimeSummarySchema(), }, "uuid": { Type: schema.TypeString, @@ -14801,6 +15654,28 @@ func ResourceGslbServiceSitePersistencePoolSchema() *schema.Resource { } } +func ResourceGslbServiceSrvRdataSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "port": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + "priority": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + "weight": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceGslbServiceStatusSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -14901,6 +15776,12 @@ func ResourceGslbSiteSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "replication_policy": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceReplicationPolicySchema(), + }, "suspend_mode": { Type: schema.TypeString, Optional: true, @@ -14940,6 +15821,12 @@ func ResourceGslbSiteCfgSyncInfoSchema() *schema.Resource { Computed: true, Elem: ResourceConfigVersionStatusSchema(), }, + "prev_target_version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "reason": { Type: schema.TypeString, Optional: true, @@ -14950,11 +15837,23 @@ func ResourceGslbSiteCfgSyncInfoSchema() *schema.Resource { Optional: true, Computed: true, }, + "site_version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "sync_state": { Type: schema.TypeString, Optional: true, Computed: true, }, + "target_version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, }, } } @@ -14983,6 +15882,12 @@ func ResourceGslbSiteHealthStatusSchema() *schema.Resource { Optional: true, Elem: ResourceGslbPoolMemberRuntimeInfoSchema(), }, + "controller_size": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceControllerSizeSchema(), + }, "datapath_gsinfo": { Type: schema.TypeList, Optional: true, @@ -14994,6 +15899,11 @@ func ResourceGslbSiteHealthStatusSchema() *schema.Resource { Computed: true, Elem: ResourceGslbDnsInfoSchema(), }, + "edges": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSiteLinkSchema(), + }, "gap_table": { Type: schema.TypeList, Optional: true, @@ -15871,6 +16781,12 @@ func ResourceHSMSafenetLunaSchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "use_legacy_engine": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, }, } } @@ -17186,6 +18102,11 @@ func ResourceHdrMatchSchema() *schema.Resource { Type: schema.TypeString, Required: true, }, + "string_group_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "value": { Type: schema.TypeList, Optional: true, @@ -17336,6 +18257,16 @@ func ResourceHealthMonitorHttpSchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "http_headers": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "http_method": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "http_request": { Type: schema.TypeString, Optional: true, @@ -17346,6 +18277,11 @@ func ResourceHealthMonitorHttpSchema() *schema.Resource { Optional: true, Computed: true, }, + "http_request_header_path": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "http_response": { Type: schema.TypeString, Optional: true, @@ -17512,6 +18448,12 @@ func ResourceHealthMonitorSSLAttributesSchema() *schema.Resource { Type: schema.TypeString, Required: true, }, + "use_pool_sni_server_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, }, } } @@ -18447,6 +19389,25 @@ func ResourceImageEventMapSchema() *schema.Resource { } } +func ResourceImageParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "image_replication_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "600", + ValidateFunc: validateInteger, + }, + "max_image_size": { + Type: schema.TypeString, + Optional: true, + Default: "10", + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceImageUploadOpsStatusSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -18991,11 +19952,6 @@ func ResourceIpamDnsInfobloxProfileSchema() *schema.Resource { Sensitive: true, DiffSuppressFunc: suppressSensitiveFieldDiffs, }, - "profile_url": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "usable_alloc_subnets": { Type: schema.TypeList, Optional: true, @@ -19337,7 +20293,8 @@ func ResourceJWTValidationParamsSchema() *schema.Resource { Schema: map[string]*schema.Schema{ "audience": { Type: schema.TypeString, - Required: true, + Optional: true, + Computed: true, }, }, } @@ -19539,6 +20496,11 @@ func ResourceJournalSummarySchema() *schema.Resource { Optional: true, Computed: true, }, + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "status": { Type: schema.TypeString, Optional: true, @@ -19548,6 +20510,97 @@ func ResourceJournalSummarySchema() *schema.Resource { Type: schema.TypeString, Required: true, }, + "warning_count": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceJournalTaskSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "messages": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "task_description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "task_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceJsonParsingLimitsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "max_nesting_level": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "max_subelements": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "max_total_elements": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "max_value_length": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, }, } } @@ -19598,6 +20651,22 @@ func ResourceKeyValueSchema() *schema.Resource { } } +func ResourceKeyValueConfigurationSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "key": { + Type: schema.TypeString, + Required: true, + }, + "value": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceKeyValueTupleSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -20275,6 +21344,35 @@ func ResourceLdapUserBindSettingsSchema() *schema.Resource { } } +func ResourceLeaderChangeInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + "leader_candidates": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSiteInfoSchema(), + }, + "leader_change_mode": { + Type: schema.TypeString, + Optional: true, + Default: "GSLB_LC_MODE_MANUAL", + }, + "max_unsuccessful_probes": { + Type: schema.TypeString, + Optional: true, + Default: "15", + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceLearningLogPolicySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -20449,6 +21547,24 @@ func ResourceLicenseInfoSchema() *schema.Resource { } } +func ResourceLicenseReservationInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "reserved": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceLicenseServiceUpdateSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -20693,6 +21809,37 @@ func ResourceLinuxServerHostSchema() *schema.Resource { } } +func ResourceLocalConfigSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "vsgs_info": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceVsgsOpsInfoSchema(), + }, + }, + } +} + +func ResourceLocalInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "gs_status": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbDnsGsStatusSchema(), + }, + "gslb_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbObjInfoSchema(), + }, + }, + } +} + func ResourceLocationHdrMatchSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -20855,6 +22002,11 @@ func ResourceLogManagerDebugFilterSchema() *schema.Resource { Optional: true, Computed: true, }, + "telemetry_trace_log_level": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, }, } } @@ -21299,6 +22451,18 @@ func ResourceMemoryBalancerInfoSchema() *schema.Resource { func ResourceMemoryUsageSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "available": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "effective_ctlr_mem_used_percent": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "free": { Type: schema.TypeString, Optional: true, @@ -23253,6 +24417,18 @@ func ResourceNsxtConfigurationSchema() *schema.Resource { Optional: true, Default: "default", }, + "streamline_dfw_objects": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "verify_certificate": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "vmc_mode": { Type: schema.TypeString, Optional: true, @@ -23288,6 +24464,79 @@ func ResourceNsxtCredentialsSchema() *schema.Resource { } } +func ResourceNsxtDFWGroupDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "error_string": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "group": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceNsxtDFWServiceDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "error_string": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "service": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceNsxtDFWTagSegmentPortSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "error_string": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "path": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vsuuids": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + +func ResourceNsxtDFWTagVMSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "error_string": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceNsxtDatastoresSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -23474,6 +24723,11 @@ func ResourceNsxtSIRuleDetailsSchema() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "vs": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, }, } } @@ -24092,6 +25346,11 @@ func ResourceOIDCConfigSchema() *schema.Resource { Default: "true", ValidateFunc: validateBool, }, + "userid_claim_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "userinfo": { Type: schema.TypeString, Optional: true, @@ -24498,7 +25757,7 @@ func ResourceObjSyncConfigSchema() *schema.Resource { "objsync_cpu_limit": { Type: schema.TypeString, Optional: true, - Default: "30", + Default: "0", ValidateFunc: validateInteger, }, "objsync_hub_elect_interval": { @@ -24517,6 +25776,29 @@ func ResourceObjSyncConfigSchema() *schema.Resource { } } +func ResourceObjectRuleSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceRetentionActionSchema(), + }, + "limit": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "model_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceOmittedWafLogStatsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -25055,6 +26337,24 @@ func ResourceOperationalStatusSchema() *schema.Resource { Computed: true, Elem: ResourceTimeStampSchema(), }, + "num_vs_completed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "num_vs_failed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "num_vs_total": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "reason": { Type: schema.TypeList, Optional: true, @@ -25112,6 +26412,12 @@ func ResourceOpsHistorySchema() *schema.Resource { Optional: true, Computed: true, }, + "params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceUpgradeOpsParamSchema(), + }, "patch_version": { Type: schema.TypeString, Optional: true, @@ -25158,6 +26464,18 @@ func ResourceOpsHistorySchema() *schema.Resource { } } +func ResourceOpsInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "rrtoken": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + func ResourceOrgServiceUnitsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -25495,11 +26813,6 @@ func ResourceParamSizeClassSchema() *schema.Resource { Optional: true, Computed: true, }, - "timestamps": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeInt}, - }, }, } } @@ -25513,11 +26826,6 @@ func ResourceParamTypeClassSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, - "timestamps": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeInt}, - }, "type": { Type: schema.TypeString, Optional: true, @@ -25568,6 +26876,12 @@ func ResourcePatchControllerParamsSchema() *schema.Resource { Type: schema.TypeString, Required: true, }, + "dryrun": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "prechecks_only": { Type: schema.TypeString, Optional: true, @@ -25671,6 +26985,12 @@ func ResourcePatchSystemParamsSchema() *schema.Resource { Type: schema.TypeString, Required: true, }, + "dryrun": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "prechecks_only": { Type: schema.TypeString, Optional: true, @@ -25748,6 +27068,24 @@ func ResourcePerformanceLimitsSchema() *schema.Resource { } } +func ResourcePeriodicitySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceRetentionActionSchema(), + }, + "interval": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourcePermissionSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -25857,6 +27195,31 @@ func ResourcePodTolerationSchema() *schema.Resource { } } +func ResourcePolicySpecSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "disk": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDiskThresholdSchema(), + }, + "object": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceObjectRuleSchema(), + }, + "periodic": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourcePeriodicitySchema(), + }, + }, + } +} + func ResourcePoolAnalyticsPolicySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26152,6 +27515,12 @@ func ResourcePortalConfigurationSchema() *schema.Resource { Default: "true", ValidateFunc: validateBool, }, + "enable_rate_limiter": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "http_port": { Type: schema.TypeString, Optional: true, @@ -26164,6 +27533,12 @@ func ResourcePortalConfigurationSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "legacy_ssl_support": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "minimum_password_length": { Type: schema.TypeString, Optional: true, @@ -26250,6 +27625,95 @@ func ResourcePortalFeatureOptInSchema() *schema.Resource { } } +func ResourcePostgresEventInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "db_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "event_desc": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timestamp": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourcePreChecksInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "check_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "details": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "error_details": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourcePreChecksParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "export_config_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "3600", + ValidateFunc: validateInteger, + }, + "max_alerts": { + Type: schema.TypeString, + Optional: true, + Default: "200", + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceProactiveSupportDefaultsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26490,6 +27954,25 @@ func ResourceQueryMatchSchema() *schema.Resource { } } +func ResourceQuotaConfigSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "limit": { + Type: schema.TypeString, + Optional: true, + Default: "-1", + ValidateFunc: validateInteger, + }, + "reservation": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceRancherConfigurationSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26861,6 +28344,57 @@ func ResourceRateProfileSchema() *schema.Resource { } } +func ResourceReadinessCheckObjSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "checks": { + Type: schema.TypeList, + Optional: true, + Elem: ResourcePreChecksInfoSchema(), + }, + "checks_completed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "progress": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "total_checks": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceRebalanceMigrateEventDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26950,6 +28484,37 @@ func ResourceRemoteAuthConfigurationSchema() *schema.Resource { } } +func ResourceRemoteInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "gslb_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbObjInfoSchema(), + }, + "ops_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceOpsInfoSchema(), + }, + "sync_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbSiteCfgSyncInfoSchema(), + }, + "sync_stats": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbReplicationStatsSchema(), + }, + }, + } +} + func ResourceReplaceStringVarSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26970,11 +28535,6 @@ func ResourceReplaceStringVarSchema() *schema.Resource { func ResourceReplicationPolicySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "checkpoint_ref": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "replication_mode": { Type: schema.TypeString, Optional: true, @@ -27127,6 +28687,93 @@ func ResourceReportTaskSchema() *schema.Resource { } } +func ResourceReqContentRewriteRuleSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enable": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "index": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "pairs": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSearchReplacePairSchema(), + }, + "rewritable_content_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceRequestLimiterEventInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "client_ip": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "error_status_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "message": { + Type: schema.TypeString, + Required: true, + }, + "method": { + Type: schema.TypeString, + Required: true, + }, + "processed": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "url": { + Type: schema.TypeString, + Required: true, + }, + "user_agent": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceReservedConfigurationSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "key_value_configurations": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceKeyValueConfigurationSchema(), + }, + }, + } +} + func ResourceResponseMatchTargetSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -27287,6 +28934,59 @@ func ResourceResumeSeGroupParamsSchema() *schema.Resource { } } +func ResourceRetentionActionSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "args": { + Type: schema.TypeList, + Required: true, + Elem: ResourceActionArgsSchema(), + }, + "path": { + Type: schema.TypeString, + Required: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + +func ResourceRetentionSummarySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "messages": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceRmAddNetworksEventDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -28082,6 +29782,11 @@ func ResourceRspContentRewriteRuleSchema() *schema.Resource { Optional: true, Elem: ResourceSearchReplacePairSchema(), }, + "rewritable_content_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, }, } } @@ -28166,6 +29871,51 @@ func ResourceSAMLSPConfigSchema() *schema.Resource { } } +func ResourceSCFaultOptionsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delay_create": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "delay_delete": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "delay_update": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "fault_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "object_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "se": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceSCPoolServerStateInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -28205,6 +29955,18 @@ func ResourceSCPoolServerStateInfoSchema() *schema.Resource { } } +func ResourceSCPropertiesSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delay_injections": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSCFaultOptionsSchema(), + }, + }, + } +} + func ResourceSCServerStateInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -28390,6 +30152,18 @@ func ResourceSETimeTrackerPropertiesSchema() *schema.Resource { } } +func ResourceSHMSummarySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "health_monitor": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceServerHealthMonitorSchema(), + }, + }, + } +} + func ResourceSSHSeDeploymentSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{}, @@ -28662,6 +30436,18 @@ func ResourceSSLKeyECParamsSchema() *schema.Resource { } } +func ResourceSSLKeyMldsaParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "algorithm": { + Type: schema.TypeString, + Optional: true, + Default: "SSL_KEY_MLDSA44", + }, + }, + } +} + func ResourceSSLKeyParamsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -28675,6 +30461,12 @@ func ResourceSSLKeyParamsSchema() *schema.Resource { Computed: true, Elem: ResourceSSLKeyECParamsSchema(), }, + "mldsa_params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSSLKeyMldsaParamsSchema(), + }, "rsa_params": { Type: schema.TypeSet, Optional: true, @@ -28801,17 +30593,11 @@ func ResourceSSLVersionSchema() *schema.Resource { func ResourceSaasLicensingInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "max_service_units": { + "enable_notional_reserve": { Type: schema.TypeString, Optional: true, - Default: "0", - ValidateFunc: validateFloat, - }, - "reserve_service_units": { - Type: schema.TypeString, - Optional: true, - Default: "0", - ValidateFunc: validateFloat, + Default: "true", + ValidateFunc: validateBool, }, }, } @@ -28838,6 +30624,11 @@ func ResourceSaasLicensingStatusSchema() *schema.Resource { Computed: true, ValidateFunc: validateBool, }, + "last_refreshed_at": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "message": { Type: schema.TypeString, Optional: true, @@ -28853,6 +30644,17 @@ func ResourceSaasLicensingStatusSchema() *schema.Resource { Optional: true, Computed: true, }, + "refresh_status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "refreshed_at": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "reserve_service_units": { Type: schema.TypeString, Optional: true, @@ -29547,6 +31349,26 @@ func ResourceSeAgentStateCachePropertiesSchema() *schema.Resource { } } +func ResourceSeAutoScalerEventDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "actions": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceVipActionSchema(), + }, + "request_source": { + Type: schema.TypeString, + Required: true, + }, + "se_group_uuid": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + func ResourceSeBgpPeerDownDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -29981,6 +31803,30 @@ func ResourceSeGroupAnalyticsPolicySchema() *schema.Resource { } } +func ResourceSeGroupInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "consumed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, + "escrow": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceSeGroupOptionsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -31401,6 +33247,47 @@ func ResourceSePoolLbEventDetailsSchema() *schema.Resource { } } +func ResourceSeProcessCrashedDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "crash_counter": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "process_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "se_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceSeRateLimiterDropDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "num_pkts_dropped": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "se_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceSeRateLimitersSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -31434,6 +33321,12 @@ func ResourceSeRateLimitersSchema() *schema.Resource { Default: "2000", ValidateFunc: validateInteger, }, + "nd_rl": { + Type: schema.TypeString, + Optional: true, + Default: "2000", + ValidateFunc: validateInteger, + }, "rst_rl": { Type: schema.TypeString, Optional: true, @@ -31520,6 +33413,11 @@ func ResourceSeResourcesSchema() *schema.Resource { Required: true, ValidateFunc: validateInteger, }, + "qat_mode": { + Type: schema.TypeString, + Optional: true, + Default: "QAT_OFF", + }, "sockets": { Type: schema.TypeString, Optional: true, @@ -32433,6 +34331,43 @@ func ResourceSeVnicUpEventDetailsSchema() *schema.Resource { } } +func ResourceSeVsConfigSeDatastoreDownloadFailedSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "fail_obj_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "fail_obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "fail_reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "parent_obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "se_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vs_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceSeVsDelFlowsDisruptedSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -32949,6 +34884,11 @@ func ResourceServerSchema() *schema.Resource { Optional: true, Computed: true, }, + "health_monitor_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "hostname": { Type: schema.TypeString, Optional: true, @@ -33015,6 +34955,12 @@ func ResourceServerSchema() *schema.Resource { Optional: true, Computed: true, }, + "srv_rdata": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGslbServiceSrvRdataSchema(), + }, "static": { Type: schema.TypeString, Optional: true, @@ -33316,6 +35262,43 @@ func ResourceServerConfigSchema() *schema.Resource { } } +func ResourceServerHealthMonitorSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "avg_response_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "failure_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + }, + "reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "recent_response_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "state": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + func ResourceServerIdSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -33338,6 +35321,79 @@ func ResourceServerIdSchema() *schema.Resource { } } +func ResourceServerRuntimeSummarySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "get_state": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "health_monitor_list": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSHMSummarySchema(), + }, + "hostname": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "ip_addr": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceIpAddrSchema(), + }, + "is_local": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + "is_standby": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "location": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceGeoLocationSchema(), + }, + "oper_status": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceOperationalStatusSchema(), + }, + "port": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + "resolve_server_by_dns": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "se_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vs_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceServiceSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -33365,6 +35421,12 @@ func ResourceServiceSchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "is_passive_ftp_data_port": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "override_application_profile_ref": { Type: schema.TypeString, Optional: true, @@ -33431,58 +35493,83 @@ func ResourceServiceEngineCloudLimitsSchema() *schema.Resource { func ResourceServiceEngineLimitsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "all_virtualservices_per_serviceengine": { + "num_logical_intf_per_se": { Type: schema.TypeString, Optional: true, Computed: true, ValidateFunc: validateInteger, }, - "ew_virtualservices_per_serviceengine": { + "num_phy_intf_per_se": { Type: schema.TypeString, Optional: true, Computed: true, ValidateFunc: validateInteger, }, - "ns_virtualservices_per_serviceengine": { + "num_virtualservices_rt_metrics": { Type: schema.TypeString, Optional: true, Computed: true, ValidateFunc: validateInteger, }, - "num_logical_intf_per_se": { + "num_vlan_intf_per_phy_intf": { Type: schema.TypeString, Optional: true, Computed: true, ValidateFunc: validateInteger, }, - "num_phy_intf_per_se": { + "num_vlan_intf_per_se": { Type: schema.TypeString, Optional: true, Computed: true, ValidateFunc: validateInteger, }, - "num_virtualservices_rt_metrics": { + "serviceengine_cloud_limits": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceServiceEngineCloudLimitsSchema(), + }, + }, + } +} + +func ResourceServiceEngineParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "concurrent_segroup_upgrades": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: "8", ValidateFunc: validateInteger, }, - "num_vlan_intf_per_phy_intf": { + "image_data_transfer_size": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: "512", ValidateFunc: validateInteger, }, - "num_vlan_intf_per_se": { + "large_se_connect_timeout": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: "1200", ValidateFunc: validateInteger, }, - "serviceengine_cloud_limits": { - Type: schema.TypeList, - Optional: true, - Elem: ResourceServiceEngineCloudLimitsSchema(), + "se_connect_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "600", + ValidateFunc: validateInteger, + }, + "simultaneous_image_downloads": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, + "task_base_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "300", + ValidateFunc: validateInteger, }, }, } @@ -33912,6 +35999,42 @@ func ResourceSipServiceApplicationProfileSchema() *schema.Resource { } } +func ResourceSiteInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cluster_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "site_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceSiteLinkSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "destination": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSiteInfoSchema(), + }, + "source": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceSiteInfoSchema(), + }, + }, + } +} + func ResourceSnmpConfigurationSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -34553,6 +36676,30 @@ func ResourceSupportedMigrationsSchema() *schema.Resource { Default: "128", ValidateFunc: validateInteger, }, + "dryrun_min_cores": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, + "dryrun_min_free_disk_size": { + Type: schema.TypeString, + Optional: true, + Default: "18", + ValidateFunc: validateInteger, + }, + "dryrun_min_memory": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateFloat, + }, + "dryrun_total_memory_required": { + Type: schema.TypeString, + Optional: true, + Default: "12", + ValidateFunc: validateFloat, + }, "max_active_versions": { Type: schema.TypeString, Optional: true, @@ -34706,6 +36853,62 @@ func ResourceSwitchoverFailEventDetailsSchema() *schema.Resource { } } +func ResourceSystemLimitObjectCountSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "current_count": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "limit": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "limit_description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "limit_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "recommended_max_limit": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceSystemLimitObjectCountsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "object_counts": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceSystemLimitObjectCountSchema(), + }, + }, + } +} + func ResourceTCPApplicationProfileSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -34761,6 +36964,25 @@ func ResourceTCPFastPathProfileSchema() *schema.Resource { Default: "300", ValidateFunc: validateInteger, }, + "tcp_fastpath_options": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTCPOptionsSchema(), + }, + }, + } +} + +func ResourceTCPOptionsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "strip_sack": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, }, } } @@ -34768,6 +36990,12 @@ func ResourceTCPFastPathProfileSchema() *schema.Resource { func ResourceTCPProxyProfileSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "ack_on_push": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "aggressive_congestion_avoidance": { Type: schema.TypeString, Optional: true, @@ -34797,6 +37025,18 @@ func ResourceTCPProxyProfileSchema() *schema.Resource { Default: "2", ValidateFunc: validateInteger, }, + "delayed_ack_mode": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "delayed_ack_timer_delay": { + Type: schema.TypeString, + Optional: true, + Default: "100", + ValidateFunc: validateInteger, + }, "idle_connection_timeout": { Type: schema.TypeString, Optional: true, @@ -34975,22 +37215,90 @@ func ResourceTcpAttacksSchema() *schema.Resource { func ResourceTechSupportEventSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "tech_support_status": { + "tech_support": { Type: schema.TypeSet, Optional: true, Computed: true, - Elem: ResourceTechSupportStatusSchema(), + Elem: ResourceTechSupportSchema(), }, - "tenant": { + }, + } +} + +func ResourceTechSupportEventMapSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "details": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { Type: schema.TypeString, Optional: true, Computed: true, }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "sub_events": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceUpgradeEventSchema(), + }, + "task_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceTechSupportEventParamsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "collect_all_events": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "days": { + Type: schema.TypeString, + Optional: true, + Default: "2", + ValidateFunc: validateInteger, + }, + "files": { + Type: schema.TypeString, + Optional: true, + Default: "8", + ValidateFunc: validateInteger, + }, }, } } -func ResourceTechSupportStatusSchema() *schema.Resource { +func ResourceTechSupportParamsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ "case_number": { @@ -34998,20 +37306,21 @@ func ResourceTechSupportStatusSchema() *schema.Resource { Optional: true, Computed: true, }, - "duration": { + "description": { Type: schema.TypeString, Optional: true, Computed: true, }, - "errors": { - Type: schema.TypeList, + "duration": { + Type: schema.TypeString, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, }, - "key": { - Type: schema.TypeString, + "event_params": { + Type: schema.TypeSet, Optional: true, Computed: true, + Elem: ResourceTechSupportEventParamsSchema(), }, "level": { Type: schema.TypeString, @@ -35023,40 +37332,77 @@ func ResourceTechSupportStatusSchema() *schema.Resource { Optional: true, Computed: true, }, - "node": { + "pattern": { Type: schema.TypeString, Optional: true, Computed: true, }, - "output": { + "skip_warnings": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "slug": { Type: schema.TypeString, Optional: true, Computed: true, }, - "size": { + "start_timestamp": { Type: schema.TypeString, Optional: true, Computed: true, }, - "start_time": { + "tenant": { Type: schema.TypeString, Optional: true, Computed: true, }, - "status": { + "uuid": { Type: schema.TypeString, Optional: true, Computed: true, }, - "status_code": { + }, + } +} + +func ResourceTechSupportStateSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "last_changed_time": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTimeStampSchema(), + }, + "reason": { Type: schema.TypeString, Optional: true, Computed: true, }, - "warnings": { - Type: schema.TypeList, + "state": { + Type: schema.TypeString, Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + }, + } +} + +func ResourceTelemetryConfigurationSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enable": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + "url": { + Type: schema.TypeString, + Optional: true, + Computed: true, }, }, } @@ -35065,6 +37411,12 @@ func ResourceTechSupportStatusSchema() *schema.Resource { func ResourceTenantConfigurationSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "license_quota": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceQuotaConfigSchema(), + }, "se_in_provider_context": { Type: schema.TypeString, Optional: true, @@ -35297,6 +37649,24 @@ func ResourceTlsFingerprintMatchSchema() *schema.Resource { } } +func ResourceTokenRefillRateSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "interval": { + Type: schema.TypeString, + Optional: true, + Default: "PER_MINUTE_INTERVAL", + }, + "refill_rate": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceTrueClientIPConfigSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -35320,6 +37690,24 @@ func ResourceTrueClientIPConfigSchema() *schema.Resource { } } +func ResourceTrustedHostSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "host": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceIpAddrSchema(), + }, + "port": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceUDPFastPathProfileSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -35367,11 +37755,21 @@ func ResourceUDPProxyProfileSchema() *schema.Resource { func ResourceURIInfoSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "method": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "param_info": { Type: schema.TypeList, Optional: true, Elem: ResourceParamInfoSchema(), }, + "parser": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uri_hits": { Type: schema.TypeString, Optional: true, @@ -35504,6 +37902,12 @@ func ResourceUpgradeControllerParamsSchema() *schema.Resource { Optional: true, Computed: true, }, + "dryrun": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "image_ref": { Type: schema.TypeString, Required: true, @@ -35621,6 +38025,12 @@ func ResourceUpgradeOpsEntrySchema() *schema.Resource { func ResourceUpgradeOpsParamSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "controller": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceControllerParamsSchema(), + }, "image_ref": { Type: schema.TypeString, Optional: true, @@ -35643,6 +38053,12 @@ func ResourceUpgradeOpsParamSchema() *schema.Resource { Computed: true, Elem: ResourceSeGroupResumeOptionsSchema(), }, + "service_engine": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceServiceEngineParamsSchema(), + }, }, } } @@ -35684,6 +38100,12 @@ func ResourceUpgradeParamsSchema() *schema.Resource { Optional: true, Computed: true, }, + "dryrun": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "image_ref": { Type: schema.TypeString, Optional: true, @@ -35692,7 +38114,7 @@ func ResourceUpgradeParamsSchema() *schema.Resource { "prechecks_only": { Type: schema.TypeString, Optional: true, - Default: "false", + Computed: true, ValidateFunc: validateBool, }, "se_group_options": { @@ -35714,13 +38136,13 @@ func ResourceUpgradeParamsSchema() *schema.Resource { "skip_warnings": { Type: schema.TypeString, Optional: true, - Default: "false", + Computed: true, ValidateFunc: validateBool, }, "system": { Type: schema.TypeString, Optional: true, - Default: "false", + Computed: true, ValidateFunc: validateBool, }, }, @@ -35762,6 +38184,12 @@ func ResourceUpgradeReadinessCheckObjSchema() *schema.Resource { Optional: true, Computed: true, }, + "progress": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, "start_time": { Type: schema.TypeString, Optional: true, @@ -35835,6 +38263,12 @@ func ResourceUpgradeSystemParamsSchema() *schema.Resource { Optional: true, Computed: true, }, + "dryrun": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "image_ref": { Type: schema.TypeString, Required: true, @@ -35866,6 +38300,45 @@ func ResourceUpgradeSystemParamsSchema() *schema.Resource { } } +func ResourceUsageMeteringCloudSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceUsageMeteringEventDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "clouds": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceUsageMeteringCloudSchema(), + }, + "message": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "trigger": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceUserActivitySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -36259,6 +38732,11 @@ func ResourceVIMgrGuestNicRuntimeSchema() *schema.Resource { Optional: true, Computed: true, }, + "segment_port": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "type": { Type: schema.TypeString, Required: true, @@ -37267,6 +39745,17 @@ func ResourceVersionInfoSchema() *schema.Resource { Optional: true, Computed: true, }, + "reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "uuid": { Type: schema.TypeString, Optional: true, @@ -37635,6 +40124,77 @@ func ResourceVipSchema() *schema.Resource { } } +func ResourceVipActionSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "action": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "from_se": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "new_vcpus": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "se_list": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timestamp": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "to_new_se": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "to_se": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vip_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vip_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vs_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "waiting_for_sibling": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + }, + } +} + func ResourceVipAutoscaleConfigurationSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -38064,6 +40624,12 @@ func ResourceVipSeAssignedSchema() *schema.Resource { Computed: true, ValidateFunc: validateBool, }, + "sec_idx": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, "snat_ip": { Type: schema.TypeSet, Optional: true, @@ -38644,6 +41210,34 @@ func ResourceVsFsmEventDetailsSchema() *schema.Resource { } } +func ResourceVsGsStatusSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "details": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vsgs_obj": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceVsGsSchema(), + }, + }, + } +} + func ResourceVsInitialPlacementEventDetailsSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -38750,6 +41344,11 @@ func ResourceVsMigrateParamsSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "source": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "to_host_ref": { Type: schema.TypeString, Optional: true, @@ -38917,6 +41516,11 @@ func ResourceVsScaleinParamsSchema() *schema.Resource { Computed: true, ValidateFunc: validateBool, }, + "source": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, @@ -38946,6 +41550,11 @@ func ResourceVsScaleoutParamsSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "source": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "to_host_ref": { Type: schema.TypeString, Optional: true, @@ -40205,6 +42814,12 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource { Computed: true, ValidateFunc: validateFloat, }, + "effective_sampling_rate": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, "max_concurrent_sessions": { Type: schema.TypeString, Optional: true, @@ -40407,6 +43022,18 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource { Computed: true, ValidateFunc: validateFloat, }, + "sum_num_optional_processing_admitted": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, + "sum_num_optional_processing_refused": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, "sum_num_page_load_time_bucket1": { Type: schema.TypeString, Optional: true, @@ -40425,6 +43052,12 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource { Computed: true, ValidateFunc: validateFloat, }, + "sum_optional_cpu_usage": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, "sum_other_client_txn_latency": { Type: schema.TypeString, Optional: true, @@ -40723,6 +43356,46 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource { } } +func ResourceVsgsOpsInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dnsvs_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "ops": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "timestamp": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTimeStampSchema(), + }, + }, + } +} + +func ResourceVsphereStoragePolicySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "vcenter_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "vsphere_storage_policy_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceVssPlacementSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -40963,12 +43636,35 @@ func ResourceWafConfigSchema() *schema.Resource { Default: "0", ValidateFunc: validateInteger, }, + "enable_json_parsing_limits": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "enforce_max_body_size": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "ignore_incomplete_request_body_error": { Type: schema.TypeString, Optional: true, Default: "true", ValidateFunc: validateBool, }, + "json_parsing_limits": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceJsonParsingLimitsSchema(), + }, + "match_element_sub_parsers": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceWafMatchElementSubParserSchema(), + }, "max_execution_time": { Type: schema.TypeString, Optional: true, @@ -41044,6 +43740,11 @@ func ResourceWafConfigSchema() *schema.Resource { Optional: true, Default: "X-WAF-Result", }, + "xml_collection": { + Type: schema.TypeString, + Optional: true, + Default: "WAF_XML_COLLECTION_XML", + }, "xml_xxe_protection": { Type: schema.TypeString, Optional: true, @@ -41299,6 +44000,42 @@ func ResourceWafLogSchema() *schema.Resource { Optional: true, Computed: true, }, + "used_body_parser": { + Type: schema.TypeString, + Optional: true, + Default: "WAF_REQUEST_PARSER_DO_NOT_PARSE", + }, + }, + } +} + +func ResourceWafMatchElementSubParserSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "index": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + "match_case": { + Type: schema.TypeString, + Optional: true, + Default: "SENSITIVE", + }, + "match_element": { + Type: schema.TypeString, + Required: true, + }, + "match_op": { + Type: schema.TypeString, + Optional: true, + Default: "EQUALS", + }, + "sub_parser": { + Type: schema.TypeString, + Optional: true, + Default: "WAF_REQUEST_PARSER_AUTO_DETECT", + }, }, } } @@ -41453,6 +44190,12 @@ func ResourceWafPSMRuleSchema() *schema.Resource { Default: "true", ValidateFunc: validateBool, }, + "ignore_hit_action": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "index": { Type: schema.TypeString, Required: true, @@ -41845,6 +44588,23 @@ func ResourceWafWhitelistLogSchema() *schema.Resource { } } +func ResourceWarningEventDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "event_data": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "warning_message": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceWebApplicationSignatureServiceStatusSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -41999,6 +44759,12 @@ func ResourcevCenterConfigurationSchema() *schema.Resource { Optional: true, Computed: true, }, + "verify_certificate": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, }, } } diff --git a/avi/resource_avi_retentionpolicy.go b/avi/resource_avi_retentionpolicy.go new file mode 100644 index 000000000..8f259b47e --- /dev/null +++ b/avi/resource_avi_retentionpolicy.go @@ -0,0 +1,109 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceRetentionPolicySchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "enabled": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, + "history": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceRetentionSummarySchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "policy": { + Type: schema.TypeSet, + Required: true, + Elem: ResourcePolicySpecSchema(), + }, + "summary": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceRetentionSummarySchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviRetentionPolicy() *schema.Resource { + return &schema.Resource{ + Create: resourceAviRetentionPolicyCreate, + Read: ResourceAviRetentionPolicyRead, + Update: resourceAviRetentionPolicyUpdate, + Delete: resourceAviRetentionPolicyDelete, + Schema: ResourceRetentionPolicySchema(), + Importer: &schema.ResourceImporter{ + State: ResourceRetentionPolicyImporter, + }, + } +} + +func ResourceRetentionPolicyImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceRetentionPolicySchema() + return ResourceImporter(d, m, "retentionpolicy", s) +} + +func ResourceAviRetentionPolicyRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceRetentionPolicySchema() + err := APIRead(d, meta, "retentionpolicy", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviRetentionPolicyCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceRetentionPolicySchema() + err := APICreate(d, meta, "retentionpolicy", s) + if err == nil { + err = ResourceAviRetentionPolicyRead(d, meta) + } + return err +} + +func resourceAviRetentionPolicyUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceRetentionPolicySchema() + var err error + err = APIUpdate(d, meta, "retentionpolicy", s) + if err == nil { + err = ResourceAviRetentionPolicyRead(d, meta) + } + return err +} + +func resourceAviRetentionPolicyDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "retentionpolicy") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_rmcloudopsproto.go b/avi/resource_avi_rmcloudopsproto.go index 016f93575..bffb981c9 100644 --- a/avi/resource_avi_rmcloudopsproto.go +++ b/avi/resource_avi_rmcloudopsproto.go @@ -33,6 +33,12 @@ func ResourceRmCloudOpsProtoSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateInteger, }, + "se_create_limit_reached": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go index 6dd713cfc..bfd928e4c 100644 --- a/avi/resource_avi_serviceenginegroup.go +++ b/avi/resource_avi_serviceenginegroup.go @@ -67,6 +67,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "8", ValidateFunc: validateInteger, }, + "arp_cache_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "1200", + ValidateFunc: validateInteger, + }, "async_ssl": { Type: schema.TypeString, Optional: true, @@ -90,17 +96,35 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeInt}, }, + "auto_rebalance_cool_down_time": { + Type: schema.TypeString, + Optional: true, + Default: "15", + ValidateFunc: validateInteger, + }, "auto_rebalance_criteria": { Type: schema.TypeList, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "auto_rebalance_dry_run_enabled": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "auto_rebalance_interval": { Type: schema.TypeString, Optional: true, Default: "300", ValidateFunc: validateInteger, }, + "auto_rebalance_raise_events_for_actions": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "auto_redistribute_active_standby_load": { Type: schema.TypeString, Optional: true, @@ -262,6 +286,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateBool, }, + "disable_qat_bulk_crypto": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "disable_se_memory_check": { Type: schema.TypeString, Optional: true, @@ -388,6 +418,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateBool, }, + "enable_qat": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "ephemeral_portrange_end": { Type: schema.TypeString, Optional: true, @@ -558,6 +594,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Optional: true, Elem: ResourceKniPortRangeSchema(), }, + "kv_val_max_len": { + Type: schema.TypeString, + Optional: true, + Default: "4096", + ValidateFunc: validateInteger, + }, "l7_conns_per_core": { Type: schema.TypeString, Optional: true, @@ -593,6 +635,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "true", ValidateFunc: validateBool, }, + "license_quota": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceQuotaConfigSchema(), + }, "license_tier": { Type: schema.TypeString, Optional: true, @@ -716,6 +764,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateInteger, }, + "max_cpu_load_adaptive_sampling": { + Type: schema.TypeString, + Optional: true, + Default: "80", + ValidateFunc: validateInteger, + }, "max_cpu_usage": { Type: schema.TypeString, Optional: true, @@ -857,6 +911,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Type: schema.TypeString, Required: true, }, + "nd6_cache_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "86400", + ValidateFunc: validateInteger, + }, "netlink_poller_threads": { Type: schema.TypeString, Optional: true, @@ -923,6 +983,11 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceObjSyncConfigSchema(), }, + "objsync_mode": { + Type: schema.TypeString, + Optional: true, + Default: "OBJSYNC_ENABLED", + }, "objsync_port": { Type: schema.TypeString, Optional: true, @@ -990,6 +1055,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Optional: true, Default: "PLACEMENT_MODE_AUTO", }, + "pre_upgrade_se_available_mem_threshold": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, "realtime_se_metrics": { Type: schema.TypeSet, Optional: true, @@ -1008,6 +1079,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "1000", ValidateFunc: validateInteger, }, + "reserved_configuration": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceReservedConfigurationSchema(), + }, "resync_time_interval": { Type: schema.TypeString, Optional: true, @@ -1020,6 +1097,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "100", ValidateFunc: validateInteger, }, + "sdb_key_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "60", + ValidateFunc: validateInteger, + }, "sdb_pipeline_size": { Type: schema.TypeString, Optional: true, @@ -1180,6 +1263,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "0", ValidateFunc: validateInteger, }, + "se_kernel_rss": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "se_kni_burst_factor": { Type: schema.TypeString, Optional: true, @@ -1506,16 +1595,10 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, - "use_objsync": { - Type: schema.TypeString, - Optional: true, - Default: "false", - ValidateFunc: validateBool, - }, "use_standard_alb": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: "true", ValidateFunc: validateBool, }, "user_agent_cache_config": { @@ -1680,6 +1763,11 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "300", ValidateFunc: validateInteger, }, + "vsphere_storage_policies": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceVsphereStoragePolicySchema(), + }, "vss_placement": { Type: schema.TypeSet, Optional: true, @@ -1704,6 +1792,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "64", ValidateFunc: validateInteger, }, + "waf_use_jit_for_pcre": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, } } diff --git a/avi/resource_avi_snmptrapprofile_test.go b/avi/resource_avi_snmptrapprofile_test.go index 4678b40de..be32321a1 100644 --- a/avi/resource_avi_snmptrapprofile_test.go +++ b/avi/resource_avi_snmptrapprofile_test.go @@ -97,6 +97,15 @@ data "avi_tenant" "default_tenant"{ resource "avi_snmptrapprofile" "testSnmpTrapProfile" { name = "test-snmp-test-abc" tenant_ref = data.avi_tenant.default_tenant.id + trap_servers { + community = "abc" + ip_addr { + addr = "10.10.10.2" + type = "V4" + } + port = "162" + version = "SNMP_VER2" +} } ` @@ -107,5 +116,14 @@ data "avi_tenant" "default_tenant"{ resource "avi_snmptrapprofile" "testSnmpTrapProfile" { name = "test-snmp-updated" tenant_ref = data.avi_tenant.default_tenant.id + trap_servers { + community = "abc" + ip_addr { + addr = "10.10.10.2" + type = "V4" + } + port = "162" + version = "SNMP_VER2" +} } ` diff --git a/avi/resource_avi_sslprofile.go b/avi/resource_avi_sslprofile.go index 3beae09e0..2309e4ad2 100644 --- a/avi/resource_avi_sslprofile.go +++ b/avi/resource_avi_sslprofile.go @@ -20,6 +20,12 @@ func ResourceSSLProfileSchema() map[string]*schema.Schema { Required: true, Elem: ResourceSSLVersionSchema(), }, + "allow_legacy_renegotiation": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "cipher_enums": { Type: schema.TypeList, Optional: true, diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go index 4486c3f12..1ce4457f9 100644 --- a/avi/resource_avi_systemconfiguration.go +++ b/avi/resource_avi_systemconfiguration.go @@ -16,6 +16,13 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceAdminAuthConfigurationSchema(), }, + "avi_email_login_password": { + Type: schema.TypeString, + Optional: true, + Computed: true, + Sensitive: true, + DiffSuppressFunc: suppressSensitiveFieldDiffs, + }, "common_criteria_mode": { Type: schema.TypeString, Optional: true, @@ -74,7 +81,7 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, - "enable_telemetry": { + "enable_license_quota": { Type: schema.TypeString, Optional: true, Default: "true", @@ -102,6 +109,18 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "legacy_ssl_support": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "license_quota": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceQuotaConfigSchema(), + }, "linux_configuration": { Type: schema.TypeSet, Optional: true, @@ -142,6 +161,11 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Optional: true, Default: "default", }, + "sddcmanager_fqdn": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "secure_channel_configuration": { Type: schema.TypeSet, Optional: true, @@ -164,11 +188,45 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "sync_dns_to_se": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "sync_kex_host_to_se": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "sync_syslog_to_se": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, + "syslog_servers": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceIpAddrSchema(), + }, + "telemetry_configuration": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTelemetryConfigurationSchema(), + }, "trusted_host_profiles_refs": { Type: schema.TypeList, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "truststore_pkiprofile_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_systemreport.go b/avi/resource_avi_systemreport.go index 3268f738c..7d3831856 100644 --- a/avi/resource_avi_systemreport.go +++ b/avi/resource_avi_systemreport.go @@ -26,6 +26,12 @@ func ResourceSystemReportSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "dryrun_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDryrunInfoSchema(), + }, "events": { Type: schema.TypeList, Optional: true, @@ -41,6 +47,11 @@ func ResourceSystemReportSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "operation": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "readiness_reports": { Type: schema.TypeList, Optional: true, @@ -73,6 +84,11 @@ func ResourceSystemReportSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_taskjournal.go b/avi/resource_avi_taskjournal.go index 8ce975e98..88b220acb 100644 --- a/avi/resource_avi_taskjournal.go +++ b/avi/resource_avi_taskjournal.go @@ -51,6 +51,11 @@ func ResourceTaskJournalSchema() map[string]*schema.Schema { Required: true, Elem: ResourceJournalSummarySchema(), }, + "tasks": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceJournalTaskSchema(), + }, "tenant_ref": { Type: schema.TypeString, Optional: true, @@ -61,6 +66,11 @@ func ResourceTaskJournalSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "warnings": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceJournalErrorSchema(), + }, } } diff --git a/avi/resource_avi_techsupport.go b/avi/resource_avi_techsupport.go new file mode 100644 index 000000000..a32746e51 --- /dev/null +++ b/avi/resource_avi_techsupport.go @@ -0,0 +1,195 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceTechSupportSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "case_number": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "end_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "errors": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "level": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "node": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "output": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportParamsSchema(), + }, + "progress": { + Type: schema.TypeString, + Optional: true, + Default: "0", + ValidateFunc: validateInteger, + }, + "size": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "state": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportStateSchema(), + }, + "tasks": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceTechSupportEventMapSchema(), + }, + "tasks_completed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "techsupport_readiness": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceReadinessCheckObjSchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "total_tasks": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "warnings": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + } +} + +func resourceAviTechSupport() *schema.Resource { + return &schema.Resource{ + Create: resourceAviTechSupportCreate, + Read: ResourceAviTechSupportRead, + Update: resourceAviTechSupportUpdate, + Delete: resourceAviTechSupportDelete, + Schema: ResourceTechSupportSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceTechSupportImporter, + }, + } +} + +func ResourceTechSupportImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceTechSupportSchema() + return ResourceImporter(d, m, "techsupport", s) +} + +func ResourceAviTechSupportRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportSchema() + err := APIRead(d, meta, "techsupport", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviTechSupportCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportSchema() + err := APICreate(d, meta, "techsupport", s) + if err == nil { + err = ResourceAviTechSupportRead(d, meta) + } + return err +} + +func resourceAviTechSupportUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportSchema() + var err error + err = APIUpdate(d, meta, "techsupport", s) + if err == nil { + err = ResourceAviTechSupportRead(d, meta) + } + return err +} + +func resourceAviTechSupportDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "techsupport") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_techsupportmessage.go b/avi/resource_avi_techsupportmessage.go new file mode 100644 index 000000000..f1ca1d5c1 --- /dev/null +++ b/avi/resource_avi_techsupportmessage.go @@ -0,0 +1,87 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceTechSupportMessageSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "tech_support_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviTechSupportMessage() *schema.Resource { + return &schema.Resource{ + Create: resourceAviTechSupportMessageCreate, + Read: ResourceAviTechSupportMessageRead, + Update: resourceAviTechSupportMessageUpdate, + Delete: resourceAviTechSupportMessageDelete, + Schema: ResourceTechSupportMessageSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceTechSupportMessageImporter, + }, + } +} + +func ResourceTechSupportMessageImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceTechSupportMessageSchema() + return ResourceImporter(d, m, "techsupportmessage", s) +} + +func ResourceAviTechSupportMessageRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportMessageSchema() + err := APIRead(d, meta, "techsupportmessage", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviTechSupportMessageCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportMessageSchema() + err := APICreate(d, meta, "techsupportmessage", s) + if err == nil { + err = ResourceAviTechSupportMessageRead(d, meta) + } + return err +} + +func resourceAviTechSupportMessageUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportMessageSchema() + var err error + err = APIUpdate(d, meta, "techsupportmessage", s) + if err == nil { + err = ResourceAviTechSupportMessageRead(d, meta) + } + return err +} + +func resourceAviTechSupportMessageDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "techsupportmessage") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_techsupportprofile.go b/avi/resource_avi_techsupportprofile.go new file mode 100644 index 000000000..1cd75ce3f --- /dev/null +++ b/avi/resource_avi_techsupportprofile.go @@ -0,0 +1,125 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceTechSupportProfileSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "archive_rules": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceArchiveRulesSchema(), + }, + "event_params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportEventParamsSchema(), + }, + "file_size_threshold": { + Type: schema.TypeString, + Optional: true, + Default: "128", + ValidateFunc: validateInteger, + }, + "max_disk_size_percent": { + Type: schema.TypeString, + Optional: true, + Default: "10", + ValidateFunc: validateInteger, + }, + "min_free_disk_required": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, + "no_of_techsupport_retentions": { + Type: schema.TypeString, + Optional: true, + Default: "4", + ValidateFunc: validateInteger, + }, + "simultaneous_invocations": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, + "task_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "180", + ValidateFunc: validateInteger, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviTechSupportProfile() *schema.Resource { + return &schema.Resource{ + Create: resourceAviTechSupportProfileCreate, + Read: ResourceAviTechSupportProfileRead, + Update: resourceAviTechSupportProfileUpdate, + Delete: resourceAviTechSupportProfileDelete, + Schema: ResourceTechSupportProfileSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceTechSupportProfileImporter, + }, + } +} + +func ResourceTechSupportProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceTechSupportProfileSchema() + return ResourceImporter(d, m, "techsupportprofile", s) +} + +func ResourceAviTechSupportProfileRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportProfileSchema() + err := APIRead(d, meta, "techsupportprofile", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviTechSupportProfileCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportProfileSchema() + err := APICreate(d, meta, "techsupportprofile", s) + if err == nil { + err = ResourceAviTechSupportProfileRead(d, meta) + } + return err +} + +func resourceAviTechSupportProfileUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTechSupportProfileSchema() + var err error + err = APIUpdate(d, meta, "techsupportprofile", s) + if err == nil { + err = ResourceAviTechSupportProfileRead(d, meta) + } + return err +} + +func resourceAviTechSupportProfileDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "techsupportprofile") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_trustedhostprofile.go b/avi/resource_avi_trustedhostprofile.go index 296b2ca94..51b630059 100644 --- a/avi/resource_avi_trustedhostprofile.go +++ b/avi/resource_avi_trustedhostprofile.go @@ -19,7 +19,7 @@ func ResourceTrustedHostProfileSchema() map[string]*schema.Schema { "hosts": { Type: schema.TypeList, Required: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Elem: ResourceTrustedHostSchema(), }, "name": { Type: schema.TypeString, diff --git a/avi/resource_avi_upgradeprofile.go b/avi/resource_avi_upgradeprofile.go new file mode 100644 index 000000000..1a83fcb72 --- /dev/null +++ b/avi/resource_avi_upgradeprofile.go @@ -0,0 +1,107 @@ +// Copyright 2019 VMware, Inc. +// SPDX-License-Identifier: Mozilla Public License 2.0 + +package avi + +import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "log" +) + +func ResourceUpgradeProfileSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "controller_params": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceControllerParamsSchema(), + }, + "dry_run": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDryRunParamsSchema(), + }, + "image": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceImageParamsSchema(), + }, + "pre_checks": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourcePreChecksParamsSchema(), + }, + "service_engine": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceServiceEngineParamsSchema(), + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviUpgradeProfile() *schema.Resource { + return &schema.Resource{ + Create: resourceAviUpgradeProfileCreate, + Read: ResourceAviUpgradeProfileRead, + Update: resourceAviUpgradeProfileUpdate, + Delete: resourceAviUpgradeProfileDelete, + Schema: ResourceUpgradeProfileSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceUpgradeProfileImporter, + }, + } +} + +func ResourceUpgradeProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceUpgradeProfileSchema() + return ResourceImporter(d, m, "upgradeprofile", s) +} + +func ResourceAviUpgradeProfileRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceUpgradeProfileSchema() + err := APIRead(d, meta, "upgradeprofile", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviUpgradeProfileCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceUpgradeProfileSchema() + err := APICreate(d, meta, "upgradeprofile", s) + if err == nil { + err = ResourceAviUpgradeProfileRead(d, meta) + } + return err +} + +func resourceAviUpgradeProfileUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceUpgradeProfileSchema() + var err error + err = APIUpdate(d, meta, "upgradeprofile", s) + if err == nil { + err = ResourceAviUpgradeProfileRead(d, meta) + } + return err +} + +func resourceAviUpgradeProfileDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "upgradeprofile") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/avi/resource_avi_upgradestatusinfo.go b/avi/resource_avi_upgradestatusinfo.go index 63d66177e..06164768b 100644 --- a/avi/resource_avi_upgradestatusinfo.go +++ b/avi/resource_avi_upgradestatusinfo.go @@ -26,6 +26,12 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema { Computed: true, ValidateFunc: validateBool, }, + "dryrun_info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceDryrunInfoSchema(), + }, "duration": { Type: schema.TypeString, Optional: true, @@ -132,6 +138,11 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "prev_remote_image_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "previous_image_ref": { Type: schema.TypeString, Optional: true, @@ -168,6 +179,11 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "remote_image_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "se_patch_image_path": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_user.go b/avi/resource_avi_user.go index bd5830150..0a367c440 100644 --- a/avi/resource_avi_user.go +++ b/avi/resource_avi_user.go @@ -36,6 +36,12 @@ func ResourceUserSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, + "enable_config_warnings": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "full_name": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_useraccount.go b/avi/resource_avi_useraccount.go index e78c592ae..83f2e5883 100644 --- a/avi/resource_avi_useraccount.go +++ b/avi/resource_avi_useraccount.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_virtualservice.go b/avi/resource_avi_virtualservice.go index 4c5326c57..edc72a397 100644 --- a/avi/resource_avi_virtualservice.go +++ b/avi/resource_avi_virtualservice.go @@ -282,11 +282,6 @@ func ResourceVirtualServiceSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, - "nsx_securitygroup": { - Type: schema.TypeList, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, "oauth_vs_config": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_virtualservice_test.go b/avi/resource_avi_virtualservice_test.go index 0e2779c52..3797f6469 100644 --- a/avi/resource_avi_virtualservice_test.go +++ b/avi/resource_avi_virtualservice_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_vsdatascriptset.go b/avi/resource_avi_vsdatascriptset.go index 7d5046286..e500a7f29 100644 --- a/avi/resource_avi_vsdatascriptset.go +++ b/avi/resource_avi_vsdatascriptset.go @@ -80,6 +80,16 @@ func ResourceVSDataScriptSetSchema() map[string]*schema.Schema { Optional: true, Elem: ResourceRateLimiterSchema(), }, + "snat_ip6s": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceIpAddrSchema(), + }, + "snat_ips": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceIpAddrSchema(), + }, "ssl_key_certificate_refs": { Type: schema.TypeList, Optional: true, diff --git a/avi/resource_avi_vsvip.go b/avi/resource_avi_vsvip.go index 50f0cc867..4dcf90dda 100644 --- a/avi/resource_avi_vsvip.go +++ b/avi/resource_avi_vsvip.go @@ -75,12 +75,6 @@ func ResourceVsVipSchema() map[string]*schema.Schema { Optional: true, Computed: true, }, - "use_standard_alb": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateBool, - }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_wafpolicy.go b/avi/resource_avi_wafpolicy.go index a3b7c80b8..a8012c073 100644 --- a/avi/resource_avi_wafpolicy.go +++ b/avi/resource_avi_wafpolicy.go @@ -85,11 +85,23 @@ func ResourceWafPolicySchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "enable_streaming": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "failure_mode": { Type: schema.TypeString, Optional: true, Default: "WAF_FAILURE_MODE_OPEN", }, + "fixed_sampling_rate": { + Type: schema.TypeString, + Optional: true, + Default: "1", + ValidateFunc: validateInteger, + }, "geo_db_ref": { Type: schema.TypeString, Optional: true, @@ -146,12 +158,17 @@ func ResourceWafPolicySchema() map[string]*schema.Schema { Optional: true, Elem: ResourceWafPolicyRequiredDataFileSchema(), }, + "sampling_mode": { + Type: schema.TypeString, + Optional: true, + Default: "WAF_SAMPLING_MODE_NO_SAMPLING", + }, "tenant_ref": { Type: schema.TypeString, Optional: true, Computed: true, }, - "updated_crs_rules_in_detection_mode": { + "use_evaluation_mode_on_crs_update": { Type: schema.TypeString, Optional: true, Default: "true", diff --git a/avi/resource_avi_wafpolicy_test.go b/avi/resource_avi_wafpolicy_test.go index 1b5107a45..ad1be908b 100644 --- a/avi/resource_avi_wafpolicy_test.go +++ b/avi/resource_avi_wafpolicy_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/avi/resource_avi_wafpolicypsmgroup.go b/avi/resource_avi_wafpolicypsmgroup.go index 56e08c3a5..ae28f3d20 100644 --- a/avi/resource_avi_wafpolicypsmgroup.go +++ b/avi/resource_avi_wafpolicypsmgroup.go @@ -10,6 +10,11 @@ import ( func ResourceWafPolicyPSMGroupSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "completely_described_match_elements": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "configpb_attributes": { Type: schema.TypeSet, Optional: true, @@ -38,6 +43,11 @@ func ResourceWafPolicyPSMGroupSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "location_match_miss_action": { + Type: schema.TypeString, + Optional: true, + Default: "WAF_ACTION_NO_OP", + }, "locations": { Type: schema.TypeList, Optional: true, diff --git a/avi/resource_avi_webapput.go b/avi/resource_avi_webapput.go index 79bf94fa9..196e7c3bf 100644 --- a/avi/resource_avi_webapput.go +++ b/avi/resource_avi_webapput.go @@ -10,22 +10,33 @@ import ( func ResourceWebappUTSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "cloud_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "configpb_attributes": { Type: schema.TypeSet, Optional: true, Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, + "default_fifth_int": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, "default_first_int": { Type: schema.TypeString, Optional: true, Default: "1", ValidateFunc: validateInteger, }, - "default_second_int": { + "default_fourth_int": { Type: schema.TypeString, Optional: true, - Default: "2", + Default: "4", ValidateFunc: validateInteger, }, "default_string": { @@ -33,12 +44,6 @@ func ResourceWebappUTSchema() map[string]*schema.Schema { Optional: true, Default: "default string", }, - "default_third_int": { - Type: schema.TypeString, - Optional: true, - Default: "3", - ValidateFunc: validateInteger, - }, "mandatory_test": { Type: schema.TypeSet, Optional: true, diff --git a/avi/utils.go b/avi/utils.go index ec25e67f7..b74bcf5b7 100644 --- a/avi/utils.go +++ b/avi/utils.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ @@ -354,7 +354,6 @@ func APIUpdate(d *schema.ResourceData, meta interface{}, objType string, s map[s log.Printf("[INFO] APICreateOrUpdate Tenant ref found %v", tenantName) } if specialobj { - path = path + "?skip_default=true" err = client.AviSession.Put(path, data, &robj) if err != nil { log.Printf("[ERROR] APICreateOrUpdate: PUT on %v Error %v path %v id %v\n", objType, err, path, @@ -363,7 +362,7 @@ func APIUpdate(d *schema.ResourceData, meta interface{}, objType string, s map[s SetIDFromObj(d, robj) } } else if uuid, ok := d.GetOk("uuid"); ok { - path = path + "/" + uuid.(string) + "?skip_default=true" + path = path + "/" + uuid.(string) if !usePatchForUpdate { err = client.AviSession.Put(path, data, &robj, session.SetOptTenant(tenantName)) } else { @@ -415,7 +414,7 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str if specialobj { path = "api/" + objType } else { - path = "api/" + objType + "/" + uuid + "?skip_default=true" + path = "api/" + objType + "/" + uuid } log.Printf("[DEBUG] APIRead reading object with id %v path %v\n", uuid, path) err := client.AviSession.Get(path, &obj, session.SetOptTenant(tenantName)) @@ -457,15 +456,7 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str log.Printf("[ERROR] APIRead not found %v\n", d.Get("uuid")) return nil } - if localData, err := SchemaToAviData(d, s); err == nil { - modAPIRes, err := SetDefaultsInAPIRes(obj, localData, s) - if err != nil { - log.Printf("[ERROR] APIRead in modifying api response object %v\n", err) - } - modAPIRes, err = PreprocessAPIRes(modAPIRes, s) - if err != nil { - log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err) - } + if modAPIRes, err := PreprocessAPIRes(obj, s); err == nil { if _, err := APIDataToSchema(modAPIRes, d, s); err == nil { if modAPIRes.(map[string]interface{})["uuid"] != nil { uuid = modAPIRes.(map[string]interface{})["uuid"].(string) @@ -484,10 +475,40 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str } else { log.Printf("[ERROR] APIRead in setting read object %v\n", err) } - log.Printf("[DEBUG] type: %v localData : %v", objType, localData) log.Printf("[DEBUG] type: %v modAPIRes: %v", objType, modAPIRes) + } else { + log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err) } - + // if localData, err := SchemaToAviData(d, s); err == nil { + // // modAPIRes, err := SetDefaultsInAPIRes(obj, localData, s) + // if err != nil { + // log.Printf("[ERROR] APIRead in modifying api response object %v\n", err) + // } + // modAPIRes, err := PreprocessAPIRes(obj, s) + // if err != nil { + // log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err) + // } + // if _, err := APIDataToSchema(modAPIRes, d, s); err == nil { + // if modAPIRes.(map[string]interface{})["uuid"] != nil { + // uuid = modAPIRes.(map[string]interface{})["uuid"].(string) + // } + // if modAPIRes.(map[string]interface{})["url"] != nil { + // url = modAPIRes.(map[string]interface{})["url"].(string) + // } + // //url = strings.SplitN(url, "#", 2)[0] + // if url != "" { + // d.SetId(url) + // log.Printf("[DEBUG] APIRead read object with id %v\n", url) + // } else { + // d.SetId(uuid) + // log.Printf("[DEBUG] APIRead read object with id %v\n", uuid) + // } + // } else { + // log.Printf("[ERROR] APIRead in setting read object %v\n", err) + // } + // log.Printf("[DEBUG] type: %v localData : %v", objType, localData) + // log.Printf("[DEBUG] type: %v modAPIRes: %v", objType, modAPIRes) + // } return nil } @@ -527,7 +548,7 @@ func ResourceImporter(d *schema.ResourceData, meta interface{}, objType string, } var data interface{} client := meta.(*clients.AviClient) - path := "api/" + objType + "?skip_default=true" + path := "api/" + objType err := client.AviSession.Get(path, &data) if err != nil { log.Printf("[ERROR] ResourceImporter %v in GET of path %v\n", err, path) diff --git a/avi/utils_test.go b/avi/utils_test.go index 2252455fc..257d10b0c 100644 --- a/avi/utils_test.go +++ b/avi/utils_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/conftest.py b/conftest.py index c24e71366..a805526d3 100644 --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,6 @@ ############################################################################ # ======================================================================== -# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential +# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. # ======================================================================== ### diff --git a/go.mod b/go.mod index 4227e3e4a..9363e9901 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ module github.com/vmware/terraform-provider-avi -go 1.22 - -toolchain go1.22.6 +go 1.23.2 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 + github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6 ) require ( diff --git a/go.sum b/go.sum index 025f97f38..962279427 100644 --- a/go.sum +++ b/go.sum @@ -204,6 +204,12 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 h1:AbMBmnIbvNTVS6u94U14BKABMNkmPaSFwFXzXOr4fE0= github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4 h1:yT0eZ66Rc1uYRf3ruBWk/5BTBMARnCbxSn/2VPsc5ag= +github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw= +github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5 h1:Pp+dny+PjeW6XQyZu+HQB7X2lFB8WZlt2ky9uQlm8qc= +github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw= +github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6 h1:zWyNiVOo2x+8NMfiUGK1VgaMyFg1uEAVt3vvJuUKUwU= +github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6/go.mod h1:JIJgWAdD+NzyGU/cC5FOl7D8jXsNDuaAoi3zZtdGiMY= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= diff --git a/main.go b/main.go index 5afe207fa..3c1d4d0a0 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential + * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. * ======================================================================== */ diff --git a/scripts/changelog-links.sh b/scripts/changelog-links.sh index 5692108e2..44b4a3541 100755 --- a/scripts/changelog-links.sh +++ b/scripts/changelog-links.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ # ======================================================================== -# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential +# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. # ======================================================================== ### diff --git a/scripts/errcheck.sh b/scripts/errcheck.sh index 03132b502..b0dadadc3 100755 --- a/scripts/errcheck.sh +++ b/scripts/errcheck.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################ # ======================================================================== -# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential +# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. # ======================================================================== ### diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh index f5de0a42d..cce80e154 100755 --- a/scripts/gofmtcheck.sh +++ b/scripts/gofmtcheck.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################ # ======================================================================== -# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential +# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. # ======================================================================== ### diff --git a/scripts/gogetcookie.sh b/scripts/gogetcookie.sh index 9449f0de5..3fd29ecf0 100755 --- a/scripts/gogetcookie.sh +++ b/scripts/gogetcookie.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ # ======================================================================== -# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential +# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential. # ======================================================================== ### diff --git a/website/avi.erb b/website/avi.erb index d943be9d1..e0cceaf4d 100644 --- a/website/avi.erb +++ b/website/avi.erb @@ -17,41 +17,14 @@ > Avi Data Sources