From 55a5973cfba060dbb4924bdda869351605c109c7 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 26 Mar 2024 01:55:19 -0700 Subject: [PATCH 01/25] Updated assets for terraform Signed-off-by: Sagar --- avi/data_source_avi_customipamdnsprofile_test.go | 2 +- avi/data_source_avi_dnspolicy_test.go | 2 +- avi/data_source_avi_ipaddrgroup_test.go | 2 +- avi/data_source_avi_ipamdnsproviderprofile_test.go | 2 +- avi/datasource_avi_customipamdnsprofile.go | 2 +- avi/datasource_avi_dnspolicy.go | 2 +- avi/datasource_avi_dynamicdnsrecord.go | 2 +- avi/datasource_avi_ipaddrgroup.go | 2 +- avi/datasource_avi_ipamdnsproviderprofile.go | 2 +- avi/resource_avi_customipamdnsprofile.go | 14 +++++++------- avi/resource_avi_customipamdnsprofile_test.go | 8 ++++---- avi/resource_avi_dnspolicy.go | 14 +++++++------- avi/resource_avi_dnspolicy_test.go | 8 ++++---- avi/resource_avi_dynamicdnsrecord.go | 14 +++++++------- avi/resource_avi_ipaddrgroup.go | 14 +++++++------- avi/resource_avi_ipaddrgroup_test.go | 8 ++++---- avi/resource_avi_ipamdnsproviderprofile.go | 14 +++++++------- avi/resource_avi_ipamdnsproviderprofile_test.go | 8 ++++---- go.mod | 2 +- go.sum | 2 ++ 20 files changed, 63 insertions(+), 61 deletions(-) diff --git a/avi/data_source_avi_customipamdnsprofile_test.go b/avi/data_source_avi_customipamdnsprofile_test.go index ecd7cd3f1..a5e398f01 100644 --- a/avi/data_source_avi_customipamdnsprofile_test.go +++ b/avi/data_source_avi_customipamdnsprofile_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceCustomIpamDnsProfileBasic(t *testing.T) { } -// nolint +//nolint const testAccAVIDSCustomIpamDnsProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_dnspolicy_test.go b/avi/data_source_avi_dnspolicy_test.go index 1d4800d58..ab54f500f 100644 --- a/avi/data_source_avi_dnspolicy_test.go +++ b/avi/data_source_avi_dnspolicy_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceDnsPolicyBasic(t *testing.T) { } -// nolint +//nolint const testAccAVIDSDnsPolicyConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_ipaddrgroup_test.go b/avi/data_source_avi_ipaddrgroup_test.go index c3e1901c1..d33d34b98 100644 --- a/avi/data_source_avi_ipaddrgroup_test.go +++ b/avi/data_source_avi_ipaddrgroup_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceIpAddrGroupBasic(t *testing.T) { } -// nolint +//nolint const testAccAVIDSIpAddrGroupConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_ipamdnsproviderprofile_test.go b/avi/data_source_avi_ipamdnsproviderprofile_test.go index c46e3b5f9..342402295 100644 --- a/avi/data_source_avi_ipamdnsproviderprofile_test.go +++ b/avi/data_source_avi_ipamdnsproviderprofile_test.go @@ -28,7 +28,7 @@ func TestAVIDataSourceIpamDnsProviderProfileBasic(t *testing.T) { } -// nolint +//nolint const testAccAVIDSIpamDnsProviderProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/datasource_avi_customipamdnsprofile.go b/avi/datasource_avi_customipamdnsprofile.go index d175a6834..ed7cbd662 100644 --- a/avi/datasource_avi_customipamdnsprofile.go +++ b/avi/datasource_avi_customipamdnsprofile.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -// nolint +//nolint func dataSourceAviCustomIpamDnsProfile() *schema.Resource { return &schema.Resource{ Read: ResourceAviCustomIpamDnsProfileRead, diff --git a/avi/datasource_avi_dnspolicy.go b/avi/datasource_avi_dnspolicy.go index 8c59317fa..4783b701d 100644 --- a/avi/datasource_avi_dnspolicy.go +++ b/avi/datasource_avi_dnspolicy.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -// nolint +//nolint func dataSourceAviDnsPolicy() *schema.Resource { return &schema.Resource{ Read: ResourceAviDnsPolicyRead, diff --git a/avi/datasource_avi_dynamicdnsrecord.go b/avi/datasource_avi_dynamicdnsrecord.go index 22c828a69..153828d78 100644 --- a/avi/datasource_avi_dynamicdnsrecord.go +++ b/avi/datasource_avi_dynamicdnsrecord.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -// nolint +//nolint func dataSourceAviDynamicDnsRecord() *schema.Resource { return &schema.Resource{ Read: ResourceAviDynamicDnsRecordRead, diff --git a/avi/datasource_avi_ipaddrgroup.go b/avi/datasource_avi_ipaddrgroup.go index 523a0f4a7..8eace16a2 100644 --- a/avi/datasource_avi_ipaddrgroup.go +++ b/avi/datasource_avi_ipaddrgroup.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -// nolint +//nolint func dataSourceAviIpAddrGroup() *schema.Resource { return &schema.Resource{ Read: ResourceAviIpAddrGroupRead, diff --git a/avi/datasource_avi_ipamdnsproviderprofile.go b/avi/datasource_avi_ipamdnsproviderprofile.go index e6e92da91..de9274f1a 100644 --- a/avi/datasource_avi_ipamdnsproviderprofile.go +++ b/avi/datasource_avi_ipamdnsproviderprofile.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -// nolint +//nolint func dataSourceAviIpamDnsProviderProfile() *schema.Resource { return &schema.Resource{ Read: ResourceAviIpamDnsProviderProfileRead, diff --git a/avi/resource_avi_customipamdnsprofile.go b/avi/resource_avi_customipamdnsprofile.go index 44bad4375..5cab251b0 100644 --- a/avi/resource_avi_customipamdnsprofile.go +++ b/avi/resource_avi_customipamdnsprofile.go @@ -8,7 +8,7 @@ import ( "log" ) -// nolint +//nolint func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "configpb_attributes": { @@ -43,7 +43,7 @@ func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema { } } -// nolint +//nolint func resourceAviCustomIpamDnsProfile() *schema.Resource { return &schema.Resource{ Create: resourceAviCustomIpamDnsProfileCreate, @@ -57,13 +57,13 @@ func resourceAviCustomIpamDnsProfile() *schema.Resource { } } -// nolint +//nolint func ResourceCustomIpamDnsProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceCustomIpamDnsProfileSchema() return ResourceImporter(d, m, "customipamdnsprofile", s) } -// nolint +//nolint func ResourceAviCustomIpamDnsProfileRead(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() err := APIRead(d, meta, "customipamdnsprofile", s) @@ -73,7 +73,7 @@ func ResourceAviCustomIpamDnsProfileRead(d *schema.ResourceData, meta interface{ return err } -// nolint +//nolint func resourceAviCustomIpamDnsProfileCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() err := APICreate(d, meta, "customipamdnsprofile", s) @@ -83,7 +83,7 @@ func resourceAviCustomIpamDnsProfileCreate(d *schema.ResourceData, meta interfac return err } -// nolint +//nolint func resourceAviCustomIpamDnsProfileUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() var err error @@ -94,7 +94,7 @@ func resourceAviCustomIpamDnsProfileUpdate(d *schema.ResourceData, meta interfac return err } -// nolint +//nolint func resourceAviCustomIpamDnsProfileDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_customipamdnsprofile_test.go b/avi/resource_avi_customipamdnsprofile_test.go index 3c1acb491..409a14fff 100644 --- a/avi/resource_avi_customipamdnsprofile_test.go +++ b/avi/resource_avi_customipamdnsprofile_test.go @@ -43,7 +43,7 @@ func TestAVICustomIpamDnsProfileBasic(t *testing.T) { } -// nolint +//nolint func testAccCheckAVICustomIpamDnsProfileExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVICustomIpamDnsProfileExists(resourcename string) resource.Tes } -// nolint +//nolint func testAccCheckAVICustomIpamDnsProfileDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVICustomIpamDnsProfileDestroy(s *terraform.State) error { return nil } -// nolint +//nolint const testAccAVICustomIpamDnsProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -104,7 +104,7 @@ resource "avi_customipamdnsprofile" "testCustomIpamDnsProfile" { } ` -// nolint +//nolint const testAccAVICustomIpamDnsProfileupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_dnspolicy.go b/avi/resource_avi_dnspolicy.go index 5c65c2a05..3ba7f54b6 100644 --- a/avi/resource_avi_dnspolicy.go +++ b/avi/resource_avi_dnspolicy.go @@ -8,7 +8,7 @@ import ( "log" ) -// nolint +//nolint func ResourceDnsPolicySchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "configpb_attributes": { @@ -60,7 +60,7 @@ func ResourceDnsPolicySchema() map[string]*schema.Schema { } } -// nolint +//nolint func resourceAviDnsPolicy() *schema.Resource { return &schema.Resource{ Create: resourceAviDnsPolicyCreate, @@ -74,13 +74,13 @@ func resourceAviDnsPolicy() *schema.Resource { } } -// nolint +//nolint func ResourceDnsPolicyImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceDnsPolicySchema() return ResourceImporter(d, m, "dnspolicy", s) } -// nolint +//nolint func ResourceAviDnsPolicyRead(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() err := APIRead(d, meta, "dnspolicy", s) @@ -90,7 +90,7 @@ func ResourceAviDnsPolicyRead(d *schema.ResourceData, meta interface{}) error { return err } -// nolint +//nolint func resourceAviDnsPolicyCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() err := APICreate(d, meta, "dnspolicy", s) @@ -100,7 +100,7 @@ func resourceAviDnsPolicyCreate(d *schema.ResourceData, meta interface{}) error return err } -// nolint +//nolint func resourceAviDnsPolicyUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() var err error @@ -111,7 +111,7 @@ func resourceAviDnsPolicyUpdate(d *schema.ResourceData, meta interface{}) error return err } -// nolint +//nolint func resourceAviDnsPolicyDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_dnspolicy_test.go b/avi/resource_avi_dnspolicy_test.go index d070de8de..ca7694dd8 100644 --- a/avi/resource_avi_dnspolicy_test.go +++ b/avi/resource_avi_dnspolicy_test.go @@ -43,7 +43,7 @@ func TestAVIDnsPolicyBasic(t *testing.T) { } -// nolint +//nolint func testAccCheckAVIDnsPolicyExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVIDnsPolicyExists(resourcename string) resource.TestCheckFunc } -// nolint +//nolint func testAccCheckAVIDnsPolicyDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVIDnsPolicyDestroy(s *terraform.State) error { return nil } -// nolint +//nolint const testAccAVIDnsPolicyConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -104,7 +104,7 @@ resource "avi_dnspolicy" "testDnsPolicy" { } ` -// nolint +//nolint const testAccAVIDnsPolicyupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_dynamicdnsrecord.go b/avi/resource_avi_dynamicdnsrecord.go index f9ecfca07..8de1f8afd 100644 --- a/avi/resource_avi_dynamicdnsrecord.go +++ b/avi/resource_avi_dynamicdnsrecord.go @@ -8,7 +8,7 @@ import ( "log" ) -// nolint +//nolint func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "algorithm": { @@ -119,7 +119,7 @@ func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema { } } -// nolint +//nolint func resourceAviDynamicDnsRecord() *schema.Resource { return &schema.Resource{ Create: resourceAviDynamicDnsRecordCreate, @@ -133,13 +133,13 @@ func resourceAviDynamicDnsRecord() *schema.Resource { } } -// nolint +//nolint func ResourceDynamicDnsRecordImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceDynamicDnsRecordSchema() return ResourceImporter(d, m, "dynamicdnsrecord", s) } -// nolint +//nolint func ResourceAviDynamicDnsRecordRead(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() err := APIRead(d, meta, "dynamicdnsrecord", s) @@ -149,7 +149,7 @@ func ResourceAviDynamicDnsRecordRead(d *schema.ResourceData, meta interface{}) e return err } -// nolint +//nolint func resourceAviDynamicDnsRecordCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() err := APICreate(d, meta, "dynamicdnsrecord", s) @@ -159,7 +159,7 @@ func resourceAviDynamicDnsRecordCreate(d *schema.ResourceData, meta interface{}) return err } -// nolint +//nolint func resourceAviDynamicDnsRecordUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() var err error @@ -170,7 +170,7 @@ func resourceAviDynamicDnsRecordUpdate(d *schema.ResourceData, meta interface{}) return err } -// nolint +//nolint func resourceAviDynamicDnsRecordDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipaddrgroup.go b/avi/resource_avi_ipaddrgroup.go index ba80c25f4..57d85cbf8 100644 --- a/avi/resource_avi_ipaddrgroup.go +++ b/avi/resource_avi_ipaddrgroup.go @@ -8,7 +8,7 @@ import ( "log" ) -// nolint +//nolint func ResourceIpAddrGroupSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "addrs": { @@ -80,7 +80,7 @@ func ResourceIpAddrGroupSchema() map[string]*schema.Schema { } } -// nolint +//nolint func resourceAviIpAddrGroup() *schema.Resource { return &schema.Resource{ Create: resourceAviIpAddrGroupCreate, @@ -94,13 +94,13 @@ func resourceAviIpAddrGroup() *schema.Resource { } } -// nolint +//nolint func ResourceIpAddrGroupImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceIpAddrGroupSchema() return ResourceImporter(d, m, "ipaddrgroup", s) } -// nolint +//nolint func ResourceAviIpAddrGroupRead(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() err := APIRead(d, meta, "ipaddrgroup", s) @@ -110,7 +110,7 @@ func ResourceAviIpAddrGroupRead(d *schema.ResourceData, meta interface{}) error return err } -// nolint +//nolint func resourceAviIpAddrGroupCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() err := APICreate(d, meta, "ipaddrgroup", s) @@ -120,7 +120,7 @@ func resourceAviIpAddrGroupCreate(d *schema.ResourceData, meta interface{}) erro return err } -// nolint +//nolint func resourceAviIpAddrGroupUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() var err error @@ -131,7 +131,7 @@ func resourceAviIpAddrGroupUpdate(d *schema.ResourceData, meta interface{}) erro return err } -// nolint +//nolint func resourceAviIpAddrGroupDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipaddrgroup_test.go b/avi/resource_avi_ipaddrgroup_test.go index 3609b932d..0d7d99c0e 100644 --- a/avi/resource_avi_ipaddrgroup_test.go +++ b/avi/resource_avi_ipaddrgroup_test.go @@ -43,7 +43,7 @@ func TestAVIIpAddrGroupBasic(t *testing.T) { } -// nolint +//nolint func testAccCheckAVIIpAddrGroupExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVIIpAddrGroupExists(resourcename string) resource.TestCheckFun } -// nolint +//nolint func testAccCheckAVIIpAddrGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVIIpAddrGroupDestroy(s *terraform.State) error { return nil } -// nolint +//nolint const testAccAVIIpAddrGroupConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -124,7 +124,7 @@ prefixes { } ` -// nolint +//nolint const testAccAVIIpAddrGroupupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_ipamdnsproviderprofile.go b/avi/resource_avi_ipamdnsproviderprofile.go index c099aea21..72e0e7689 100644 --- a/avi/resource_avi_ipamdnsproviderprofile.go +++ b/avi/resource_avi_ipamdnsproviderprofile.go @@ -8,7 +8,7 @@ import ( "log" ) -// nolint +//nolint func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "allocate_ip_in_vrf": { @@ -109,7 +109,7 @@ func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema { } } -// nolint +//nolint func resourceAviIpamDnsProviderProfile() *schema.Resource { return &schema.Resource{ Create: resourceAviIpamDnsProviderProfileCreate, @@ -123,13 +123,13 @@ func resourceAviIpamDnsProviderProfile() *schema.Resource { } } -// nolint +//nolint func ResourceIpamDnsProviderProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceIpamDnsProviderProfileSchema() return ResourceImporter(d, m, "ipamdnsproviderprofile", s) } -// nolint +//nolint func ResourceAviIpamDnsProviderProfileRead(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() err := APIRead(d, meta, "ipamdnsproviderprofile", s) @@ -139,7 +139,7 @@ func ResourceAviIpamDnsProviderProfileRead(d *schema.ResourceData, meta interfac return err } -// nolint +//nolint func resourceAviIpamDnsProviderProfileCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() err := APICreate(d, meta, "ipamdnsproviderprofile", s) @@ -149,7 +149,7 @@ func resourceAviIpamDnsProviderProfileCreate(d *schema.ResourceData, meta interf return err } -// nolint +//nolint func resourceAviIpamDnsProviderProfileUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() var err error @@ -160,7 +160,7 @@ func resourceAviIpamDnsProviderProfileUpdate(d *schema.ResourceData, meta interf return err } -// nolint +//nolint func resourceAviIpamDnsProviderProfileDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipamdnsproviderprofile_test.go b/avi/resource_avi_ipamdnsproviderprofile_test.go index b4230a33e..6008064a5 100644 --- a/avi/resource_avi_ipamdnsproviderprofile_test.go +++ b/avi/resource_avi_ipamdnsproviderprofile_test.go @@ -47,7 +47,7 @@ func TestAVIIpamDnsProviderProfileBasic(t *testing.T) { } -// nolint +//nolint func testAccCheckAVIIpamDnsProviderProfileExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -71,7 +71,7 @@ func testAccCheckAVIIpamDnsProviderProfileExists(resourcename string) resource.T } -// nolint +//nolint func testAccCheckAVIIpamDnsProviderProfileDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -96,7 +96,7 @@ func testAccCheckAVIIpamDnsProviderProfileDestroy(s *terraform.State) error { return nil } -// nolint +//nolint const testAccAVIIpamDnsProviderProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -112,7 +112,7 @@ resource "avi_ipamdnsproviderprofile" "testIpamDnsProviderProfile" { } ` -// nolint +//nolint const testAccAVIIpamDnsProviderProfileupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/go.mod b/go.mod index 8fec244c9..7c6aff0c2 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240321054554-959a4fbdb4a2 + github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 966341f81..daeb89eac 100644 --- a/go.sum +++ b/go.sum @@ -233,6 +233,8 @@ github.com/vmware/alb-sdk v0.0.0-20240319080508-f9a7438a772c h1:Nzfc5m8QwR27yLCK github.com/vmware/alb-sdk v0.0.0-20240319080508-f9a7438a772c/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240321054554-959a4fbdb4a2 h1:R9uM5Fuh5CpfJGQ6jhzwRBVmcK9wYP3wacSVlADNkKg= github.com/vmware/alb-sdk v0.0.0-20240321054554-959a4fbdb4a2/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b h1:s1SjmNKdSMuATU5m4j9ynpOdgHPjxG4Z0ieGStJtf0E= +github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b/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 3b1aa50b5ac83faf07512745fe5458fbe15b24ba Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 26 Mar 2024 22:01:36 -0700 Subject: [PATCH 02/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_controllerproperties.go | 5 ----- avi/resource_avi_controllerproperties.go | 5 ----- website/docs/d/avi_controllerproperties.html.markdown | 1 - website/docs/r/avi_controllerproperties.html.markdown | 1 - 4 files changed, 12 deletions(-) diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index a4ee741c1..7e151debf 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -171,11 +171,6 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "file_reference_mappings": { - Type: schema.TypeList, - Computed: true, - Elem: ResourceFileReferenceMappingSchema(), - }, "fileobject_max_file_versions": { Type: schema.TypeString, Computed: true, diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index e2d913b19..22abe3ed2 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -250,11 +250,6 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "1440", ValidateFunc: validateInteger, }, - "file_reference_mappings": { - Type: schema.TypeList, - Optional: true, - Elem: ResourceFileReferenceMappingSchema(), - }, "fileobject_max_file_versions": { Type: schema.TypeString, Optional: true, diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown index c80cfbf8b..963e546b1 100644 --- a/website/docs/d/avi_controllerproperties.html.markdown +++ b/website/docs/d/avi_controllerproperties.html.markdown @@ -72,7 +72,6 @@ In addition to all arguments above, the following attributes are exported: * `fatal_error_lease_time` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `federated_datastore_cleanup_duration` - Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `file_object_cleanup_period` - Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `file_reference_mappings` - List of mapping for file reference and their absolute path. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gslb_purge_batch_size` - Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gslb_purge_sleep_time_ms` - Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. 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 1cdde2c09..bd47349b8 100644 --- a/website/docs/r/avi_controllerproperties.html.markdown +++ b/website/docs/r/avi_controllerproperties.html.markdown @@ -67,7 +67,6 @@ The following arguments are supported: * `fatal_error_lease_time` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `federated_datastore_cleanup_duration` - (Optional) Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `file_object_cleanup_period` - (Optional) Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `file_reference_mappings` - (Optional) List of mapping for file reference and their absolute path. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gslb_purge_batch_size` - (Optional) Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gslb_purge_sleep_time_ms` - (Optional) Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition. From 6db7f7e721c356bc95f31dbbd8914e3b17186832 Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 29 Mar 2024 01:52:04 -0700 Subject: [PATCH 03/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_controllerproperties.go | 12 ++ avi/datasource_avi_systemreport.go | 5 + avi/datasource_avi_taskjournal.go | 60 ++++++ avi/provider.go | 2 + avi/resource_avi_controllerproperties.go | 18 ++ avi/resource_avi_rest_dependants.go | 181 ++++++++++++++++++ avi/resource_avi_systemreport.go | 5 + avi/resource_avi_taskjournal.go | 123 ++++++++++++ website/avi.erb | 6 + .../d/avi_controllerproperties.html.markdown | 3 + website/docs/d/avi_systemreport.html.markdown | 1 + website/docs/d/avi_taskjournal.html.markdown | 45 +++++ .../r/avi_controllerproperties.html.markdown | 3 + website/docs/r/avi_systemreport.html.markdown | 1 + website/docs/r/avi_taskjournal.html.markdown | 54 ++++++ 15 files changed, 519 insertions(+) create mode 100644 avi/datasource_avi_taskjournal.go create mode 100644 avi/resource_avi_taskjournal.go create mode 100644 website/docs/d/avi_taskjournal.html.markdown create mode 100644 website/docs/r/avi_taskjournal.html.markdown diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index 7e151debf..665b7de7b 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -154,6 +154,18 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "event_manager_max_goroutines": { + Type: schema.TypeString, + Computed: true, + }, + "event_manager_max_subscribers": { + Type: schema.TypeString, + Computed: true, + }, + "event_manager_processing_time_threshold": { + Type: schema.TypeString, + Computed: true, + }, "false_positive_learning_config": { Type: schema.TypeSet, Computed: true, diff --git a/avi/datasource_avi_systemreport.go b/avi/datasource_avi_systemreport.go index 52cbb4fb5..97af21a7e 100644 --- a/avi/datasource_avi_systemreport.go +++ b/avi/datasource_avi_systemreport.go @@ -54,6 +54,11 @@ func dataSourceAviSystemReport() *schema.Resource { Computed: true, Elem: ResourceReportSummarySchema(), }, + "tasks": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceReportTaskSchema(), + }, "tenant_ref": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_taskjournal.go b/avi/datasource_avi_taskjournal.go new file mode 100644 index 000000000..6dc41d82d --- /dev/null +++ b/avi/datasource_avi_taskjournal.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 dataSourceAviTaskJournal() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviTaskJournalRead, + Schema: map[string]*schema.Schema{ + "errors": { + Type: schema.TypeList, + Computed: true, + Elem: ResourceJournalErrorSchema(), + }, + "image_ref": { + Type: schema.TypeString, + Computed: true, + }, + "info": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceJournalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_cloud_ref": { + Type: schema.TypeString, + Computed: true, + }, + "operation": { + Type: schema.TypeString, + Computed: true, + }, + "patch_image_ref": { + Type: schema.TypeString, + Computed: true, + }, + "summary": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceJournalSummarySchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} diff --git a/avi/provider.go b/avi/provider.go index 08dfb6cdb..7a9ac9824 100644 --- a/avi/provider.go +++ b/avi/provider.go @@ -100,6 +100,7 @@ func Provider() *schema.Provider { "avi_licenseledgerdetails": dataSourceAviLicenseLedgerDetails(), "avi_ssopolicy": dataSourceAviSSOPolicy(), "avi_systemreport": dataSourceAviSystemReport(), + "avi_taskjournal": dataSourceAviTaskJournal(), "avi_authprofile": dataSourceAviAuthProfile(), "avi_authmappingprofile": dataSourceAviAuthMappingProfile(), "avi_serviceauthprofile": dataSourceAviServiceAuthProfile(), @@ -219,6 +220,7 @@ func Provider() *schema.Provider { "avi_licenseledgerdetails": resourceAviLicenseLedgerDetails(), "avi_ssopolicy": resourceAviSSOPolicy(), "avi_systemreport": resourceAviSystemReport(), + "avi_taskjournal": resourceAviTaskJournal(), "avi_authprofile": resourceAviAuthProfile(), "avi_authmappingprofile": resourceAviAuthMappingProfile(), "avi_serviceauthprofile": resourceAviServiceAuthProfile(), diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 22abe3ed2..0b84b9734 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -226,6 +226,24 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "event_manager_max_goroutines": { + Type: schema.TypeString, + Optional: true, + Default: "8", + ValidateFunc: validateInteger, + }, + "event_manager_max_subscribers": { + Type: schema.TypeString, + Optional: true, + Default: "5", + ValidateFunc: validateInteger, + }, + "event_manager_processing_time_threshold": { + Type: schema.TypeString, + Optional: true, + Default: "4", + ValidateFunc: validateInteger, + }, "false_positive_learning_config": { Type: schema.TypeSet, Optional: true, diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 99e3ebc17..a2e55c527 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -19355,6 +19355,160 @@ func ResourceJobEntrySchema() *schema.Resource { } } +func ResourceJournalActionSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "objects": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceJournalObjectSchema(), + }, + "version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceJournalErrorSchema() *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, + }, + "object": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "tenant": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "version": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceJournalInfoSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "actions": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceJournalActionSchema(), + }, + "total_objects": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validateInteger, + }, + "versions": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + +func ResourceJournalObjectSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "failed": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "model": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "skipped": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "success": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceJournalSummarySchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "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, + }, + "error_count": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "type": { + Type: schema.TypeString, + Required: true, + }, + }, + } +} + func ResourceJwtLogSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -26836,6 +26990,33 @@ func ResourceReportSummarySchema() *schema.Resource { } } +func ResourceReportTaskSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "reason": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "summary": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceJournalSummarySchema(), + }, + "task_journal_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + func ResourceResponseMatchTargetSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ diff --git a/avi/resource_avi_systemreport.go b/avi/resource_avi_systemreport.go index 110c4f862..3268f738c 100644 --- a/avi/resource_avi_systemreport.go +++ b/avi/resource_avi_systemreport.go @@ -63,6 +63,11 @@ func ResourceSystemReportSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceReportSummarySchema(), }, + "tasks": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceReportTaskSchema(), + }, "tenant_ref": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_taskjournal.go b/avi/resource_avi_taskjournal.go new file mode 100644 index 000000000..8ce975e98 --- /dev/null +++ b/avi/resource_avi_taskjournal.go @@ -0,0 +1,123 @@ +// 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 ResourceTaskJournalSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "errors": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceJournalErrorSchema(), + }, + "image_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "info": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceJournalInfoSchema(), + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "obj_cloud_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "operation": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "patch_image_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "summary": { + Type: schema.TypeSet, + Required: true, + Elem: ResourceJournalSummarySchema(), + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviTaskJournal() *schema.Resource { + return &schema.Resource{ + Create: resourceAviTaskJournalCreate, + Read: ResourceAviTaskJournalRead, + Update: resourceAviTaskJournalUpdate, + Delete: resourceAviTaskJournalDelete, + Schema: ResourceTaskJournalSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceTaskJournalImporter, + }, + } +} + +func ResourceTaskJournalImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceTaskJournalSchema() + return ResourceImporter(d, m, "taskjournal", s) +} + +func ResourceAviTaskJournalRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceTaskJournalSchema() + err := APIRead(d, meta, "taskjournal", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviTaskJournalCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTaskJournalSchema() + err := APICreate(d, meta, "taskjournal", s) + if err == nil { + err = ResourceAviTaskJournalRead(d, meta) + } + return err +} + +func resourceAviTaskJournalUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTaskJournalSchema() + var err error + err = APIUpdate(d, meta, "taskjournal", s) + if err == nil { + err = ResourceAviTaskJournalRead(d, meta) + } + return err +} + +func resourceAviTaskJournalDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "taskjournal") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/website/avi.erb b/website/avi.erb index 014e5286d..6c2e4e4ef 100644 --- a/website/avi.erb +++ b/website/avi.erb @@ -103,6 +103,9 @@ > SystemReport + + > + TaskJournal > AuthProfile @@ -460,6 +463,9 @@ > SystemReport + + > + TaskJournal > AuthProfile diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown index 963e546b1..ae737567b 100644 --- a/website/docs/d/avi_controllerproperties.html.markdown +++ b/website/docs/d/avi_controllerproperties.html.markdown @@ -68,6 +68,9 @@ In addition to all arguments above, the following attributes are exported: * `enable_memory_balancer` - Enable/disable memory balancer. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_per_process_stop` - Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `enable_resmgr_log_cache_print` - Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_max_goroutines` - Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_max_subscribers` - Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_processing_time_threshold` - Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `false_positive_learning_config` - False positive learning configuration. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fatal_error_lease_time` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `federated_datastore_cleanup_duration` - Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_systemreport.html.markdown b/website/docs/d/avi_systemreport.html.markdown index 2d5ba220c..8b1d1161a 100644 --- a/website/docs/d/avi_systemreport.html.markdown +++ b/website/docs/d/avi_systemreport.html.markdown @@ -42,6 +42,7 @@ In addition to all arguments above, the following attributes are exported: * `se_patch_image_ref` - Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `state` - Report state combines all applicable states. Ex readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `summary` - Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tasks` - List of tasks associated with the report. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `uuid` - Uuid identifier for the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/d/avi_taskjournal.html.markdown b/website/docs/d/avi_taskjournal.html.markdown new file mode 100644 index 000000000..a6304c4f0 --- /dev/null +++ b/website/docs/d/avi_taskjournal.html.markdown @@ -0,0 +1,45 @@ + +--- +layout: "avi" +page_title: "AVI: avi_taskjournal" +sidebar_current: "docs-avi-datasource-taskjournal" +description: |- + Get information of Avi TaskJournal. +--- + +# avi_taskjournal + +This data source is used to to get avi_taskjournal objects. + +## Example Usage + +```hcl +data "avi_taskjournal" "foo_taskjournal" { + uuid = "taskjournal-f9cf6b3e-a411-436f-95e2-2982ba2b217b" + name = "foo" +} +``` + +## Argument Reference + +* `name` - (Optional) Search TaskJournal by name. +* `uuid` - (Optional) Search TaskJournal by uuid. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `errors` - List of errors in the process. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `info` - Detailed information of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - Name for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `operation` - Operation for which the task journal created. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `patch_image_ref` - Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `summary` - Summary of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `uuid` - Uuid identifier for the task journal. Field introduced in 30.2.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 bd47349b8..9e9e9f549 100644 --- a/website/docs/r/avi_controllerproperties.html.markdown +++ b/website/docs/r/avi_controllerproperties.html.markdown @@ -63,6 +63,9 @@ The following arguments are supported: * `enable_memory_balancer` - (Optional) Enable/disable memory balancer. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_per_process_stop` - (Optional) Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `enable_resmgr_log_cache_print` - (Optional) Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_max_goroutines` - (Optional) Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_max_subscribers` - (Optional) Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `event_manager_processing_time_threshold` - (Optional) Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `false_positive_learning_config` - (Optional) False positive learning configuration. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fatal_error_lease_time` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `federated_datastore_cleanup_duration` - (Optional) Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_systemreport.html.markdown b/website/docs/r/avi_systemreport.html.markdown index 3daae159e..e51ce0a4a 100644 --- a/website/docs/r/avi_systemreport.html.markdown +++ b/website/docs/r/avi_systemreport.html.markdown @@ -37,6 +37,7 @@ The following arguments are supported: * `se_patch_image_ref` - (Optional) Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `state` - (Optional) Report state combines all applicable states. Ex readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `summary` - (Optional) Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tasks` - (Optional) List of tasks associated with the report. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_taskjournal.html.markdown b/website/docs/r/avi_taskjournal.html.markdown new file mode 100644 index 000000000..14467079f --- /dev/null +++ b/website/docs/r/avi_taskjournal.html.markdown @@ -0,0 +1,54 @@ + +--- +layout: "avi" +page_title: "Avi: avi_taskjournal" +sidebar_current: "docs-avi-resource-taskjournal" +description: |- + Creates and manages Avi TaskJournal. +--- + +# avi_taskjournal + +The TaskJournal resource allows the creation and management of Avi TaskJournal + +## Example Usage + +```hcl +resource "avi_taskjournal" "foo" { + name = "terraform-example-foo" + tenant_ref = "/api/tenant/?name=admin" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `summary` - (Required) Summary of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `errors` - (Optional) List of errors in the process. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `info` - (Optional) Detailed information of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - (Optional) Name for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `operation` - (Optional) Operation for which the task journal created. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. + + +### Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 40 mins) Used when creating the AMI +* `update` - (Defaults to 40 mins) Used when updating the AMI +* `delete` - (Defaults to 90 mins) Used when deregistering the AMI + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `uuid` - Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. + From 9f195abea984586f824c8b462bd50ff719857976 Mon Sep 17 00:00:00 2001 From: Sagar Date: Wed, 10 Apr 2024 05:55:12 -0700 Subject: [PATCH 04/25] Updated assets for terraform Signed-off-by: Sagar --- avi/data_source_avi_certificatemanagementprofile_test.go | 2 +- avi/data_source_avi_cluster_test.go | 2 +- avi/data_source_avi_pool_test.go | 2 +- avi/data_source_avi_useraccount_test.go | 2 +- avi/datasource_avi_fileservice.go | 2 +- avi/diff_suppress_func.go | 2 +- avi/provider_test.go | 2 +- avi/resource_avi_alertsyslogconfig_test.go | 2 +- avi/resource_avi_certificatemanagementprofile_test.go | 2 +- avi/resource_avi_fileservice.go | 2 +- avi/resource_avi_httppolicyset_test.go | 2 +- avi/resource_avi_useraccount.go | 2 +- avi/resource_avi_virtualservice_test.go | 2 +- avi/resource_avi_wafpolicy_test.go | 2 +- avi/utils.go | 2 +- avi/utils_test.go | 2 +- conftest.py | 2 +- go.mod | 2 +- go.sum | 2 ++ main.go | 2 +- scripts/changelog-links.sh | 2 +- scripts/errcheck.sh | 2 +- scripts/gofmtcheck.sh | 2 +- scripts/gogetcookie.sh | 2 +- 24 files changed, 25 insertions(+), 23 deletions(-) diff --git a/avi/data_source_avi_certificatemanagementprofile_test.go b/avi/data_source_avi_certificatemanagementprofile_test.go index 1b0713f8c..07d438a6b 100644 --- a/avi/data_source_avi_certificatemanagementprofile_test.go +++ b/avi/data_source_avi_certificatemanagementprofile_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/data_source_avi_cluster_test.go b/avi/data_source_avi_cluster_test.go index 472c53e21..51390ab0a 100644 --- a/avi/data_source_avi_cluster_test.go +++ b/avi/data_source_avi_cluster_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/data_source_avi_pool_test.go b/avi/data_source_avi_pool_test.go index 93b383c0c..b3be54926 100644 --- a/avi/data_source_avi_pool_test.go +++ b/avi/data_source_avi_pool_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/data_source_avi_useraccount_test.go b/avi/data_source_avi_useraccount_test.go index f7a565c8a..1517efd41 100644 --- a/avi/data_source_avi_useraccount_test.go +++ b/avi/data_source_avi_useraccount_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/datasource_avi_fileservice.go b/avi/datasource_avi_fileservice.go index 2151a9cf4..4f844ae21 100755 --- a/avi/datasource_avi_fileservice.go +++ b/avi/datasource_avi_fileservice.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/diff_suppress_func.go b/avi/diff_suppress_func.go index 2af390587..ff9ba2281 100644 --- a/avi/diff_suppress_func.go +++ b/avi/diff_suppress_func.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/provider_test.go b/avi/provider_test.go index 5117272ae..73394a9bf 100644 --- a/avi/provider_test.go +++ b/avi/provider_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_alertsyslogconfig_test.go b/avi/resource_avi_alertsyslogconfig_test.go index 103caee9c..815898791 100644 --- a/avi/resource_avi_alertsyslogconfig_test.go +++ b/avi/resource_avi_alertsyslogconfig_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_certificatemanagementprofile_test.go b/avi/resource_avi_certificatemanagementprofile_test.go index 8b5c73a95..d4c88c897 100644 --- a/avi/resource_avi_certificatemanagementprofile_test.go +++ b/avi/resource_avi_certificatemanagementprofile_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_fileservice.go b/avi/resource_avi_fileservice.go index ef2c714be..fff4b4585 100755 --- a/avi/resource_avi_fileservice.go +++ b/avi/resource_avi_fileservice.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_httppolicyset_test.go b/avi/resource_avi_httppolicyset_test.go index 18674676a..ae599d16c 100644 --- a/avi/resource_avi_httppolicyset_test.go +++ b/avi/resource_avi_httppolicyset_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_useraccount.go b/avi/resource_avi_useraccount.go index d5c8b94cb..470364a9e 100644 --- a/avi/resource_avi_useraccount.go +++ b/avi/resource_avi_useraccount.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_virtualservice_test.go b/avi/resource_avi_virtualservice_test.go index 0e9c83d30..0e2779c52 100644 --- a/avi/resource_avi_virtualservice_test.go +++ b/avi/resource_avi_virtualservice_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/resource_avi_wafpolicy_test.go b/avi/resource_avi_wafpolicy_test.go index 171fa51c3..1b5107a45 100644 --- a/avi/resource_avi_wafpolicy_test.go +++ b/avi/resource_avi_wafpolicy_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/utils.go b/avi/utils.go index 5385cd1a5..ec25e67f7 100644 --- a/avi/utils.go +++ b/avi/utils.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/avi/utils_test.go b/avi/utils_test.go index 04f683285..2252455fc 100644 --- a/avi/utils_test.go +++ b/avi/utils_test.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/conftest.py b/conftest.py index 9c8ab4f43..c24e71366 100644 --- a/conftest.py +++ b/conftest.py @@ -1,6 +1,6 @@ ############################################################################ # ======================================================================== -# Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential +# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential # ======================================================================== ### diff --git a/go.mod b/go.mod index 7c6aff0c2..a2a1c4a12 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b + github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513 golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index daeb89eac..5a9116a80 100644 --- a/go.sum +++ b/go.sum @@ -235,6 +235,8 @@ github.com/vmware/alb-sdk v0.0.0-20240321054554-959a4fbdb4a2 h1:R9uM5Fuh5CpfJGQ6 github.com/vmware/alb-sdk v0.0.0-20240321054554-959a4fbdb4a2/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b h1:s1SjmNKdSMuATU5m4j9ynpOdgHPjxG4Z0ieGStJtf0E= github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513 h1:IH5pGmtbt+m75tHOSRE2BmmpVhjP5XK3fPW5XAcGSTs= +github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513/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/main.go b/main.go index e8a964a76..5afe207fa 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ /*************************************************************************** * ======================================================================== - * Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential + * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential * ======================================================================== */ diff --git a/scripts/changelog-links.sh b/scripts/changelog-links.sh index 52ea13bfd..5692108e2 100755 --- a/scripts/changelog-links.sh +++ b/scripts/changelog-links.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ # ======================================================================== -# Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential +# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential # ======================================================================== ### diff --git a/scripts/errcheck.sh b/scripts/errcheck.sh index 55b19cf82..03132b502 100755 --- a/scripts/errcheck.sh +++ b/scripts/errcheck.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################ # ======================================================================== -# Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential +# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential # ======================================================================== ### diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh index 8be085c93..f5de0a42d 100755 --- a/scripts/gofmtcheck.sh +++ b/scripts/gofmtcheck.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################ # ======================================================================== -# Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential +# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential # ======================================================================== ### diff --git a/scripts/gogetcookie.sh b/scripts/gogetcookie.sh index 8a340944a..9449f0de5 100755 --- a/scripts/gogetcookie.sh +++ b/scripts/gogetcookie.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ # ======================================================================== -# Copyright 2023 VMware, Inc. All rights reserved. VMware Confidential +# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential # ======================================================================== ### From f29cda5de39f94bb9c3481b1a70e23df67378c19 Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 26 Apr 2024 01:54:46 -0700 Subject: [PATCH 05/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_cloud.go | 4 ++-- avi/resource_avi_rest_dependants.go | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/avi/resource_avi_cloud.go b/avi/resource_avi_cloud.go index cdb6948a0..3945da3cf 100644 --- a/avi/resource_avi_cloud.go +++ b/avi/resource_avi_cloud.go @@ -56,7 +56,7 @@ func ResourceCloudSchema() map[string]*schema.Schema { "dhcp_enabled": { Type: schema.TypeString, Optional: true, - Default: "false", + Default: "true", ValidateFunc: validateBool, }, "dns_provider_ref": { @@ -112,7 +112,7 @@ func ResourceCloudSchema() map[string]*schema.Schema { "ip6_autocfg_enabled": { Type: schema.TypeString, Optional: true, - Default: "false", + Default: "true", ValidateFunc: validateBool, }, "ipam_provider_ref": { diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index a2e55c527..6c8e29dca 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -30873,6 +30873,12 @@ func ResourceSeListSchema() *schema.Resource { Computed: true, Elem: ResourceIpAddrSchema(), }, + "route_revoked_pool_down": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "scaleout_in_progress": { Type: schema.TypeString, Optional: true, @@ -37788,6 +37794,12 @@ func ResourceVipSeAssignedSchema() *schema.Resource { Optional: true, Computed: true, }, + "route_revoked_pool_down": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "scalein_in_progress": { Type: schema.TypeString, Optional: true, From 2165d5552c0ccc4c121fe47e7c563728a2cd777a Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 30 Apr 2024 01:55:27 -0700 Subject: [PATCH 06/25] 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 a2a1c4a12..b9f5f3f85 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513 + github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 5a9116a80..30fbb41bb 100644 --- a/go.sum +++ b/go.sum @@ -237,6 +237,8 @@ github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b h1:s1SjmNKdSMuATU5m github.com/vmware/alb-sdk v0.0.0-20240326065001-d181a90dae8b/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513 h1:IH5pGmtbt+m75tHOSRE2BmmpVhjP5XK3fPW5XAcGSTs= github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf h1:1qtWtaXviUsD1WkgfQ6hJv1jJYXBHFp1Tc3v7x2Ib00= +github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf/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 a70b8d4ea2d4ffa4a6e137ded5f00e09f1e764b7 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 2 May 2024 01:55:43 -0700 Subject: [PATCH 07/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_controllerproperties.go | 4 ++++ avi/datasource_avi_serviceenginegroup.go | 4 ++++ avi/resource_avi_controllerproperties.go | 6 ++++++ avi/resource_avi_rest_dependants.go | 8 +++++++- avi/resource_avi_serviceenginegroup.go | 6 ++++++ go.mod | 2 +- go.sum | 2 ++ website/docs/d/avi_cloud.html.markdown | 4 ++-- website/docs/d/avi_controllerproperties.html.markdown | 5 +++-- website/docs/d/avi_serviceenginegroup.html.markdown | 1 + website/docs/r/avi_cloud.html.markdown | 4 ++-- website/docs/r/avi_controllerproperties.html.markdown | 5 +++-- website/docs/r/avi_serviceenginegroup.html.markdown | 1 + 13 files changed, 42 insertions(+), 10 deletions(-) diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index 665b7de7b..25e0eaa01 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -9,6 +9,10 @@ func dataSourceAviControllerProperties() *schema.Resource { return &schema.Resource{ Read: ResourceAviControllerPropertiesRead, Schema: map[string]*schema.Schema{ + "alert_manager_use_evms": { + Type: schema.TypeString, + Computed: true, + }, "allow_admin_network_updates": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go index 845ff7efa..162dc63cb 100644 --- a/avi/datasource_avi_serviceenginegroup.go +++ b/avi/datasource_avi_serviceenginegroup.go @@ -511,6 +511,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "max_num_http_sessions_to_store": { + Type: schema.TypeString, + Computed: true, + }, "max_num_se_dps": { Type: schema.TypeString, Computed: true, diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 0b84b9734..0f8b9b44a 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -10,6 +10,12 @@ import ( func ResourceControllerPropertiesSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ + "alert_manager_use_evms": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "allow_admin_network_updates": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 6c8e29dca..23e23563a 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -21151,7 +21151,7 @@ func ResourceMemoryBalancerInfoSchema() *schema.Resource { "debug_message": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: "exceeded memory limits", }, "limit": { Type: schema.TypeString, @@ -21186,6 +21186,12 @@ func ResourceMemoryBalancerInfoSchema() *schema.Resource { Optional: true, Computed: true, }, + "task_queue_length": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "threshold_percent": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go index 451ec97a2..cbc660064 100644 --- a/avi/resource_avi_serviceenginegroup.go +++ b/avi/resource_avi_serviceenginegroup.go @@ -722,6 +722,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "64", ValidateFunc: validateInteger, }, + "max_num_http_sessions_to_store": { + Type: schema.TypeString, + Optional: true, + Default: "50000", + ValidateFunc: validateInteger, + }, "max_num_se_dps": { Type: schema.TypeString, Optional: true, diff --git a/go.mod b/go.mod index b9f5f3f85..af03a1d9f 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf + github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590 golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 30fbb41bb..bd09c8b98 100644 --- a/go.sum +++ b/go.sum @@ -239,6 +239,8 @@ github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513 h1:IH5pGmtbt+m75tHO github.com/vmware/alb-sdk v0.0.0-20240410052311-1ef5bfd79513/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf h1:1qtWtaXviUsD1WkgfQ6hJv1jJYXBHFp1Tc3v7x2Ib00= github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590 h1:97P+8rzXZaXFsdsbYNgxBV+VCMAeHIm9Qj1eoBDCKak= +github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590/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_cloud.html.markdown b/website/docs/d/avi_cloud.html.markdown index 0c39f4baf..e2a8f038b 100644 --- a/website/docs/d/avi_cloud.html.markdown +++ b/website/docs/d/avi_cloud.html.markdown @@ -56,8 +56,8 @@ In addition to all arguments above, the following attributes are exported: * `maintenance_mode` - Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `markers` - List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `metrics_polling_interval` - Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `mgmt_ip_v4_enabled` - Enable ipv4 on the management interface of the serviceengine. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `mgmt_ip_v6_enabled` - Enable ipv6 on the management interface of the serviceengine. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `mgmt_ip_v4_enabled` - Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `mgmt_ip_v6_enabled` - Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `mtu` - Mtu setting for the cloud. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `nsxt_configuration` - Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown index ae737567b..566f00df7 100644 --- a/website/docs/d/avi_controllerproperties.html.markdown +++ b/website/docs/d/avi_controllerproperties.html.markdown @@ -32,6 +32,7 @@ data "avi_controllerproperties" "foo_controllerproperties" { In addition to all arguments above, the following attributes are exported: +* `alert_manager_use_evms` - Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `allow_admin_network_updates` - Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `allow_ip_forwarding` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `allow_unauthenticated_apis` - Allow unauthenticated access for special apis. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -47,9 +48,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.2.1. Unit is min. Allowed in enterprise edition with any value, 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 22.1.5, 30.2.1. 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.2.1. Unit is min. Allowed in enterprise edition with any value, 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 22.1.5, 30.2.1. 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_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown index 2078fa295..38c72fabb 100644 --- a/website/docs/d/avi_serviceenginegroup.html.markdown +++ b/website/docs/d/avi_serviceenginegroup.html.markdown @@ -156,6 +156,7 @@ In addition to all arguments above, the following attributes are exported: * `max_concurrent_external_hm` - Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_cpu_usage` - When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_memory_per_mempool` - Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `max_num_http_sessions_to_store` - Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `max_num_se_dps` - Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. * `max_public_ips_per_lb` - Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_queues_per_vnic` - Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition. diff --git a/website/docs/r/avi_cloud.html.markdown b/website/docs/r/avi_cloud.html.markdown index faab53e74..e17cdeb96 100644 --- a/website/docs/r/avi_cloud.html.markdown +++ b/website/docs/r/avi_cloud.html.markdown @@ -53,8 +53,8 @@ The following arguments are supported: * `maintenance_mode` - (Optional) Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `metrics_polling_interval` - (Optional) Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `mgmt_ip_v4_enabled` - (Optional) Enable ipv4 on the management interface of the serviceengine. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `mgmt_ip_v6_enabled` - (Optional) Enable ipv6 on the management interface of the serviceengine. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `mgmt_ip_v4_enabled` - (Optional) Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `mgmt_ip_v6_enabled` - (Optional) Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `mtu` - (Optional) Mtu setting for the cloud. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `nsxt_configuration` - (Optional) Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition. * `ntp_configuration` - (Optional) Ntp configuration for the cloud. Field introduced in 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 9e9e9f549..868d5197c 100644 --- a/website/docs/r/avi_controllerproperties.html.markdown +++ b/website/docs/r/avi_controllerproperties.html.markdown @@ -27,6 +27,7 @@ resource "avi_controllerproperties" "foo" { The following arguments are supported: +* `alert_manager_use_evms` - (Optional) Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `allow_admin_network_updates` - (Optional) Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `allow_ip_forwarding` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `allow_unauthenticated_apis` - (Optional) Allow unauthenticated access for special apis. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -42,9 +43,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.2.1. Unit is min. Allowed in enterprise edition with any value, 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 22.1.5, 30.2.1. 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.2.1. Unit is min. Allowed in enterprise edition with any value, 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 22.1.5, 30.2.1. 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_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown index c01e6b847..3e9ba2425 100644 --- a/website/docs/r/avi_serviceenginegroup.html.markdown +++ b/website/docs/r/avi_serviceenginegroup.html.markdown @@ -150,6 +150,7 @@ The following arguments are supported: * `max_concurrent_external_hm` - (Optional) Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_cpu_usage` - (Optional) When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_memory_per_mempool` - (Optional) Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `max_num_http_sessions_to_store` - (Optional) Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `max_num_se_dps` - (Optional) Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. * `max_public_ips_per_lb` - (Optional) Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `max_queues_per_vnic` - (Optional) Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition. From 3d9988b635b7d4ce021612c2a98dfaa99410da57 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 7 May 2024 01:56:16 -0700 Subject: [PATCH 08/25] 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 af03a1d9f..a1fe9c672 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590 + github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194 golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index bd09c8b98..7fc25279c 100644 --- a/go.sum +++ b/go.sum @@ -241,6 +241,8 @@ github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf h1:1qtWtaXviUsD1Wkg github.com/vmware/alb-sdk v0.0.0-20240430051249-ce235024c9bf/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590 h1:97P+8rzXZaXFsdsbYNgxBV+VCMAeHIm9Qj1eoBDCKak= github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194 h1:6dBAbWuQrN8gA1/7EMKb149n9WS3H9arDJn8UeIzKiI= +github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194/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 441cf46d49bd6711ece66c202be09460d358b492 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 14 May 2024 01:54:59 -0700 Subject: [PATCH 09/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_systemconfiguration.go | 9 ++ avi/datasource_avi_trustedhostprofile.go | 38 ++++++++ avi/provider.go | 2 + avi/resource_avi_systemconfiguration.go | 11 +++ avi/resource_avi_trustedhostprofile.go | 96 +++++++++++++++++++ website/avi.erb | 6 ++ .../d/avi_systemconfiguration.html.markdown | 2 + .../d/avi_trustedhostprofile.html.markdown | 40 ++++++++ .../r/avi_systemconfiguration.html.markdown | 2 + .../r/avi_trustedhostprofile.html.markdown | 49 ++++++++++ 10 files changed, 255 insertions(+) create mode 100644 avi/datasource_avi_trustedhostprofile.go create mode 100644 avi/resource_avi_trustedhostprofile.go create mode 100644 website/docs/d/avi_trustedhostprofile.html.markdown create mode 100644 website/docs/r/avi_trustedhostprofile.html.markdown diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go index 9adfc7514..640e29203 100644 --- a/avi/datasource_avi_systemconfiguration.go +++ b/avi/datasource_avi_systemconfiguration.go @@ -55,6 +55,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_host_header_check": { + Type: schema.TypeString, + Computed: true, + }, "fips_mode": { Type: schema.TypeString, Computed: true, @@ -125,6 +129,11 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "trusted_host_profiles_refs": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/datasource_avi_trustedhostprofile.go b/avi/datasource_avi_trustedhostprofile.go new file mode 100644 index 000000000..919c7ae87 --- /dev/null +++ b/avi/datasource_avi_trustedhostprofile.go @@ -0,0 +1,38 @@ +// 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 dataSourceAviTrustedHostProfile() *schema.Resource { + return &schema.Resource{ + Read: ResourceAviTrustedHostProfileRead, + Schema: map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, + "host_list": { + Type: schema.TypeString, + Computed: true, + }, + "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, + }, + }, + } +} diff --git a/avi/provider.go b/avi/provider.go index 7a9ac9824..f238e0cec 100644 --- a/avi/provider.go +++ b/avi/provider.go @@ -106,6 +106,7 @@ func Provider() *schema.Provider { "avi_serviceauthprofile": dataSourceAviServiceAuthProfile(), "avi_controllerproperties": dataSourceAviControllerProperties(), "avi_l4policyset": dataSourceAviL4PolicySet(), + "avi_trustedhostprofile": dataSourceAviTrustedHostProfile(), "avi_systemconfiguration": dataSourceAviSystemConfiguration(), "avi_controllersite": dataSourceAviControllerSite(), "avi_alertsyslogconfig": dataSourceAviAlertSyslogConfig(), @@ -226,6 +227,7 @@ func Provider() *schema.Provider { "avi_serviceauthprofile": resourceAviServiceAuthProfile(), "avi_controllerproperties": resourceAviControllerProperties(), "avi_l4policyset": resourceAviL4PolicySet(), + "avi_trustedhostprofile": resourceAviTrustedHostProfile(), "avi_systemconfiguration": resourceAviSystemConfiguration(), "avi_controllersite": resourceAviControllerSite(), "avi_alertsyslogconfig": resourceAviAlertSyslogConfig(), diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go index 23c9c643e..ed20a8967 100644 --- a/avi/resource_avi_systemconfiguration.go +++ b/avi/resource_avi_systemconfiguration.go @@ -68,6 +68,12 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "enable_host_header_check": { + Type: schema.TypeString, + Optional: true, + Default: "false", + ValidateFunc: validateBool, + }, "fips_mode": { Type: schema.TypeString, Optional: true, @@ -152,6 +158,11 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "trusted_host_profiles_refs": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, "uuid": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_trustedhostprofile.go b/avi/resource_avi_trustedhostprofile.go new file mode 100644 index 000000000..fd84b54f4 --- /dev/null +++ b/avi/resource_avi_trustedhostprofile.go @@ -0,0 +1,96 @@ +// 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 ResourceTrustedHostProfileSchema() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "configpb_attributes": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceConfigPbAttributesSchema(), + }, + "host_list": { + Type: schema.TypeString, + Required: true, + }, + "name": { + Type: schema.TypeString, + Required: true, + }, + "tenant_ref": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "uuid": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + } +} + +func resourceAviTrustedHostProfile() *schema.Resource { + return &schema.Resource{ + Create: resourceAviTrustedHostProfileCreate, + Read: ResourceAviTrustedHostProfileRead, + Update: resourceAviTrustedHostProfileUpdate, + Delete: resourceAviTrustedHostProfileDelete, + Schema: ResourceTrustedHostProfileSchema(), + Importer: &schema.ResourceImporter{ + State: ResourceTrustedHostProfileImporter, + }, + } +} + +func ResourceTrustedHostProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { + s := ResourceTrustedHostProfileSchema() + return ResourceImporter(d, m, "trustedhostprofile", s) +} + +func ResourceAviTrustedHostProfileRead(d *schema.ResourceData, meta interface{}) error { + s := ResourceTrustedHostProfileSchema() + err := APIRead(d, meta, "trustedhostprofile", s) + if err != nil { + log.Printf("[ERROR] in reading object %v\n", err) + } + return err +} + +func resourceAviTrustedHostProfileCreate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTrustedHostProfileSchema() + err := APICreate(d, meta, "trustedhostprofile", s) + if err == nil { + err = ResourceAviTrustedHostProfileRead(d, meta) + } + return err +} + +func resourceAviTrustedHostProfileUpdate(d *schema.ResourceData, meta interface{}) error { + s := ResourceTrustedHostProfileSchema() + var err error + err = APIUpdate(d, meta, "trustedhostprofile", s) + if err == nil { + err = ResourceAviTrustedHostProfileRead(d, meta) + } + return err +} + +func resourceAviTrustedHostProfileDelete(d *schema.ResourceData, meta interface{}) error { + var err error + if APIDeleteSystemDefaultCheck(d) { + return nil + } + err = APIDelete(d, meta, "trustedhostprofile") + if err != nil { + log.Printf("[ERROR] in deleting object %v\n", err) + } + return err +} diff --git a/website/avi.erb b/website/avi.erb index 6c2e4e4ef..01989f6db 100644 --- a/website/avi.erb +++ b/website/avi.erb @@ -121,6 +121,9 @@ > L4PolicySet + + > + TrustedHostProfile > SystemConfiguration @@ -481,6 +484,9 @@ > L4PolicySet + + > + TrustedHostProfile > SystemConfiguration diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown index f34098dd5..7c472ceef 100644 --- a/website/docs/d/avi_systemconfiguration.html.markdown +++ b/website/docs/d/avi_systemconfiguration.html.markdown @@ -42,6 +42,7 @@ In addition to all arguments above, the following attributes are exported: * `docker_mode` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - Host header check. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -57,6 +58,7 @@ In addition to all arguments above, the following attributes are exported: * `snmp_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `welcome_workflow_complete` - This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_trustedhostprofile.html.markdown b/website/docs/d/avi_trustedhostprofile.html.markdown new file mode 100644 index 000000000..67412d371 --- /dev/null +++ b/website/docs/d/avi_trustedhostprofile.html.markdown @@ -0,0 +1,40 @@ + +--- +layout: "avi" +page_title: "AVI: avi_trustedhostprofile" +sidebar_current: "docs-avi-datasource-trustedhostprofile" +description: |- + Get information of Avi TrustedHostProfile. +--- + +# avi_trustedhostprofile + +This data source is used to to get avi_trustedhostprofile objects. + +## Example Usage + +```hcl +data "avi_trustedhostprofile" "foo_trustedhostprofile" { + uuid = "trustedhostprofile-f9cf6b3e-a411-436f-95e2-2982ba2b217b" + name = "foo" +} +``` + +## Argument Reference + +* `name` - (Optional) Search TrustedHostProfile by name. +* `uuid` - (Optional) Search TrustedHostProfile by uuid. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `host_list` - List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. + diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown index 9411e2aef..3e7360848 100644 --- a/website/docs/r/avi_systemconfiguration.html.markdown +++ b/website/docs/r/avi_systemconfiguration.html.markdown @@ -36,6 +36,7 @@ The following arguments are supported: * `docker_mode` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - (Optional) Host header check. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -51,6 +52,7 @@ The following arguments are supported: * `snmp_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `welcome_workflow_complete` - (Optional) This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_trustedhostprofile.html.markdown b/website/docs/r/avi_trustedhostprofile.html.markdown new file mode 100644 index 000000000..07ee3a1bf --- /dev/null +++ b/website/docs/r/avi_trustedhostprofile.html.markdown @@ -0,0 +1,49 @@ + +--- +layout: "avi" +page_title: "Avi: avi_trustedhostprofile" +sidebar_current: "docs-avi-resource-trustedhostprofile" +description: |- + Creates and manages Avi TrustedHostProfile. +--- + +# avi_trustedhostprofile + +The TrustedHostProfile resource allows the creation and management of Avi TrustedHostProfile + +## Example Usage + +```hcl +resource "avi_trustedhostprofile" "foo" { + name = "terraform-example-foo" + tenant_ref = "/api/tenant/?name=admin" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `host_list` - (Required) List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - (Required) Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. + + +### Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions: + +* `create` - (Defaults to 40 mins) Used when creating the AMI +* `update` - (Defaults to 40 mins) Used when updating the AMI +* `delete` - (Defaults to 90 mins) Used when deregistering the AMI + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. + From bd5bb8fa6bd7ca5e2e7acb163f133ee30f2893f1 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 16 May 2024 01:54:45 -0700 Subject: [PATCH 10/25] Updated assets for terraform Signed-off-by: Sagar --- avi/provider.go | 4 ++-- avi/resource_avi_rest_dependants.go | 5 +++++ website/avi.erb | 12 ++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/avi/provider.go b/avi/provider.go index f238e0cec..d62eaf0d4 100644 --- a/avi/provider.go +++ b/avi/provider.go @@ -128,6 +128,7 @@ func Provider() *schema.Provider { "avi_vsdatascriptset": dataSourceAviVSDataScriptSet(), "avi_cluster": dataSourceAviCluster(), "avi_clusterclouddetails": dataSourceAviClusterCloudDetails(), + "avi_licensestatus": dataSourceAviLicenseStatus(), "avi_role": dataSourceAviRole(), "avi_useraccountprofile": dataSourceAviUserAccountProfile(), "avi_user": dataSourceAviUser(), @@ -179,7 +180,6 @@ func Provider() *schema.Provider { "avi_testsedatastorelevel3": dataSourceAviTestSeDatastoreLevel3(), "avi_albservicesfileupload": dataSourceAviALBServicesFileUpload(), "avi_dynamicdnsrecord": dataSourceAviDynamicDnsRecord(), - "avi_licensestatus": dataSourceAviLicenseStatus(), "avi_seproperties": dataSourceAviSeProperties(), "avi_cloudproperties": dataSourceAviCloudProperties(), "avi_albservicesfiledownload": dataSourceAviALBServicesFileDownload(), @@ -249,6 +249,7 @@ func Provider() *schema.Provider { "avi_vsdatascriptset": resourceAviVSDataScriptSet(), "avi_cluster": resourceAviCluster(), "avi_clusterclouddetails": resourceAviClusterCloudDetails(), + "avi_licensestatus": resourceAviLicenseStatus(), "avi_role": resourceAviRole(), "avi_useraccountprofile": resourceAviUserAccountProfile(), "avi_user": resourceAviUser(), @@ -300,7 +301,6 @@ func Provider() *schema.Provider { "avi_testsedatastorelevel3": resourceAviTestSeDatastoreLevel3(), "avi_albservicesfileupload": resourceAviALBServicesFileUpload(), "avi_dynamicdnsrecord": resourceAviDynamicDnsRecord(), - "avi_licensestatus": resourceAviLicenseStatus(), "avi_seproperties": resourceAviSeProperties(), "avi_cloudproperties": resourceAviCloudProperties(), "avi_albservicesfiledownload": resourceAviALBServicesFileDownload(), diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 23e23563a..30a556d11 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -28755,6 +28755,11 @@ func ResourceSaasLicensingStatusSchema() *schema.Resource { Computed: true, ValidateFunc: validateFloat, }, + "state": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, }, } } diff --git a/website/avi.erb b/website/avi.erb index 01989f6db..d943be9d1 100644 --- a/website/avi.erb +++ b/website/avi.erb @@ -187,6 +187,9 @@ > ClusterCloudDetails + + > + LicenseStatus > Role @@ -340,9 +343,6 @@ > DynamicDnsRecord - - > - LicenseStatus > SeProperties @@ -550,6 +550,9 @@ > ClusterCloudDetails + + > + LicenseStatus > Role @@ -703,9 +706,6 @@ > DynamicDnsRecord - - > - LicenseStatus > SeProperties From 2a9e25530db2e34b02972f27a9550035796c9527 Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 24 May 2024 01:57:59 -0700 Subject: [PATCH 11/25] Updated assets for terraform Signed-off-by: Sagar --- avi/data_source_avi_customipamdnsprofile_test.go | 2 +- avi/data_source_avi_dnspolicy_test.go | 2 +- avi/data_source_avi_ipaddrgroup_test.go | 2 +- avi/data_source_avi_ipamdnsproviderprofile_test.go | 2 +- avi/datasource_avi_customipamdnsprofile.go | 2 +- avi/datasource_avi_dnspolicy.go | 2 +- avi/datasource_avi_dynamicdnsrecord.go | 2 +- avi/datasource_avi_ipaddrgroup.go | 2 +- avi/datasource_avi_ipamdnsproviderprofile.go | 2 +- avi/resource_avi_customipamdnsprofile.go | 14 +++++++------- avi/resource_avi_customipamdnsprofile_test.go | 8 ++++---- avi/resource_avi_dnspolicy.go | 14 +++++++------- avi/resource_avi_dnspolicy_test.go | 8 ++++---- avi/resource_avi_dynamicdnsrecord.go | 14 +++++++------- avi/resource_avi_ipaddrgroup.go | 14 +++++++------- avi/resource_avi_ipaddrgroup_test.go | 8 ++++---- avi/resource_avi_ipamdnsproviderprofile.go | 14 +++++++------- avi/resource_avi_ipamdnsproviderprofile_test.go | 8 ++++---- 18 files changed, 60 insertions(+), 60 deletions(-) diff --git a/avi/data_source_avi_customipamdnsprofile_test.go b/avi/data_source_avi_customipamdnsprofile_test.go index a5e398f01..ecd7cd3f1 100644 --- a/avi/data_source_avi_customipamdnsprofile_test.go +++ b/avi/data_source_avi_customipamdnsprofile_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceCustomIpamDnsProfileBasic(t *testing.T) { } -//nolint +// nolint const testAccAVIDSCustomIpamDnsProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_dnspolicy_test.go b/avi/data_source_avi_dnspolicy_test.go index ab54f500f..1d4800d58 100644 --- a/avi/data_source_avi_dnspolicy_test.go +++ b/avi/data_source_avi_dnspolicy_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceDnsPolicyBasic(t *testing.T) { } -//nolint +// nolint const testAccAVIDSDnsPolicyConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_ipaddrgroup_test.go b/avi/data_source_avi_ipaddrgroup_test.go index d33d34b98..c3e1901c1 100644 --- a/avi/data_source_avi_ipaddrgroup_test.go +++ b/avi/data_source_avi_ipaddrgroup_test.go @@ -26,7 +26,7 @@ func TestAVIDataSourceIpAddrGroupBasic(t *testing.T) { } -//nolint +// nolint const testAccAVIDSIpAddrGroupConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/data_source_avi_ipamdnsproviderprofile_test.go b/avi/data_source_avi_ipamdnsproviderprofile_test.go index 342402295..c46e3b5f9 100644 --- a/avi/data_source_avi_ipamdnsproviderprofile_test.go +++ b/avi/data_source_avi_ipamdnsproviderprofile_test.go @@ -28,7 +28,7 @@ func TestAVIDataSourceIpamDnsProviderProfileBasic(t *testing.T) { } -//nolint +// nolint const testAccAVIDSIpamDnsProviderProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/datasource_avi_customipamdnsprofile.go b/avi/datasource_avi_customipamdnsprofile.go index ed7cbd662..d175a6834 100644 --- a/avi/datasource_avi_customipamdnsprofile.go +++ b/avi/datasource_avi_customipamdnsprofile.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -//nolint +// nolint func dataSourceAviCustomIpamDnsProfile() *schema.Resource { return &schema.Resource{ Read: ResourceAviCustomIpamDnsProfileRead, diff --git a/avi/datasource_avi_dnspolicy.go b/avi/datasource_avi_dnspolicy.go index 4783b701d..8c59317fa 100644 --- a/avi/datasource_avi_dnspolicy.go +++ b/avi/datasource_avi_dnspolicy.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -//nolint +// nolint func dataSourceAviDnsPolicy() *schema.Resource { return &schema.Resource{ Read: ResourceAviDnsPolicyRead, diff --git a/avi/datasource_avi_dynamicdnsrecord.go b/avi/datasource_avi_dynamicdnsrecord.go index 153828d78..22c828a69 100644 --- a/avi/datasource_avi_dynamicdnsrecord.go +++ b/avi/datasource_avi_dynamicdnsrecord.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -//nolint +// nolint func dataSourceAviDynamicDnsRecord() *schema.Resource { return &schema.Resource{ Read: ResourceAviDynamicDnsRecordRead, diff --git a/avi/datasource_avi_ipaddrgroup.go b/avi/datasource_avi_ipaddrgroup.go index 8eace16a2..523a0f4a7 100644 --- a/avi/datasource_avi_ipaddrgroup.go +++ b/avi/datasource_avi_ipaddrgroup.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -//nolint +// nolint func dataSourceAviIpAddrGroup() *schema.Resource { return &schema.Resource{ Read: ResourceAviIpAddrGroupRead, diff --git a/avi/datasource_avi_ipamdnsproviderprofile.go b/avi/datasource_avi_ipamdnsproviderprofile.go index de9274f1a..e6e92da91 100644 --- a/avi/datasource_avi_ipamdnsproviderprofile.go +++ b/avi/datasource_avi_ipamdnsproviderprofile.go @@ -5,7 +5,7 @@ package avi import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -//nolint +// nolint func dataSourceAviIpamDnsProviderProfile() *schema.Resource { return &schema.Resource{ Read: ResourceAviIpamDnsProviderProfileRead, diff --git a/avi/resource_avi_customipamdnsprofile.go b/avi/resource_avi_customipamdnsprofile.go index 5cab251b0..44bad4375 100644 --- a/avi/resource_avi_customipamdnsprofile.go +++ b/avi/resource_avi_customipamdnsprofile.go @@ -8,7 +8,7 @@ import ( "log" ) -//nolint +// nolint func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "configpb_attributes": { @@ -43,7 +43,7 @@ func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema { } } -//nolint +// nolint func resourceAviCustomIpamDnsProfile() *schema.Resource { return &schema.Resource{ Create: resourceAviCustomIpamDnsProfileCreate, @@ -57,13 +57,13 @@ func resourceAviCustomIpamDnsProfile() *schema.Resource { } } -//nolint +// nolint func ResourceCustomIpamDnsProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceCustomIpamDnsProfileSchema() return ResourceImporter(d, m, "customipamdnsprofile", s) } -//nolint +// nolint func ResourceAviCustomIpamDnsProfileRead(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() err := APIRead(d, meta, "customipamdnsprofile", s) @@ -73,7 +73,7 @@ func ResourceAviCustomIpamDnsProfileRead(d *schema.ResourceData, meta interface{ return err } -//nolint +// nolint func resourceAviCustomIpamDnsProfileCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() err := APICreate(d, meta, "customipamdnsprofile", s) @@ -83,7 +83,7 @@ func resourceAviCustomIpamDnsProfileCreate(d *schema.ResourceData, meta interfac return err } -//nolint +// nolint func resourceAviCustomIpamDnsProfileUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceCustomIpamDnsProfileSchema() var err error @@ -94,7 +94,7 @@ func resourceAviCustomIpamDnsProfileUpdate(d *schema.ResourceData, meta interfac return err } -//nolint +// nolint func resourceAviCustomIpamDnsProfileDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_customipamdnsprofile_test.go b/avi/resource_avi_customipamdnsprofile_test.go index 409a14fff..3c1acb491 100644 --- a/avi/resource_avi_customipamdnsprofile_test.go +++ b/avi/resource_avi_customipamdnsprofile_test.go @@ -43,7 +43,7 @@ func TestAVICustomIpamDnsProfileBasic(t *testing.T) { } -//nolint +// nolint func testAccCheckAVICustomIpamDnsProfileExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVICustomIpamDnsProfileExists(resourcename string) resource.Tes } -//nolint +// nolint func testAccCheckAVICustomIpamDnsProfileDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVICustomIpamDnsProfileDestroy(s *terraform.State) error { return nil } -//nolint +// nolint const testAccAVICustomIpamDnsProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -104,7 +104,7 @@ resource "avi_customipamdnsprofile" "testCustomIpamDnsProfile" { } ` -//nolint +// nolint const testAccAVICustomIpamDnsProfileupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_dnspolicy.go b/avi/resource_avi_dnspolicy.go index 3ba7f54b6..5c65c2a05 100644 --- a/avi/resource_avi_dnspolicy.go +++ b/avi/resource_avi_dnspolicy.go @@ -8,7 +8,7 @@ import ( "log" ) -//nolint +// nolint func ResourceDnsPolicySchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "configpb_attributes": { @@ -60,7 +60,7 @@ func ResourceDnsPolicySchema() map[string]*schema.Schema { } } -//nolint +// nolint func resourceAviDnsPolicy() *schema.Resource { return &schema.Resource{ Create: resourceAviDnsPolicyCreate, @@ -74,13 +74,13 @@ func resourceAviDnsPolicy() *schema.Resource { } } -//nolint +// nolint func ResourceDnsPolicyImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceDnsPolicySchema() return ResourceImporter(d, m, "dnspolicy", s) } -//nolint +// nolint func ResourceAviDnsPolicyRead(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() err := APIRead(d, meta, "dnspolicy", s) @@ -90,7 +90,7 @@ func ResourceAviDnsPolicyRead(d *schema.ResourceData, meta interface{}) error { return err } -//nolint +// nolint func resourceAviDnsPolicyCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() err := APICreate(d, meta, "dnspolicy", s) @@ -100,7 +100,7 @@ func resourceAviDnsPolicyCreate(d *schema.ResourceData, meta interface{}) error return err } -//nolint +// nolint func resourceAviDnsPolicyUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceDnsPolicySchema() var err error @@ -111,7 +111,7 @@ func resourceAviDnsPolicyUpdate(d *schema.ResourceData, meta interface{}) error return err } -//nolint +// nolint func resourceAviDnsPolicyDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_dnspolicy_test.go b/avi/resource_avi_dnspolicy_test.go index ca7694dd8..d070de8de 100644 --- a/avi/resource_avi_dnspolicy_test.go +++ b/avi/resource_avi_dnspolicy_test.go @@ -43,7 +43,7 @@ func TestAVIDnsPolicyBasic(t *testing.T) { } -//nolint +// nolint func testAccCheckAVIDnsPolicyExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVIDnsPolicyExists(resourcename string) resource.TestCheckFunc } -//nolint +// nolint func testAccCheckAVIDnsPolicyDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVIDnsPolicyDestroy(s *terraform.State) error { return nil } -//nolint +// nolint const testAccAVIDnsPolicyConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -104,7 +104,7 @@ resource "avi_dnspolicy" "testDnsPolicy" { } ` -//nolint +// nolint const testAccAVIDnsPolicyupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_dynamicdnsrecord.go b/avi/resource_avi_dynamicdnsrecord.go index 8de1f8afd..f9ecfca07 100644 --- a/avi/resource_avi_dynamicdnsrecord.go +++ b/avi/resource_avi_dynamicdnsrecord.go @@ -8,7 +8,7 @@ import ( "log" ) -//nolint +// nolint func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "algorithm": { @@ -119,7 +119,7 @@ func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema { } } -//nolint +// nolint func resourceAviDynamicDnsRecord() *schema.Resource { return &schema.Resource{ Create: resourceAviDynamicDnsRecordCreate, @@ -133,13 +133,13 @@ func resourceAviDynamicDnsRecord() *schema.Resource { } } -//nolint +// nolint func ResourceDynamicDnsRecordImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceDynamicDnsRecordSchema() return ResourceImporter(d, m, "dynamicdnsrecord", s) } -//nolint +// nolint func ResourceAviDynamicDnsRecordRead(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() err := APIRead(d, meta, "dynamicdnsrecord", s) @@ -149,7 +149,7 @@ func ResourceAviDynamicDnsRecordRead(d *schema.ResourceData, meta interface{}) e return err } -//nolint +// nolint func resourceAviDynamicDnsRecordCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() err := APICreate(d, meta, "dynamicdnsrecord", s) @@ -159,7 +159,7 @@ func resourceAviDynamicDnsRecordCreate(d *schema.ResourceData, meta interface{}) return err } -//nolint +// nolint func resourceAviDynamicDnsRecordUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceDynamicDnsRecordSchema() var err error @@ -170,7 +170,7 @@ func resourceAviDynamicDnsRecordUpdate(d *schema.ResourceData, meta interface{}) return err } -//nolint +// nolint func resourceAviDynamicDnsRecordDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipaddrgroup.go b/avi/resource_avi_ipaddrgroup.go index 57d85cbf8..ba80c25f4 100644 --- a/avi/resource_avi_ipaddrgroup.go +++ b/avi/resource_avi_ipaddrgroup.go @@ -8,7 +8,7 @@ import ( "log" ) -//nolint +// nolint func ResourceIpAddrGroupSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "addrs": { @@ -80,7 +80,7 @@ func ResourceIpAddrGroupSchema() map[string]*schema.Schema { } } -//nolint +// nolint func resourceAviIpAddrGroup() *schema.Resource { return &schema.Resource{ Create: resourceAviIpAddrGroupCreate, @@ -94,13 +94,13 @@ func resourceAviIpAddrGroup() *schema.Resource { } } -//nolint +// nolint func ResourceIpAddrGroupImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceIpAddrGroupSchema() return ResourceImporter(d, m, "ipaddrgroup", s) } -//nolint +// nolint func ResourceAviIpAddrGroupRead(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() err := APIRead(d, meta, "ipaddrgroup", s) @@ -110,7 +110,7 @@ func ResourceAviIpAddrGroupRead(d *schema.ResourceData, meta interface{}) error return err } -//nolint +// nolint func resourceAviIpAddrGroupCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() err := APICreate(d, meta, "ipaddrgroup", s) @@ -120,7 +120,7 @@ func resourceAviIpAddrGroupCreate(d *schema.ResourceData, meta interface{}) erro return err } -//nolint +// nolint func resourceAviIpAddrGroupUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpAddrGroupSchema() var err error @@ -131,7 +131,7 @@ func resourceAviIpAddrGroupUpdate(d *schema.ResourceData, meta interface{}) erro return err } -//nolint +// nolint func resourceAviIpAddrGroupDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipaddrgroup_test.go b/avi/resource_avi_ipaddrgroup_test.go index 0d7d99c0e..3609b932d 100644 --- a/avi/resource_avi_ipaddrgroup_test.go +++ b/avi/resource_avi_ipaddrgroup_test.go @@ -43,7 +43,7 @@ func TestAVIIpAddrGroupBasic(t *testing.T) { } -//nolint +// nolint func testAccCheckAVIIpAddrGroupExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -67,7 +67,7 @@ func testAccCheckAVIIpAddrGroupExists(resourcename string) resource.TestCheckFun } -//nolint +// nolint func testAccCheckAVIIpAddrGroupDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -92,7 +92,7 @@ func testAccCheckAVIIpAddrGroupDestroy(s *terraform.State) error { return nil } -//nolint +// nolint const testAccAVIIpAddrGroupConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -124,7 +124,7 @@ prefixes { } ` -//nolint +// nolint const testAccAVIIpAddrGroupupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" diff --git a/avi/resource_avi_ipamdnsproviderprofile.go b/avi/resource_avi_ipamdnsproviderprofile.go index 72e0e7689..c099aea21 100644 --- a/avi/resource_avi_ipamdnsproviderprofile.go +++ b/avi/resource_avi_ipamdnsproviderprofile.go @@ -8,7 +8,7 @@ import ( "log" ) -//nolint +// nolint func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "allocate_ip_in_vrf": { @@ -109,7 +109,7 @@ func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema { } } -//nolint +// nolint func resourceAviIpamDnsProviderProfile() *schema.Resource { return &schema.Resource{ Create: resourceAviIpamDnsProviderProfileCreate, @@ -123,13 +123,13 @@ func resourceAviIpamDnsProviderProfile() *schema.Resource { } } -//nolint +// nolint func ResourceIpamDnsProviderProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) { s := ResourceIpamDnsProviderProfileSchema() return ResourceImporter(d, m, "ipamdnsproviderprofile", s) } -//nolint +// nolint func ResourceAviIpamDnsProviderProfileRead(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() err := APIRead(d, meta, "ipamdnsproviderprofile", s) @@ -139,7 +139,7 @@ func ResourceAviIpamDnsProviderProfileRead(d *schema.ResourceData, meta interfac return err } -//nolint +// nolint func resourceAviIpamDnsProviderProfileCreate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() err := APICreate(d, meta, "ipamdnsproviderprofile", s) @@ -149,7 +149,7 @@ func resourceAviIpamDnsProviderProfileCreate(d *schema.ResourceData, meta interf return err } -//nolint +// nolint func resourceAviIpamDnsProviderProfileUpdate(d *schema.ResourceData, meta interface{}) error { s := ResourceIpamDnsProviderProfileSchema() var err error @@ -160,7 +160,7 @@ func resourceAviIpamDnsProviderProfileUpdate(d *schema.ResourceData, meta interf return err } -//nolint +// nolint func resourceAviIpamDnsProviderProfileDelete(d *schema.ResourceData, meta interface{}) error { var err error if APIDeleteSystemDefaultCheck(d) { diff --git a/avi/resource_avi_ipamdnsproviderprofile_test.go b/avi/resource_avi_ipamdnsproviderprofile_test.go index 6008064a5..b4230a33e 100644 --- a/avi/resource_avi_ipamdnsproviderprofile_test.go +++ b/avi/resource_avi_ipamdnsproviderprofile_test.go @@ -47,7 +47,7 @@ func TestAVIIpamDnsProviderProfileBasic(t *testing.T) { } -//nolint +// nolint func testAccCheckAVIIpamDnsProviderProfileExists(resourcename string) resource.TestCheckFunc { return func(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession @@ -71,7 +71,7 @@ func testAccCheckAVIIpamDnsProviderProfileExists(resourcename string) resource.T } -//nolint +// nolint func testAccCheckAVIIpamDnsProviderProfileDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*clients.AviClient).AviSession var obj interface{} @@ -96,7 +96,7 @@ func testAccCheckAVIIpamDnsProviderProfileDestroy(s *terraform.State) error { return nil } -//nolint +// nolint const testAccAVIIpamDnsProviderProfileConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" @@ -112,7 +112,7 @@ resource "avi_ipamdnsproviderprofile" "testIpamDnsProviderProfile" { } ` -//nolint +// nolint const testAccAVIIpamDnsProviderProfileupdatedConfig = ` data "avi_tenant" "default_tenant"{ name= "admin" From f7400e223f1331ee26f8ec9d42409c553fbc4dee Mon Sep 17 00:00:00 2001 From: Sagar Date: Mon, 27 May 2024 01:55:54 -0700 Subject: [PATCH 12/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 98 +++++++++++++++++++ .../d/avi_trustedhostprofile.html.markdown | 2 +- .../r/avi_trustedhostprofile.html.markdown | 2 +- 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 30a556d11..e55f3718f 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -12491,6 +12491,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceTencentSetupSchema(), }, + "uber_event_details": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceLogMgrUberEventDetailsSchema(), + }, "unbind_vs_se_details": { Type: schema.TypeSet, Optional: true, @@ -20851,6 +20857,57 @@ func ResourceLogMgrCleanupEventDetailsSchema() *schema.Resource { } } +func ResourceLogMgrUberEventDetailsSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "x_enum": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "x_float": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateFloat, + }, + "x_hex": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "x_int": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + "x_msg": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceUberEnumMessage1Schema(), + }, + "x_rmsg": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceUberEnumMessage1Schema(), + }, + "x_str": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "x_x": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeInt}, + }, + }, + } +} + func ResourceManagementNetworkConfigSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -35255,6 +35312,47 @@ func ResourceURIParamTokenSchema() *schema.Resource { } } +func ResourceUberEnumMessage1Schema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "rm": { + Type: schema.TypeList, + Optional: true, + Elem: ResourceUberEnumMessage2Schema(), + }, + "rv": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeInt}, + }, + "v": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + +func ResourceUberEnumMessage2Schema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "l": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeInt}, + }, + "v": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, + }, + } +} + func ResourceUdpAttacksSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{}, diff --git a/website/docs/d/avi_trustedhostprofile.html.markdown b/website/docs/d/avi_trustedhostprofile.html.markdown index 67412d371..07e9d52aa 100644 --- a/website/docs/d/avi_trustedhostprofile.html.markdown +++ b/website/docs/d/avi_trustedhostprofile.html.markdown @@ -33,7 +33,7 @@ data "avi_trustedhostprofile" "foo_trustedhostprofile" { In addition to all arguments above, the following attributes are exported: * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `host_list` - List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `host_list` - Comma separated list of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `name` - Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_trustedhostprofile.html.markdown b/website/docs/r/avi_trustedhostprofile.html.markdown index 07ee3a1bf..5766c9997 100644 --- a/website/docs/r/avi_trustedhostprofile.html.markdown +++ b/website/docs/r/avi_trustedhostprofile.html.markdown @@ -27,7 +27,7 @@ resource "avi_trustedhostprofile" "foo" { The following arguments are supported: -* `host_list` - (Required) List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `host_list` - (Required) Comma separated list of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `name` - (Required) Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. From c30c56167b6c3ea9718b28c880584c4e561db475 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 6 Jun 2024 01:57:01 -0700 Subject: [PATCH 13/25] 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 a1fe9c672..26014d4cb 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,6 @@ go 1.16 require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0 - github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194 + github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 golang.org/x/net v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 7fc25279c..1cfca36aa 100644 --- a/go.sum +++ b/go.sum @@ -243,6 +243,8 @@ github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590 h1:97P+8rzXZaXFsdsb github.com/vmware/alb-sdk v0.0.0-20240502042747-b0d6ec9d9590/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194 h1:6dBAbWuQrN8gA1/7EMKb149n9WS3H9arDJn8UeIzKiI= github.com/vmware/alb-sdk v0.0.0-20240506145732-01e8e062d194/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE= +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/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 88122787f1e4b8d8c7a62ed9daa8f01093532a4f Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 7 Jun 2024 01:57:28 -0700 Subject: [PATCH 14/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index e55f3718f..df41d3537 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -25819,6 +25819,12 @@ func ResourcePoolAnalyticsPolicySchema() *schema.Resource { Default: "false", ValidateFunc: validateBool, }, + "metrics_realtime_update": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceMetricsRealTimeUpdateSchema(), + }, }, } } From d53a93d2d53a2617d8c9da0f9b13f3dd3432cdeb Mon Sep 17 00:00:00 2001 From: Sagar Date: Mon, 10 Jun 2024 01:55:58 -0700 Subject: [PATCH 15/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_controllerproperties.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 0f8b9b44a..34e5b6a21 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -13,7 +13,7 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { "alert_manager_use_evms": { Type: schema.TypeString, Optional: true, - Default: "false", + Default: "true", ValidateFunc: validateBool, }, "allow_admin_network_updates": { From 296f427564ad26f502f8c98360c120da75e28ec3 Mon Sep 17 00:00:00 2001 From: Sagar Date: Wed, 12 Jun 2024 01:58:39 -0700 Subject: [PATCH 16/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 96 +++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index df41d3537..da480b378 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -12485,6 +12485,12 @@ func ResourceEventDetailsSchema() *schema.Resource { Computed: true, Elem: ResourceSystemReportSchema(), }, + "tech_support_event": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportEventSchema(), + }, "tencent_info": { Type: schema.TypeSet, Optional: true, @@ -34931,6 +34937,96 @@ func ResourceTcpAttacksSchema() *schema.Resource { } } +func ResourceTechSupportEventSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "tech_support_status": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceTechSupportStatusSchema(), + }, + "tenant": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + } +} + +func ResourceTechSupportStatusSchema() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + "case_number": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "duration": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "errors": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "key": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "level": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "node": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "output": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "size": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "start_time": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "status_code": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "warnings": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + func ResourceTenantConfigurationSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ From d3f67563d1c5e41644203e9927fc5edc4a39078c Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 14 Jun 2024 01:55:48 -0700 Subject: [PATCH 17/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_trustedhostprofile.go | 5 +++-- avi/resource_avi_trustedhostprofile.go | 5 +++-- website/docs/d/avi_systemconfiguration.html.markdown | 4 ++-- website/docs/d/avi_trustedhostprofile.html.markdown | 10 +++++----- website/docs/r/avi_systemconfiguration.html.markdown | 4 ++-- website/docs/r/avi_trustedhostprofile.html.markdown | 10 +++++----- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/avi/datasource_avi_trustedhostprofile.go b/avi/datasource_avi_trustedhostprofile.go index 919c7ae87..705cb6998 100644 --- a/avi/datasource_avi_trustedhostprofile.go +++ b/avi/datasource_avi_trustedhostprofile.go @@ -14,9 +14,10 @@ func dataSourceAviTrustedHostProfile() *schema.Resource { Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "host_list": { - Type: schema.TypeString, + "hosts": { + Type: schema.TypeList, Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "name": { Type: schema.TypeString, diff --git a/avi/resource_avi_trustedhostprofile.go b/avi/resource_avi_trustedhostprofile.go index fd84b54f4..296b2ca94 100644 --- a/avi/resource_avi_trustedhostprofile.go +++ b/avi/resource_avi_trustedhostprofile.go @@ -16,9 +16,10 @@ func ResourceTrustedHostProfileSchema() map[string]*schema.Schema { Computed: true, Elem: ResourceConfigPbAttributesSchema(), }, - "host_list": { - Type: schema.TypeString, + "hosts": { + Type: schema.TypeList, Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "name": { Type: schema.TypeString, diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown index 7c472ceef..2b556e208 100644 --- a/website/docs/d/avi_systemconfiguration.html.markdown +++ b/website/docs/d/avi_systemconfiguration.html.markdown @@ -42,7 +42,7 @@ In addition to all arguments above, the following attributes are exported: * `docker_mode` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `enable_host_header_check` - Host header check. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - Host header check. Field introduced in 30.2.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -58,7 +58,7 @@ In addition to all arguments above, the following attributes are exported: * `snmp_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 30.2.2. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `welcome_workflow_complete` - This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_trustedhostprofile.html.markdown b/website/docs/d/avi_trustedhostprofile.html.markdown index 07e9d52aa..c45e57464 100644 --- a/website/docs/d/avi_trustedhostprofile.html.markdown +++ b/website/docs/d/avi_trustedhostprofile.html.markdown @@ -32,9 +32,9 @@ data "avi_trustedhostprofile" "foo_trustedhostprofile" { In addition to all arguments above, the following attributes are exported: -* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `host_list` - Comma separated list of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `name` - Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `hosts` - List of host ip(v4/v6) addresses or fqdns. Field introduced in 22.1.7, 30.2.2, 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - Trustedhostprofile name. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `uuid` - Trustedhostprofile uuid. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown index 3e7360848..129528c4f 100644 --- a/website/docs/r/avi_systemconfiguration.html.markdown +++ b/website/docs/r/avi_systemconfiguration.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `docker_mode` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `enable_host_header_check` - (Optional) Host header check. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - (Optional) Host header check. Field introduced in 30.2.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -52,7 +52,7 @@ The following arguments are supported: * `snmp_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 30.2.2. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `welcome_workflow_complete` - (Optional) This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_trustedhostprofile.html.markdown b/website/docs/r/avi_trustedhostprofile.html.markdown index 5766c9997..fa203d1b0 100644 --- a/website/docs/r/avi_trustedhostprofile.html.markdown +++ b/website/docs/r/avi_trustedhostprofile.html.markdown @@ -27,10 +27,10 @@ resource "avi_trustedhostprofile" "foo" { The following arguments are supported: -* `host_list` - (Required) Comma separated list of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `name` - (Required) Trustedhostprofile name. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `hosts` - (Required) List of host ip(v4/v6) addresses or fqdns. Field introduced in 22.1.7, 30.2.2, 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `name` - (Required) Trustedhostprofile name. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. ### Timeouts @@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d In addition to all arguments above, the following attributes are exported: -* `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `uuid` - Trustedhostprofile uuid. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. From 395ac21089879b81502bcd4e06c94412f856297c Mon Sep 17 00:00:00 2001 From: Sagar Date: Fri, 21 Jun 2024 01:55:22 -0700 Subject: [PATCH 18/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_licensestatus.go | 4 ++++ avi/resource_avi_licensestatus.go | 5 +++++ avi/resource_avi_rest_dependants.go | 10 ++++++++++ avi/resource_avi_useraccount.go | 4 +++- website/docs/d/avi_licensestatus.html.markdown | 1 + website/docs/r/avi_licensestatus.html.markdown | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/avi/datasource_avi_licensestatus.go b/avi/datasource_avi_licensestatus.go index 119d31744..58fa91685 100644 --- a/avi/datasource_avi_licensestatus.go +++ b/avi/datasource_avi_licensestatus.go @@ -14,6 +14,10 @@ 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/resource_avi_licensestatus.go b/avi/resource_avi_licensestatus.go index ad2257857..a422cc02a 100644 --- a/avi/resource_avi_licensestatus.go +++ b/avi/resource_avi_licensestatus.go @@ -16,6 +16,11 @@ 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_rest_dependants.go b/avi/resource_avi_rest_dependants.go index da480b378..0c1907f25 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -25464,6 +25464,11 @@ func ResourceParamSizeClassSchema() *schema.Resource { Optional: true, Computed: true, }, + "timestamps": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeInt}, + }, }, } } @@ -25477,6 +25482,11 @@ 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, diff --git a/avi/resource_avi_useraccount.go b/avi/resource_avi_useraccount.go index 470364a9e..e78c592ae 100644 --- a/avi/resource_avi_useraccount.go +++ b/avi/resource_avi_useraccount.go @@ -23,7 +23,7 @@ func ResourceUserAccountSchema() map[string]*schema.Schema { return map[string]*schema.Schema{ "username": { Type: schema.TypeString, - Optional: true, + Required: true, }, "old_password": { Type: schema.TypeString, @@ -68,6 +68,7 @@ func ResourceAviUserAccountRead(d *schema.ResourceData, meta interface{}) error func resourceAviUserAccountCreate(d *schema.ResourceData, meta interface{}) error { if strings.Compare(d.Get("old_password").(string), d.Get("password").(string)) == 0 { + d.SetId(d.Get("username").(string)) return nil } err := resourceAviUserAccountUpdate(d, meta) @@ -91,6 +92,7 @@ func resourceAviUserAccountUpdate(d *schema.ResourceData, meta interface{}) erro err = client.AviSession.Put(path, data, &robj) if err != nil { log.Printf("[ERROR] in updating the object %v\n", err) + return err } else { // we dont get UUID because of nil response and username is unique in useraccount d.SetId(username.(string)) diff --git a/website/docs/d/avi_licensestatus.html.markdown b/website/docs/d/avi_licensestatus.html.markdown index f82988b15..68fb6ec29 100644 --- a/website/docs/d/avi_licensestatus.html.markdown +++ b/website/docs/d/avi_licensestatus.html.markdown @@ -33,6 +33,7 @@ data "avi_licensestatus" "foo_licensestatus" { In addition to all arguments above, the following attributes are exported: * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `essentials_enforced_at` - License enforcement date when we upgrade controller to 31.1.1 and license tier is essential before upgrade. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `saas_status` - Saas licensing status. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `service_update` - Pulse license service update. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_uuid` - Tenant uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_licensestatus.html.markdown b/website/docs/r/avi_licensestatus.html.markdown index 2eb8cf374..8e6900fe1 100644 --- a/website/docs/r/avi_licensestatus.html.markdown +++ b/website/docs/r/avi_licensestatus.html.markdown @@ -28,6 +28,7 @@ resource "avi_licensestatus" "foo" { The following arguments are supported: * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. +* `essentials_enforced_at` - (Optional) License enforcement date when we upgrade controller to 31.1.1 and license tier is essential before upgrade. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `saas_status` - (Optional) Saas licensing status. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `service_update` - (Optional) Pulse license service update. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `tenant_uuid` - (Optional) Tenant uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. From 6760863c4f637713241c3e283b82345af1640cc7 Mon Sep 17 00:00:00 2001 From: Sagar Date: Mon, 24 Jun 2024 01:56:52 -0700 Subject: [PATCH 19/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_serviceenginegroup.go | 4 ++++ avi/resource_avi_serviceenginegroup.go | 6 ++++++ website/docs/d/avi_serviceenginegroup.html.markdown | 1 + website/docs/r/avi_serviceenginegroup.html.markdown | 1 + 4 files changed, 12 insertions(+) diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go index 162dc63cb..e9b337cd7 100644 --- a/avi/datasource_avi_serviceenginegroup.go +++ b/avi/datasource_avi_serviceenginegroup.go @@ -310,6 +310,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "gve_enabled": { + Type: schema.TypeString, + Computed: true, + }, "ha_mode": { Type: schema.TypeString, Computed: true, diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go index cbc660064..ba2568bdb 100644 --- a/avi/resource_avi_serviceenginegroup.go +++ b/avi/resource_avi_serviceenginegroup.go @@ -442,6 +442,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { Default: "15", ValidateFunc: validateInteger, }, + "gve_enabled": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "ha_mode": { Type: schema.TypeString, Optional: true, diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown index 38c72fabb..48514301b 100644 --- a/website/docs/d/avi_serviceenginegroup.html.markdown +++ b/website/docs/d/avi_serviceenginegroup.html.markdown @@ -107,6 +107,7 @@ In addition to all arguments above, the following attributes are exported: * `gcp_config` - Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gratarp_permanent_periodicity` - Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `grpc_channel_connect_timeout` - Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `gve_enabled` - Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `ha_mode` - High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed in enterprise edition with any value, essentials edition(allowed values- ha_mode_legacy_active_standby), basic edition(allowed values- ha_mode_legacy_active_standby), enterprise with cloud services edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise is ha_mode_shared. * `handle_per_pkt_attack` - Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `hardwaresecuritymodulegroup_ref` - It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown index 3e9ba2425..b34fa1212 100644 --- a/website/docs/r/avi_serviceenginegroup.html.markdown +++ b/website/docs/r/avi_serviceenginegroup.html.markdown @@ -101,6 +101,7 @@ The following arguments are supported: * `gcp_config` - (Optional) Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `gratarp_permanent_periodicity` - (Optional) Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `grpc_channel_connect_timeout` - (Optional) Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `gve_enabled` - (Optional) Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `ha_mode` - (Optional) High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed in enterprise edition with any value, essentials edition(allowed values- ha_mode_legacy_active_standby), basic edition(allowed values- ha_mode_legacy_active_standby), enterprise with cloud services edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise is ha_mode_shared. * `handle_per_pkt_attack` - (Optional) Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `hardwaresecuritymodulegroup_ref` - (Optional) It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition. From 79c11535cdeffee75319766a5ca4d49f1a10543c Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 27 Jun 2024 01:55:06 -0700 Subject: [PATCH 20/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_serviceenginegroup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go index ba2568bdb..6dd713cfc 100644 --- a/avi/resource_avi_serviceenginegroup.go +++ b/avi/resource_avi_serviceenginegroup.go @@ -445,7 +445,7 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema { "gve_enabled": { Type: schema.TypeString, Optional: true, - Default: "true", + Default: "false", ValidateFunc: validateBool, }, "ha_mode": { From e934d0a0b4546967a512d8d38add2880e40107f9 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 2 Jul 2024 02:30:22 -0700 Subject: [PATCH 21/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 0c1907f25..3f186fef0 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -25829,12 +25829,6 @@ func ResourcePodTolerationSchema() *schema.Resource { func ResourcePoolAnalyticsPolicySchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ - "enable_realtime_metrics": { - Type: schema.TypeString, - Optional: true, - Default: "false", - ValidateFunc: validateBool, - }, "metrics_realtime_update": { Type: schema.TypeSet, Optional: true, From 2bc89cf766eb14af312ef49cf1e3fdd406569097 Mon Sep 17 00:00:00 2001 From: Sagar Date: Wed, 3 Jul 2024 01:56:54 -0700 Subject: [PATCH 22/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 3f186fef0..59848c91d 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -8206,6 +8206,12 @@ func ResourceControllerSizingLimitsSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "num_pool_rt_metrics": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "num_servers": { Type: schema.TypeString, Optional: true, From 05959a58010d6ba8927edcad2f1e0c74fecf251d Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 11 Jul 2024 01:52:33 -0700 Subject: [PATCH 23/25] Updated assets for terraform Signed-off-by: Sagar --- website/docs/d/avi_systemconfiguration.html.markdown | 4 ++-- website/docs/r/avi_systemconfiguration.html.markdown | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown index 2b556e208..59e24ba69 100644 --- a/website/docs/d/avi_systemconfiguration.html.markdown +++ b/website/docs/d/avi_systemconfiguration.html.markdown @@ -42,7 +42,7 @@ In addition to all arguments above, the following attributes are exported: * `docker_mode` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `enable_host_header_check` - Host header check. Field introduced in 30.2.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -58,7 +58,7 @@ In addition to all arguments above, the following attributes are exported: * `snmp_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 30.2.2. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 22.1.7, 30.2.2, 31.1.1. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `welcome_workflow_complete` - This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown index 129528c4f..b63e9c471 100644 --- a/website/docs/r/avi_systemconfiguration.html.markdown +++ b/website/docs/r/avi_systemconfiguration.html.markdown @@ -36,7 +36,7 @@ The following arguments are supported: * `docker_mode` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `email_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. -* `enable_host_header_check` - (Optional) Host header check. Field introduced in 30.2.2. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_host_header_check` - (Optional) Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -52,7 +52,7 @@ The following arguments are supported: * `snmp_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 30.2.2. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 22.1.7, 30.2.2, 31.1.1. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `welcome_workflow_complete` - (Optional) This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. From 19cc67088c093fca124b3732bf26b172e4561450 Mon Sep 17 00:00:00 2001 From: Sagar Date: Tue, 16 Jul 2024 02:03:16 -0700 Subject: [PATCH 24/25] Updated assets for terraform Signed-off-by: Sagar --- avi/datasource_avi_controllerproperties.go | 8 ----- avi/datasource_avi_systemconfiguration.go | 4 +++ avi/datasource_avi_upgradestatusinfo.go | 8 ----- avi/resource_avi_controllerproperties.go | 12 -------- avi/resource_avi_rest_dependants.go | 29 +++++++++++++++---- avi/resource_avi_systemconfiguration.go | 6 ++++ avi/resource_avi_upgradestatusinfo.go | 10 ------- .../d/avi_controllerproperties.html.markdown | 2 -- .../d/avi_systemconfiguration.html.markdown | 1 + .../d/avi_upgradestatusinfo.html.markdown | 2 -- .../r/avi_controllerproperties.html.markdown | 2 -- .../r/avi_systemconfiguration.html.markdown | 1 + .../r/avi_upgradestatusinfo.html.markdown | 2 -- 13 files changed, 36 insertions(+), 51 deletions(-) diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go index 25e0eaa01..6ca1fc386 100644 --- a/avi/datasource_avi_controllerproperties.go +++ b/avi/datasource_avi_controllerproperties.go @@ -339,14 +339,6 @@ func dataSourceAviControllerProperties() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "skopeo_retry_interval": { - Type: schema.TypeString, - Computed: true, - }, - "skopeo_retry_limit": { - Type: schema.TypeString, - Computed: true, - }, "soft_min_mem_per_se_limit": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go index 640e29203..201bc4339 100644 --- a/avi/datasource_avi_systemconfiguration.go +++ b/avi/datasource_avi_systemconfiguration.go @@ -59,6 +59,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "enable_telemetry": { + Type: schema.TypeString, + Computed: true, + }, "fips_mode": { Type: schema.TypeString, Computed: true, diff --git a/avi/datasource_avi_upgradestatusinfo.go b/avi/datasource_avi_upgradestatusinfo.go index 7fd281c62..b561e94e3 100644 --- a/avi/datasource_avi_upgradestatusinfo.go +++ b/avi/datasource_avi_upgradestatusinfo.go @@ -105,10 +105,6 @@ 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, @@ -138,10 +134,6 @@ 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/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go index 34e5b6a21..8d1c16544 100644 --- a/avi/resource_avi_controllerproperties.go +++ b/avi/resource_avi_controllerproperties.go @@ -501,18 +501,6 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, - "skopeo_retry_interval": { - Type: schema.TypeString, - Optional: true, - Default: "5", - ValidateFunc: validateInteger, - }, - "skopeo_retry_limit": { - Type: schema.TypeString, - Optional: true, - Default: "3", - ValidateFunc: validateInteger, - }, "soft_min_mem_per_se_limit": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index 59848c91d..a345a8ca7 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -3978,11 +3978,6 @@ func ResourceBuildInfoSchema() *schema.Resource { Optional: true, Computed: true, }, - "remote_image_ref": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "tag": { Type: schema.TypeString, Optional: true, @@ -18004,11 +17999,23 @@ func ResourceIPAddrLimitsSchema() *schema.Resource { func ResourceIPNetworkSubnetSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "ipv6_range": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceIpAddrRangeSchema(), + }, "network_ref": { Type: schema.TypeString, Optional: true, Computed: true, }, + "range": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: ResourceIpAddrRangeSchema(), + }, "subnet": { Type: schema.TypeSet, Optional: true, @@ -18704,6 +18711,18 @@ func ResourceIpCommunitySchema() *schema.Resource { func ResourceIpReputationConfigSchema() *schema.Resource { return &schema.Resource{ Schema: map[string]*schema.Schema{ + "enable_ipv4_reputation": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, + "enable_ipv6_reputation": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateBool, + }, "ip_reputation_file_object_expiry_duration": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go index ed20a8967..4486c3f12 100644 --- a/avi/resource_avi_systemconfiguration.go +++ b/avi/resource_avi_systemconfiguration.go @@ -74,6 +74,12 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema { Default: "false", ValidateFunc: validateBool, }, + "enable_telemetry": { + Type: schema.TypeString, + Optional: true, + Default: "true", + ValidateFunc: validateBool, + }, "fips_mode": { Type: schema.TypeString, Optional: true, diff --git a/avi/resource_avi_upgradestatusinfo.go b/avi/resource_avi_upgradestatusinfo.go index 1b9a4c9fd..63d66177e 100644 --- a/avi/resource_avi_upgradestatusinfo.go +++ b/avi/resource_avi_upgradestatusinfo.go @@ -132,11 +132,6 @@ 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, @@ -173,11 +168,6 @@ 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/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown index 566f00df7..b2f8b62db 100644 --- a/website/docs/d/avi_controllerproperties.html.markdown +++ b/website/docs/d/avi_controllerproperties.html.markdown @@ -114,8 +114,6 @@ In addition to all arguments above, the following attributes are exported: * `seupgrade_fabric_pool_size` - The pool size is used to control the number of concurrent segroup upgrades. This field value takes affect upon controller warm reboot. Allowed values are 2-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `seupgrade_segroup_min_dead_timeout` - Time to wait before marking segroup upgrade as stuck. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `shared_ssl_certificates` - Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `skopeo_retry_interval` - Time interval (in seconds) between retires for skopeo commands. Field introduced in 30.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `skopeo_retry_limit` - Number of times to try skopeo commands for remote image registries. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `soft_min_mem_per_se_limit` - Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `ssl_certificate_expiry_warning_days` - Number of days for ssl certificate expiry warning. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `system_report_cleanup_interval` - Time in minutes to wait between cleanup of systemreports. Allowed values are 15-300. Field introduced in 22.1.6, 30.2.1. Unit is min. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown index 59e24ba69..eec55ae86 100644 --- a/website/docs/d/avi_systemconfiguration.html.markdown +++ b/website/docs/d/avi_systemconfiguration.html.markdown @@ -43,6 +43,7 @@ In addition to all arguments above, the following attributes are exported: * `email_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `enable_host_header_check` - Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_telemetry` - Enables sending anonymous operational metrics to avi. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/d/avi_upgradestatusinfo.html.markdown b/website/docs/d/avi_upgradestatusinfo.html.markdown index b46f2d733..75ce56397 100644 --- a/website/docs/d/avi_upgradestatusinfo.html.markdown +++ b/website/docs/d/avi_upgradestatusinfo.html.markdown @@ -55,7 +55,6 @@ In addition to all arguments above, the following attributes are exported: * `patch_version` - Current patch version applied to this node. Example base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `prev_image_path` - Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `prev_patch_image_path` - Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `prev_remote_image_ref` - Remote image reference of previous base image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `previous_image_ref` - Image uuid for identifying previous base image.example base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `previous_patch_image_ref` - Image uuid for identifying previous patch.example base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `previous_patch_list` - List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -63,7 +62,6 @@ In addition to all arguments above, the following attributes are exported: * `previous_version` - Previous version prior to upgrade.example base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `progress` - Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `reason` - Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `remote_image_ref` - Remote image reference of current base image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `se_patch_image_path` - Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `se_patch_image_ref` - Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `se_upgrade_events` - Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_controllerproperties.html.markdown b/website/docs/r/avi_controllerproperties.html.markdown index 868d5197c..5542d8149 100644 --- a/website/docs/r/avi_controllerproperties.html.markdown +++ b/website/docs/r/avi_controllerproperties.html.markdown @@ -109,8 +109,6 @@ The following arguments are supported: * `seupgrade_fabric_pool_size` - (Optional) The pool size is used to control the number of concurrent segroup upgrades. This field value takes affect upon controller warm reboot. Allowed values are 2-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `seupgrade_segroup_min_dead_timeout` - (Optional) Time to wait before marking segroup upgrade as stuck. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `shared_ssl_certificates` - (Optional) Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `skopeo_retry_interval` - (Optional) Time interval (in seconds) between retires for skopeo commands. Field introduced in 30.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `skopeo_retry_limit` - (Optional) Number of times to try skopeo commands for remote image registries. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `soft_min_mem_per_se_limit` - (Optional) Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `ssl_certificate_expiry_warning_days` - (Optional) Number of days for ssl certificate expiry warning. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `system_report_cleanup_interval` - (Optional) Time in minutes to wait between cleanup of systemreports. Allowed values are 15-300. Field introduced in 22.1.6, 30.2.1. Unit is min. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown index b63e9c471..39fbbe0a0 100644 --- a/website/docs/r/avi_systemconfiguration.html.markdown +++ b/website/docs/r/avi_systemconfiguration.html.markdown @@ -37,6 +37,7 @@ The following arguments are supported: * `email_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition. * `enable_host_header_check` - (Optional) Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. +* `enable_telemetry` - (Optional) Enables sending anonymous operational metrics to avi. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `global_tenant_config` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. diff --git a/website/docs/r/avi_upgradestatusinfo.html.markdown b/website/docs/r/avi_upgradestatusinfo.html.markdown index 17156df0c..8bbf03605 100644 --- a/website/docs/r/avi_upgradestatusinfo.html.markdown +++ b/website/docs/r/avi_upgradestatusinfo.html.markdown @@ -50,7 +50,6 @@ The following arguments are supported: * `patch_version` - (Optional) Current patch version applied to this node. Example base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `prev_image_path` - (Optional) Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `prev_patch_image_path` - (Optional) Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. -* `prev_remote_image_ref` - (Optional) Remote image reference of previous base image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `previous_image_ref` - (Optional) Image uuid for identifying previous base image.example base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `previous_patch_image_ref` - (Optional) Image uuid for identifying previous patch.example base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `previous_patch_list` - (Optional) List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. @@ -58,7 +57,6 @@ The following arguments are supported: * `previous_version` - (Optional) Previous version prior to upgrade.example base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `progress` - (Optional) Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `reason` - (Optional) Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition. -* `remote_image_ref` - (Optional) Remote image reference of current base image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition. * `se_patch_image_path` - (Optional) Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `se_patch_image_ref` - (Optional) Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. * `se_upgrade_events` - (Optional) Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. From ad530395833a3500fe91958a46c6f52f98f07251 Mon Sep 17 00:00:00 2001 From: Sagar Date: Wed, 17 Jul 2024 01:58:29 -0700 Subject: [PATCH 25/25] Updated assets for terraform Signed-off-by: Sagar --- avi/resource_avi_rest_dependants.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go index a345a8ca7..6eaab551f 100644 --- a/avi/resource_avi_rest_dependants.go +++ b/avi/resource_avi_rest_dependants.go @@ -8207,6 +8207,12 @@ func ResourceControllerSizingLimitsSchema() *schema.Resource { Computed: true, ValidateFunc: validateInteger, }, + "num_se_rt_metrics": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validateInteger, + }, "num_servers": { Type: schema.TypeString, Optional: true,