From e1dc05dc8559e8ac1db75f24310baf6a747df96f Mon Sep 17 00:00:00 2001 From: Sagar Date: Mon, 11 Dec 2023 05:50:48 -0800 Subject: [PATCH 1/3] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_controllerproperties.go | 8 ++++++++ avi/datasource_avi_webapput.go | 4 ++++ avi/resource_avi_controllerproperties.go | 12 ++++++++++++ avi/resource_avi_rest_dependants.go | 19 ++++++++++++++++++- avi/resource_avi_webapput.go | 6 ++++++ go.mod | 2 +- go.sum | 2 ++ .../d/avi_controllerproperties.html.markdown | 2 ++ website/docs/d/avi_webapput.html.markdown | 1 + .../r/avi_controllerproperties.html.markdown | 2 ++ website/docs/r/avi_webapput.html.markdown | 1 + 11 files changed, 57 insertions(+), 2 deletions(-) diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index c1e35e46..f0e5743a 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -69,10 +69,18 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "cloud_discovery_interval": { + Type: schema.TypeString, + Computed: true, + }, "cloud_reconcile": { Type: schema.TypeString, Computed: true, }, + "cloud_reconcile_interval": { + Type: schema.TypeString, + Computed: true, + }, "cluster_ip_gratuitous_arp_period": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_webapput.go b/avi/datasource_avi_webapput.go index aa6a68cb..a7c5df5e 100644 --- a/avi/datasource_avi_webapput.go +++ b/avi/datasource_avi_webapput.go @@ -39,6 +39,10 @@ func dataSourceAviWebappUT() *schema.Resource { Computed: true, Elem: ResourceL1FSensitiveTestCaseSchema(), }, + "skip_optional_check_tests": { + Type: schema.TypeString, + Computed: true, + }, "string_length_test": { Type: schema.TypeSet, Computed: true, diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 29ac9f02..b1476f97 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -103,12 +103,24 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "60", ValidateFunc: validateInteger, }, + "cloud_discovery_interval": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, "cloud_reconcile": { Type: schema.TypeString, Optional: true, Default: "true", ValidateFunc: validateBool, }, + "cloud_reconcile_interval": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, "cluster_ip_gratuitous_arp_period": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 1673e23b..86773333 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -10164,6 +10164,12 @@ func ResourceDnsServiceApplicationProfileSchema() *schema.Resource { Optional: true, Default: "hostmaster", }, + "client_dns_tcp_request_timeout": { + Type: schema.TypeString, + Optional: true, + Default: "10000", + ValidateFunc: validateInteger, + }, "close_tcp_connection_post_response": { Type: schema.TypeString, Optional: true, @@ -14092,6 +14098,11 @@ func ResourceGslbRuntimeSchema() *schema.Resource { func ResourceGslbServiceDownResponseSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "fallback_cname": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "fallback_ip": { Type: schema.TypeSet, Optional: true, @@ -22747,7 +22758,8 @@ func ResourceOAuthAppSettingsSchema() *schema.Resource { }, "client_secret": { Type: schema.TypeString, - Required: true, + Optional: true, + Computed: true, Sensitive: true, DiffSuppressFunc: suppressSensitiveFieldDiffs, }, @@ -25165,6 +25177,11 @@ func ResourcePortalConfigurationSchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "pkiprofile_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "redirect_to_https": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_webapput.go b/avi/resource_avi_webapput.go index 62c8fb3c..44aee4e0 100644 --- a/avi/resource_avi_webapput.go +++ b/avi/resource_avi_webapput.go @@ -45,6 +45,12 @@ func ResourceWebappUTSchema() map[string]*schema.Schema { Optional: true, Elem: ResourceL1FSensitiveTestCaseSchema(), }, + "skip_optional_check_tests": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "string_length_test": { Type: schema.TypeSet, Optional: true, diff --git a/go.mod b/go.mod index eb8ae81d..6f96acc0 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20230803045758-cfa2a78741e9 + github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc ) diff --git a/go.sum b/go.sum index 41b90c5b..b23ae48d 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,8 @@ github.com/vmware/alb-sdk v0.0.0-20230626110158-e51a96d82ba2 h1:jiUOz1jc/bFu0jEC github.com/vmware/alb-sdk v0.0.0-20230626110158-e51a96d82ba2/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20230803045758-cfa2a78741e9 h1:afNk5kdZyzkvtRaL6ZHlNnioqaCQ+itxnv0eaXHojwI= github.com/vmware/alb-sdk v0.0.0-20230803045758-cfa2a78741e9/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc h1:CUQQN3lHj5K0ZXhT8xo+ajtXBOrDzjSdvEEFLBAF7Qc= +github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= 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/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown index 70357d30..f952a8df 100644 --- a/website/docs/d/avi_controllerproperties.html.markdown +++ b/website/docs/d/avi_controllerproperties.html.markdown @@ -47,7 +47,9 @@ In addition to all arguments above, the following attributes are exported: * `check_vsvip_fqdn_syntax` - Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `cleanup_expired_authtoken_timeout_period` - Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `cleanup_sessions_timeout_period` - Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `cloud_discovery_interval` - Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 30.1.2. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `cloud_reconcile` - Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `cloud_reconcile_interval` - Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 30.1.2. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `cluster_ip_gratuitous_arp_period` - Period for cluster ip gratuitous arp job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `consistency_check_timeout_period` - Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_webapput.html.markdown b/website/docs/d/avi_webapput.html.markdown index baa49b82..d68b4e92 100644 --- a/website/docs/d/avi_webapput.html.markdown +++ b/website/docs/d/avi_webapput.html.markdown @@ -38,6 +38,7 @@ In addition to all arguments above, the following attributes are exported: * `name` - Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `sensitive_test` - Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `sensitive_tests` - Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `skip_optional_check_tests` - Optional bool for nested skip_optional_check test cases-level1. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `string_length_test` - Optional message for nested max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `string_length_tests` - Repeated message for nested max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_ref` - Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_controllerproperties.html.markdown b/website/docs/r/avi_controllerproperties.html.markdown index a5592c15..ab8774cb 100644 --- a/website/docs/r/avi_controllerproperties.html.markdown +++ b/website/docs/r/avi_controllerproperties.html.markdown @@ -42,7 +42,9 @@ The following arguments are supported: * `check_vsvip_fqdn_syntax` - (Optional) Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `cleanup_expired_authtoken_timeout_period` - (Optional) Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `cleanup_sessions_timeout_period` - (Optional) Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `cloud_discovery_interval` - (Optional) Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 30.1.2. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `cloud_reconcile` - (Optional) Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `cloud_reconcile_interval` - (Optional) Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 30.1.2. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `cluster_ip_gratuitous_arp_period` - (Optional) Period for cluster ip gratuitous arp job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `consistency_check_timeout_period` - (Optional) Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_webapput.html.markdown b/website/docs/r/avi_webapput.html.markdown index 1f5580f1..8aad05e1 100644 --- a/website/docs/r/avi_webapput.html.markdown +++ b/website/docs/r/avi_webapput.html.markdown @@ -33,6 +33,7 @@ The following arguments are supported: * `mandatory_tests` - (Optional) Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `sensitive_test` - (Optional) Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `sensitive_tests` - (Optional) Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `skip_optional_check_tests` - (Optional) Optional bool for nested skip_optional_check test cases-level1. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `string_length_test` - (Optional) Optional message for nested max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `string_length_tests` - (Optional) Repeated message for nested max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_ref` - (Optional) Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. From 3c63a31255f06926d25bd4061015b4622ebd91d9 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 14 Dec 2023 01:03:14 -0800 Subject: [PATCH 2/3] Updated assets for terraform Signed-off-by: Sagar --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6f96acc0..75825c68 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc + github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f ) diff --git a/go.sum b/go.sum index b23ae48d..aa456a75 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/vmware/alb-sdk v0.0.0-20230803045758-cfa2a78741e9 h1:afNk5kdZyzkvtRaL github.com/vmware/alb-sdk v0.0.0-20230803045758-cfa2a78741e9/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc h1:CUQQN3lHj5K0ZXhT8xo+ajtXBOrDzjSdvEEFLBAF7Qc= github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f h1:ygAHRz1dGnywCHpoAkJ4TOXkUdUGkfdPBDKpQ0FHrJU= +github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= 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/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 3850efeb7115219279d558a295d802eb3a2dc398 Mon Sep 17 00:00:00 2001 From: Sagar Date: Sun, 17 Dec 2023 21:34:52 -0800 Subject: [PATCH 3/3] Updated assets for terraform Signed-off-by: Sagar --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 75825c68..09afd9dd 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f + github.com/vmware/alb-sdk v0.0.0-20231214100707-7588e403daf7 ) diff --git a/go.sum b/go.sum index aa456a75..9be831d1 100644 --- a/go.sum +++ b/go.sum @@ -225,6 +225,8 @@ github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc h1:CUQQN3lHj5K0ZXhT github.com/vmware/alb-sdk v0.0.0-20230901105740-8d23f5ee8fbc/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f h1:ygAHRz1dGnywCHpoAkJ4TOXkUdUGkfdPBDKpQ0FHrJU= github.com/vmware/alb-sdk v0.0.0-20231214062740-eead963bce3f/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20231214100707-7588e403daf7 h1:RwDuWIEgEa+OsadFZ4eBGy97HrjH+meCU0EhPNwUtsE= +github.com/vmware/alb-sdk v0.0.0-20231214100707-7588e403daf7/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= 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/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=