From 28ce1779eadb7c6ff584413823322907fba38885 Mon Sep 17 00:00:00 2001
From: Rohan <rsuryavanshi@vmware.com>
Date: Wed, 5 Jul 2023 13:04:39 +0000
Subject: [PATCH] AV-183200 Golang lint and TF tests failure

---
 .github/workflows/golangci-lint.yml           |  4 +-
 .github/workflows/release.yml                 |  4 +-
 .golangci.yml                                 |  8 +--
 GNUmakefile                                   |  4 +-
 ...data_source_avi_applicationprofile_test.go |  9 +++
 ...ta_source_avi_controllerproperties_test.go |  2 +-
 ...ta_source_avi_customipamdnsprofile_test.go |  2 +-
 avi/data_source_avi_dnspolicy_test.go         |  2 +-
 avi/data_source_avi_ipaddrgroup_test.go       |  2 +-
 ..._source_avi_ipamdnsproviderprofile_test.go |  2 +-
 avi/data_source_avi_sslprofile_test.go        | 10 +--
 avi/datasource_avi_backupconfiguration.go     |  4 ++
 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/provider.go                               | 20 +++---
 avi/resource_avi_applicationprofile_test.go   | 18 +++++
 avi/resource_avi_backupconfiguration.go       |  5 ++
 avi/resource_avi_controllerproperties_test.go |  4 +-
 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 ++--
 ...esource_avi_ipamdnsproviderprofile_test.go |  8 +--
 avi/resource_avi_sslprofile_test.go           | 20 +++---
 avi/resource_avi_user.go                      |  8 ++-
 go.mod                                        |  2 +-
 go.sum                                        | 70 +------------------
 .../d/avi_backupconfiguration.html.markdown   |  1 +
 website/docs/d/avi_gslb.html.markdown         |  2 +-
 .../r/avi_backupconfiguration.html.markdown   |  1 +
 website/docs/r/avi_gslb.html.markdown         |  2 +-
 38 files changed, 143 insertions(+), 175 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index fbf80dda1..7c208b1af 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -14,8 +14,8 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.48.0
-          args: --issues-exit-code=1
+          version: v1.53.3
+          args: run --issues-exit-code=1
           only-new-issues: true
           skip-pkg-cache: true
           skip-build-cache: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf1465ef6..556d9ab3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
         name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.48.0
-          args: --issues-exit-code=1
+          version: v1.53.3
+          args: run --issues-exit-code=1
           skip-pkg-cache: true
           skip-build-cache: true
       -
diff --git a/.golangci.yml b/.golangci.yml
index 7f5b3f1c2..f816bc332 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,8 +2,7 @@ issues:
   max-per-linter: 0
   max-same-issues: 0
   exclude:
-      - SA1019
-
+    - SA1019
 run:
   deadline: 5m
   skip-files:
@@ -12,23 +11,18 @@ run:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gofmt
     - goimports
-    - golint
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - nakedret
     - misspell
     - staticcheck
-    - structcheck
     - typecheck
     - unused
     - unconvert
-    - varcheck
     - vet
     - vetshadow
 
diff --git a/GNUmakefile b/GNUmakefile
index 376928bce..22e3343b2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,11 +9,11 @@ build: fmtcheck
 
 build13: GOOS=$(shell go env GOOS)
 build13: GOARCH=$(shell go env GOARCH)
-build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/22.1.3/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/30.1.1/$(GOOS)_$(GOARCH)
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-avi_v22.1.3
+	go build -o $(DESTINATION)/terraform-provider-avi_v30.1.1
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1
diff --git a/avi/data_source_avi_applicationprofile_test.go b/avi/data_source_avi_applicationprofile_test.go
index afc35b981..bb1f11cc4 100644
--- a/avi/data_source_avi_applicationprofile_test.go
+++ b/avi/data_source_avi_applicationprofile_test.go
@@ -92,6 +92,15 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			max_object_size = "4194304"
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
+		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
+		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
 		client_header_timeout = "10000"
diff --git a/avi/data_source_avi_controllerproperties_test.go b/avi/data_source_avi_controllerproperties_test.go
index eaa66c4cf..ab0a9bcee 100644
--- a/avi/data_source_avi_controllerproperties_test.go
+++ b/avi/data_source_avi_controllerproperties_test.go
@@ -147,7 +147,7 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_seq_attach_ip_failures = "3"
 	secure_channel_cleanup_timeout = "60"
 	vs_se_vnic_ip_fail = "120"
-	ssl_certificate_expiry_warning_days = ["30","7","1"]
+	ssl_certificate_expiry_warning_days = ["1","7","30"]
 	secure_channel_se_token_timeout = "60"
 	secure_channel_controller_token_timeout = "60"
 	api_idle_timeout = "15"
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/data_source_avi_sslprofile_test.go b/avi/data_source_avi_sslprofile_test.go
index 3f66a47a4..6f57174ed 100644
--- a/avi/data_source_avi_sslprofile_test.go
+++ b/avi/data_source_avi_sslprofile_test.go
@@ -42,7 +42,7 @@ resource "avi_sslprofile" "testSSLProfile" {
 	name = "test-System-Standard-abc"
 	tenant_ref = data.avi_tenant.default_tenant.id
 	ssl_session_timeout = "86400"
-	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA"
+	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384"
 	prefer_client_cipher_ordering = false
 	accepted_versions {
 	type = "SSL_VERSION_TLS1"
@@ -54,12 +54,12 @@ accepted_versions {
 	type = "SSL_VERSION_TLS1_2"
 }
 	enable_ssl_session_reuse = true
-	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384","TLS_RSA_WITH_AES_128_GCM_SHA256","TLS_RSA_WITH_AES_256_GCM_SHA384","TLS_RSA_WITH_AES_128_CBC_SHA256","TLS_RSA_WITH_AES_256_CBC_SHA256","TLS_RSA_WITH_AES_128_CBC_SHA","TLS_RSA_WITH_AES_256_CBC_SHA","TLS_RSA_WITH_3DES_EDE_CBC_SHA","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
+	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
 	send_close_notify = true
 	ssl_rating {
-		performance_rating = "SSL_SCORE_EXCELLENT"
-		security_score = "100.0"
-		compatibility_rating = "SSL_SCORE_EXCELLENT"
+		performance_rating = "SSL_SCORE_NOT_SECURE"
+		security_score = "100"
+		compatibility_rating = "SSL_SCORE_GOOD"
 	}
 	dhparam = <<EOF
 -----BEGIN DH PARAMETERS-----
diff --git a/avi/datasource_avi_backupconfiguration.go b/avi/datasource_avi_backupconfiguration.go
index 7a2a1e4bc..e77ec9e80 100644
--- a/avi/datasource_avi_backupconfiguration.go
+++ b/avi/datasource_avi_backupconfiguration.go
@@ -59,6 +59,10 @@ func dataSourceAviBackupConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"s3_bucket_folder": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"save_local": {
 				Type:     schema.TypeString,
 				Computed: true,
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/provider.go b/avi/provider.go
index 1c24a2abf..315ceaba6 100644
--- a/avi/provider.go
+++ b/avi/provider.go
@@ -315,8 +315,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		Tenant:     "admin",
 		Version:    "18.2.8",
 		AuthToken:  d.Get("avi_authtoken").(string),
-		CSP_TOKEN:  d.Get("avi_csp_token").(string),
-		CSP_HOST:   d.Get("avi_csp_host").(string),
+		CSPToken:   d.Get("avi_csp_token").(string),
+		CSPHost:    d.Get("avi_csp_host").(string),
 		Timeout:    time.Duration(d.Get("avi_api_timeout").(int)) * time.Second,
 	}
 	if username, ok := d.GetOk("avi_username"); ok {
@@ -332,11 +332,11 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	if timeout, ok := d.GetOk("avi_api_timeout"); ok {
 		config.Timeout = time.Duration(timeout.(int)) * time.Second
 	}
-	if Csp_token, ok := d.GetOk("avi_csp_token"); ok {
-		config.CSP_TOKEN = Csp_token.(string)
+	if csptoken, ok := d.GetOk("avi_csp_token"); ok {
+		config.CSPToken = csptoken.(string)
 	}
-	if Csp_host, ok := d.GetOk("avi_csp_host"); ok {
-		config.CSP_HOST = Csp_host.(string)
+	if csphost, ok := d.GetOk("avi_csp_host"); ok {
+		config.CSPHost = csphost.(string)
 	}
 
 	aviClient, err := clients.NewAviClient(
@@ -346,8 +346,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		session.SetVersion(config.Version),
 		session.SetAuthToken(config.AuthToken),
 		session.SetInsecure, session.SetTimeout(config.Timeout),
-		session.SetCSPHost(config.CSP_HOST),
-		session.SetCSPToken(config.CSP_TOKEN),
+		session.SetCSPHost(config.CSPHost),
+		session.SetCSPToken(config.CSPToken),
 		session.SetLazyAuthentication(true))
 
 	log.Printf("Avi Client created for user %s tenant %s version %s\n",
@@ -363,7 +363,7 @@ type Credentials struct {
 	Tenant     string
 	Version    string
 	AuthToken  string
-	CSP_HOST   string
-	CSP_TOKEN  string
+	CSPHost    string
+	CSPToken   string
 	Timeout    time.Duration
 }
diff --git a/avi/resource_avi_applicationprofile_test.go b/avi/resource_avi_applicationprofile_test.go
index 1afdd7f41..5856992d3 100644
--- a/avi/resource_avi_applicationprofile_test.go
+++ b/avi/resource_avi_applicationprofile_test.go
@@ -160,6 +160,15 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			max_object_size = "4194304"
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
+		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
+		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
 		client_header_timeout = "10000"
@@ -239,6 +248,15 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			max_object_size = "4194304"
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
+		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
+		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
 		client_header_timeout = "10000"
diff --git a/avi/resource_avi_backupconfiguration.go b/avi/resource_avi_backupconfiguration.go
index b2383b95b..1ea235d58 100644
--- a/avi/resource_avi_backupconfiguration.go
+++ b/avi/resource_avi_backupconfiguration.go
@@ -80,6 +80,11 @@ func ResourceBackupConfigurationSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"s3_bucket_folder": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"save_local": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_controllerproperties_test.go b/avi/resource_avi_controllerproperties_test.go
index 7ad9f0764..f7d4a404f 100644
--- a/avi/resource_avi_controllerproperties_test.go
+++ b/avi/resource_avi_controllerproperties_test.go
@@ -266,7 +266,7 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_seq_attach_ip_failures = "3"
 	secure_channel_cleanup_timeout = "60"
 	vs_se_vnic_ip_fail = "120"
-	ssl_certificate_expiry_warning_days = ["30","7","1"]
+	ssl_certificate_expiry_warning_days = ["1","7","30"]
 	secure_channel_se_token_timeout = "60"
 	secure_channel_controller_token_timeout = "60"
 	api_idle_timeout = "15"
@@ -314,7 +314,7 @@ resource "avi_controllerproperties" "testControllerProperties" {
 	max_seq_attach_ip_failures = "3"
 	secure_channel_cleanup_timeout = "60"
 	vs_se_vnic_ip_fail = "120"
-	ssl_certificate_expiry_warning_days = ["30","7","1"]
+	ssl_certificate_expiry_warning_days = ["1","7","30"]
 	secure_channel_se_token_timeout = "60"
 	secure_channel_controller_token_timeout = "60"
 	api_idle_timeout = "15"
diff --git a/avi/resource_avi_customipamdnsprofile.go b/avi/resource_avi_customipamdnsprofile.go
index 731053835..a2fda6aff 100644
--- a/avi/resource_avi_customipamdnsprofile.go
+++ b/avi/resource_avi_customipamdnsprofile.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/alb-sdk/go/clients"
 )
 
-//nolint
+// nolint
 func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"configpb_attributes": {
@@ -46,7 +46,7 @@ func ResourceCustomIpamDnsProfileSchema() map[string]*schema.Schema {
 	}
 }
 
-//nolint
+// nolint
 func resourceAviCustomIpamDnsProfile() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAviCustomIpamDnsProfileCreate,
@@ -60,13 +60,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)
@@ -76,7 +76,7 @@ func ResourceAviCustomIpamDnsProfileRead(d *schema.ResourceData, meta interface{
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviCustomIpamDnsProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceCustomIpamDnsProfileSchema()
 	err := APICreateOrUpdate(d, meta, "customipamdnsprofile", s)
@@ -86,7 +86,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
@@ -97,7 +97,7 @@ func resourceAviCustomIpamDnsProfileUpdate(d *schema.ResourceData, meta interfac
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviCustomIpamDnsProfileDelete(d *schema.ResourceData, meta interface{}) error {
 	objType := "customipamdnsprofile"
 	client := meta.(*clients.AviClient)
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 e23abc914..43e5f19e2 100644
--- a/avi/resource_avi_dnspolicy.go
+++ b/avi/resource_avi_dnspolicy.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/alb-sdk/go/clients"
 )
 
-//nolint
+// nolint
 func ResourceDnsPolicySchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"configpb_attributes": {
@@ -63,7 +63,7 @@ func ResourceDnsPolicySchema() map[string]*schema.Schema {
 	}
 }
 
-//nolint
+// nolint
 func resourceAviDnsPolicy() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAviDnsPolicyCreate,
@@ -77,13 +77,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)
@@ -93,7 +93,7 @@ func ResourceAviDnsPolicyRead(d *schema.ResourceData, meta interface{}) error {
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviDnsPolicyCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceDnsPolicySchema()
 	err := APICreateOrUpdate(d, meta, "dnspolicy", s)
@@ -103,7 +103,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
@@ -114,7 +114,7 @@ func resourceAviDnsPolicyUpdate(d *schema.ResourceData, meta interface{}) error
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviDnsPolicyDelete(d *schema.ResourceData, meta interface{}) error {
 	objType := "dnspolicy"
 	client := meta.(*clients.AviClient)
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 a429d1d8c..83bf168d7 100644
--- a/avi/resource_avi_dynamicdnsrecord.go
+++ b/avi/resource_avi_dynamicdnsrecord.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/alb-sdk/go/clients"
 )
 
-//nolint
+// nolint
 func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"algorithm": {
@@ -122,7 +122,7 @@ func ResourceDynamicDnsRecordSchema() map[string]*schema.Schema {
 	}
 }
 
-//nolint
+// nolint
 func resourceAviDynamicDnsRecord() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAviDynamicDnsRecordCreate,
@@ -136,13 +136,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)
@@ -152,7 +152,7 @@ func ResourceAviDynamicDnsRecordRead(d *schema.ResourceData, meta interface{}) e
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviDynamicDnsRecordCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceDynamicDnsRecordSchema()
 	err := APICreateOrUpdate(d, meta, "dynamicdnsrecord", s)
@@ -162,7 +162,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
@@ -173,7 +173,7 @@ func resourceAviDynamicDnsRecordUpdate(d *schema.ResourceData, meta interface{})
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviDynamicDnsRecordDelete(d *schema.ResourceData, meta interface{}) error {
 	objType := "dynamicdnsrecord"
 	client := meta.(*clients.AviClient)
diff --git a/avi/resource_avi_ipaddrgroup.go b/avi/resource_avi_ipaddrgroup.go
index a7c1df626..18fb09be0 100644
--- a/avi/resource_avi_ipaddrgroup.go
+++ b/avi/resource_avi_ipaddrgroup.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/alb-sdk/go/clients"
 )
 
-//nolint
+// nolint
 func ResourceIpAddrGroupSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"addrs": {
@@ -83,7 +83,7 @@ func ResourceIpAddrGroupSchema() map[string]*schema.Schema {
 	}
 }
 
-//nolint
+// nolint
 func resourceAviIpAddrGroup() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAviIpAddrGroupCreate,
@@ -97,13 +97,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)
@@ -113,7 +113,7 @@ func ResourceAviIpAddrGroupRead(d *schema.ResourceData, meta interface{}) error
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviIpAddrGroupCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceIpAddrGroupSchema()
 	err := APICreateOrUpdate(d, meta, "ipaddrgroup", s)
@@ -123,7 +123,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
@@ -134,7 +134,7 @@ func resourceAviIpAddrGroupUpdate(d *schema.ResourceData, meta interface{}) erro
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviIpAddrGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	objType := "ipaddrgroup"
 	client := meta.(*clients.AviClient)
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 9e0de69fc..7bcb4b52a 100644
--- a/avi/resource_avi_ipamdnsproviderprofile.go
+++ b/avi/resource_avi_ipamdnsproviderprofile.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmware/alb-sdk/go/clients"
 )
 
-//nolint
+// nolint
 func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"allocate_ip_in_vrf": {
@@ -112,7 +112,7 @@ func ResourceIpamDnsProviderProfileSchema() map[string]*schema.Schema {
 	}
 }
 
-//nolint
+// nolint
 func resourceAviIpamDnsProviderProfile() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAviIpamDnsProviderProfileCreate,
@@ -126,13 +126,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)
@@ -142,7 +142,7 @@ func ResourceAviIpamDnsProviderProfileRead(d *schema.ResourceData, meta interfac
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviIpamDnsProviderProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceIpamDnsProviderProfileSchema()
 	err := APICreateOrUpdate(d, meta, "ipamdnsproviderprofile", s)
@@ -152,7 +152,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
@@ -163,7 +163,7 @@ func resourceAviIpamDnsProviderProfileUpdate(d *schema.ResourceData, meta interf
 	return err
 }
 
-//nolint
+// nolint
 func resourceAviIpamDnsProviderProfileDelete(d *schema.ResourceData, meta interface{}) error {
 	objType := "ipamdnsproviderprofile"
 	client := meta.(*clients.AviClient)
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"
diff --git a/avi/resource_avi_sslprofile_test.go b/avi/resource_avi_sslprofile_test.go
index 841a23215..397da4042 100644
--- a/avi/resource_avi_sslprofile_test.go
+++ b/avi/resource_avi_sslprofile_test.go
@@ -114,7 +114,7 @@ resource "avi_sslprofile" "testSSLProfile" {
 	name = "test-System-Standard-abc"
 	tenant_ref = data.avi_tenant.default_tenant.id
 	ssl_session_timeout = "86400"
-	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA"
+	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384"
 	prefer_client_cipher_ordering = false
 	accepted_versions {
 	type = "SSL_VERSION_TLS1"
@@ -126,12 +126,12 @@ accepted_versions {
 	type = "SSL_VERSION_TLS1_2"
 }
 	enable_ssl_session_reuse = true
-	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384","TLS_RSA_WITH_AES_128_GCM_SHA256","TLS_RSA_WITH_AES_256_GCM_SHA384","TLS_RSA_WITH_AES_128_CBC_SHA256","TLS_RSA_WITH_AES_256_CBC_SHA256","TLS_RSA_WITH_AES_128_CBC_SHA","TLS_RSA_WITH_AES_256_CBC_SHA","TLS_RSA_WITH_3DES_EDE_CBC_SHA","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
+	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
 	send_close_notify = true
 	ssl_rating {
-		performance_rating = "SSL_SCORE_EXCELLENT"
-		security_score = "100.0"
-		compatibility_rating = "SSL_SCORE_EXCELLENT"
+		performance_rating = "SSL_SCORE_NOT_SECURE"
+		security_score = "100"
+		compatibility_rating = "SSL_SCORE_GOOD"
 	}
 	dhparam = <<EOF
 -----BEGIN DH PARAMETERS-----
@@ -155,7 +155,7 @@ resource "avi_sslprofile" "testSSLProfile" {
 	name = "test-System-Standard-updated"
 	tenant_ref = data.avi_tenant.default_tenant.id
 	ssl_session_timeout = "86400"
-	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA"
+	accepted_ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384"
 	prefer_client_cipher_ordering = false
 	accepted_versions {
 	type = "SSL_VERSION_TLS1"
@@ -167,12 +167,12 @@ accepted_versions {
 	type = "SSL_VERSION_TLS1_2"
 }
 	enable_ssl_session_reuse = true
-	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384","TLS_RSA_WITH_AES_128_GCM_SHA256","TLS_RSA_WITH_AES_256_GCM_SHA384","TLS_RSA_WITH_AES_128_CBC_SHA256","TLS_RSA_WITH_AES_256_CBC_SHA256","TLS_RSA_WITH_AES_128_CBC_SHA","TLS_RSA_WITH_AES_256_CBC_SHA","TLS_RSA_WITH_3DES_EDE_CBC_SHA","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
+	cipher_enums = ["TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256","TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384","TLS_AES_256_GCM_SHA384","TLS_CHACHA20_POLY1305_SHA256","TLS_AES_128_GCM_SHA256"]
 	send_close_notify = true
 	ssl_rating {
-		performance_rating = "SSL_SCORE_EXCELLENT"
-		security_score = "100.0"
-		compatibility_rating = "SSL_SCORE_EXCELLENT"
+		performance_rating = "SSL_SCORE_NOT_SECURE"
+		security_score = "100"
+		compatibility_rating = "SSL_SCORE_GOOD"
 	}
 	dhparam = <<EOF
 -----BEGIN DH PARAMETERS-----
diff --git a/avi/resource_avi_user.go b/avi/resource_avi_user.go
index 1221dbfee..fa4b4af5a 100644
--- a/avi/resource_avi_user.go
+++ b/avi/resource_avi_user.go
@@ -85,9 +85,11 @@ func ResourceUserSchema() map[string]*schema.Schema {
 			Required: true,
 		},
 		"password": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
+			Type:             schema.TypeString,
+			Optional:         true,
+			Computed:         true,
+			Sensitive:        true,
+			DiffSuppressFunc: suppressSensitiveFieldDiffs,
 		},
 		"passwordless": {
 			Type:         schema.TypeString,
diff --git a/go.mod b/go.mod
index d1f8c4c63..340189ed2 100644
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,5 @@ go 1.16
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0
-	github.com/vmware/alb-sdk v0.0.0-20230601102535-68aa349a3eef
+	github.com/vmware/alb-sdk v0.0.0-20230626110158-e51a96d82ba2
 )
diff --git a/go.sum b/go.sum
index 85a1e8660..4fecdd67a 100644
--- a/go.sum
+++ b/go.sum
@@ -217,74 +217,8 @@ github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvC
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmware/alb-sdk v0.0.0-20220825070319-4317a4659448 h1:sPIOecsycYNr1dC7QLzSKVKJVdWb9oq+XBZjxgmlEBg=
-github.com/vmware/alb-sdk v0.0.0-20220825070319-4317a4659448/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220912150335-00e4e803dab6 h1:4zzcrbtySYrVeguyjzwpZK6XHPkUj456u8zP7DTs99k=
-github.com/vmware/alb-sdk v0.0.0-20220912150335-00e4e803dab6/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220913060112-8aaab267dc83 h1:fPe2Q3Ug/aw1JXO7O3WAVHAsunjumxRDbnqFMPaomDw=
-github.com/vmware/alb-sdk v0.0.0-20220913060112-8aaab267dc83/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220914143059-50557f13f424 h1:nMZ5RUdpEz1Vv3HjEu8FgYHMBxdkPxwCrFrxmmb6Ms4=
-github.com/vmware/alb-sdk v0.0.0-20220914143059-50557f13f424/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220915085321-2949bfb139d6 h1:3WnOH3PGL69B3HtcjQLmfiuN9GhdiUeIq9ny4z5Jbzk=
-github.com/vmware/alb-sdk v0.0.0-20220915085321-2949bfb139d6/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220916085425-f7ffe7be1f60 h1:AzKqHS71Vkl6T0d7unhaDsHo8oHwziqLkx5dubrmbzs=
-github.com/vmware/alb-sdk v0.0.0-20220916085425-f7ffe7be1f60/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220920085319-7d826dcea82e h1:9JN8P44ksp8KnIaGBRCOfmpFEPHrk11/Qm/E2TYDAJ4=
-github.com/vmware/alb-sdk v0.0.0-20220920085319-7d826dcea82e/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220922085317-178a8b16bcbb h1:AK23JTfT+7NuusiRmjst9Ak2FncfDoxiMwUEDgeOIBc=
-github.com/vmware/alb-sdk v0.0.0-20220922085317-178a8b16bcbb/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220923061343-1f350d151c25 h1:FcGCRgFdsYTQMK4O3R0oM07a8dZsxaCRxytWOTcU3OA=
-github.com/vmware/alb-sdk v0.0.0-20220923061343-1f350d151c25/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220926105415-d684c4d3510c h1:trHkIj4AAMCK1BHLyTJOii9tGcPcX5rPqW8Nru0cUF8=
-github.com/vmware/alb-sdk v0.0.0-20220926105415-d684c4d3510c/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220927123714-8136b9a2d50c h1:2dwpmsyXD4fdHiHHNX+RDI8v6tm55vNtuI0vDNSIAQA=
-github.com/vmware/alb-sdk v0.0.0-20220927123714-8136b9a2d50c/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220928085338-8642a4627be8 h1:CIzcl8A006SlrmmEWdnbi/amnmZ7LasO2bapurkw2WU=
-github.com/vmware/alb-sdk v0.0.0-20220928085338-8642a4627be8/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220929104455-6ff594a49cbf h1:LZDiCCUA6QtE0cP2qxwIdDJu2RmQ40WkEGcTHJWYvuE=
-github.com/vmware/alb-sdk v0.0.0-20220929104455-6ff594a49cbf/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20220930164001-f9e349ce1976 h1:oMSfSPD4uLkH15kyYdgzMJt2yeAo+JOeQBgNLAmNLKY=
-github.com/vmware/alb-sdk v0.0.0-20220930164001-f9e349ce1976/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221004095432-6dcdcea889af h1:v1dvfbaw/9M9mjA1ONOGKVwruXj2jl4BX5RjIWpi5aY=
-github.com/vmware/alb-sdk v0.0.0-20221004095432-6dcdcea889af/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221005093740-00b080864f66 h1:syk0LYtqGPmWbGxbzGhnAJvkgO+zBFj3g6Oe0hWVDag=
-github.com/vmware/alb-sdk v0.0.0-20221005093740-00b080864f66/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221011060041-a043c5464c20 h1:cKAcGMX6v7gDMeIFmfAG5NAyoXYazobcJuCWobwiQLI=
-github.com/vmware/alb-sdk v0.0.0-20221011060041-a043c5464c20/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221012085307-1c71bbf163f1 h1:5tEjOZfiD8eOsepzjx3z6+Q/MPy+I01SFiAkAvuKMzM=
-github.com/vmware/alb-sdk v0.0.0-20221012085307-1c71bbf163f1/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221013085316-77e9699c1093 h1:9ajExILWsvTULw1MZ91sZ8COYKXTRnW4mRlw/tbO/0w=
-github.com/vmware/alb-sdk v0.0.0-20221013085316-77e9699c1093/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221013091522-7af808929746 h1:yVi66MGtrkQ7l2hG+k5U6xdPxoSQoLf2xRcB8+dfxDE=
-github.com/vmware/alb-sdk v0.0.0-20221013091522-7af808929746/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221020085255-b5553f444f2e h1:3Bbz8ZMrqHAySPDx3Z/hXidK5TlYC/Kxl+3vmm9FBbg=
-github.com/vmware/alb-sdk v0.0.0-20221020085255-b5553f444f2e/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221020093031-b82a051b7fb5 h1:MBdmdJE8SkjyU7R6MAPLxgAuDM48R2YSkosSmXdSE70=
-github.com/vmware/alb-sdk v0.0.0-20221020093031-b82a051b7fb5/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221024085245-3e1537424370 h1:SWTHW+4lHtEnYPmkz5qYVr6FuIk0jLg91m7Lup3W7Rg=
-github.com/vmware/alb-sdk v0.0.0-20221024085245-3e1537424370/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221024093108-5de8753eefbf h1:xHLFf4Iz/JXLao7CMWTFyO0tLlN3LK0lOpTmjwE7gso=
-github.com/vmware/alb-sdk v0.0.0-20221024093108-5de8753eefbf/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221025085250-0ef670d4c93c h1:AVgNP/l6kq/NRL5BJ/8E/i60jabK+LqtPfyf4tYtPKE=
-github.com/vmware/alb-sdk v0.0.0-20221025085250-0ef670d4c93c/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221027085254-48b3598dfdec h1:LerVwq2DXjGjm3EAypuv6alpGCNe0txUiPHhOaiMx2k=
-github.com/vmware/alb-sdk v0.0.0-20221027085254-48b3598dfdec/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221028085310-7b71389027fd h1:c6DMOyXKJ5uLokjtJFdoaJtOisRqsEvkM0P/bNvGPZE=
-github.com/vmware/alb-sdk v0.0.0-20221028085310-7b71389027fd/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221031061625-020013f459a7 h1:QRY3Rt0nXTlVIIw3f+gPcl6NhqUBcvmc8HarQGInB3w=
-github.com/vmware/alb-sdk v0.0.0-20221031061625-020013f459a7/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221031133358-31c5de6915b3 h1:LAlLTls8gYiz4ScC17RpZESI1x8UFTryJt9JSqBv/nE=
-github.com/vmware/alb-sdk v0.0.0-20221031133358-31c5de6915b3/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221107090301-0718ea1348be h1:F2oHjf5ao7Tn2jP3nLLOW5On5/mCIaZ6aTuKuK9PcTQ=
-github.com/vmware/alb-sdk v0.0.0-20221107090301-0718ea1348be/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221108085407-c8bab06b3eb9 h1:ILxJgTsG5ZZcqZEiNMei20BfmI0/d3ImGLlq72QIrk0=
-github.com/vmware/alb-sdk v0.0.0-20221108085407-c8bab06b3eb9/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20221108134051-c92818069ea9 h1:X47QfT0DG8t5F6pLnxb0v/V1r61PFfMSGPIaNx2vGhc=
-github.com/vmware/alb-sdk v0.0.0-20221108134051-c92818069ea9/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20230202142453-a9968b9cd48d h1:LlBim4BTkfFKitukIVEbTps6QXe93ezu0yThbEgcA60=
-github.com/vmware/alb-sdk v0.0.0-20230202142453-a9968b9cd48d/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
-github.com/vmware/alb-sdk v0.0.0-20230601102535-68aa349a3eef h1:GoazCsT4E/qMr9RDGplhniiAl+2gVwk8wpWfwfUOjq4=
-github.com/vmware/alb-sdk v0.0.0-20230601102535-68aa349a3eef/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
+github.com/vmware/alb-sdk v0.0.0-20230626110158-e51a96d82ba2 h1:jiUOz1jc/bFu0jECWjcR5N09WpQV56z5uqzBIrapbTk=
+github.com/vmware/alb-sdk v0.0.0-20230626110158-e51a96d82ba2/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_backupconfiguration.html.markdown b/website/docs/d/avi_backupconfiguration.html.markdown
index ce8377186..a016a2f10 100644
--- a/website/docs/d/avi_backupconfiguration.html.markdown
+++ b/website/docs/d/avi_backupconfiguration.html.markdown
@@ -44,6 +44,7 @@ In addition to all arguments above, the following attributes are exported:
 * `remote_directory` - Directory at remote destination with write permission for ssh user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `remote_file_transfer_protocol` - Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed in enterprise edition with any value, basic edition(allowed values- scp,sftp), enterprise with cloud services edition.
 * `remote_hostname` - Remote destination. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `s3_bucket_folder` - The folder name in s3 bucket where backup will be stored. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
 * `save_local` - Local backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `ssh_user_ref` - Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_gslb.html.markdown b/website/docs/d/avi_gslb.html.markdown
index b274d99e0..ec6647639 100644
--- a/website/docs/d/avi_gslb.html.markdown
+++ b/website/docs/d/avi_gslb.html.markdown
@@ -49,7 +49,7 @@ In addition to all arguments above, the following attributes are exported:
 * `send_interval_prior_to_maintenance_mode` - The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
 * `sites` - Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_scoped` - This field indicates tenant visibility for gs pool member selection across the gslb federated objects. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `tenant_scoped` - This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
 * `third_party_sites` - Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `uuid` - Uuid of the gslb object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `view_id` - The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_backupconfiguration.html.markdown b/website/docs/r/avi_backupconfiguration.html.markdown
index 39fae5f87..868e12c38 100644
--- a/website/docs/r/avi_backupconfiguration.html.markdown
+++ b/website/docs/r/avi_backupconfiguration.html.markdown
@@ -39,6 +39,7 @@ The following arguments are supported:
 * `remote_directory` - (Optional) Directory at remote destination with write permission for ssh user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `remote_file_transfer_protocol` - (Optional) Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed in enterprise edition with any value, basic edition(allowed values- scp,sftp), enterprise with cloud services edition.
 * `remote_hostname` - (Optional) Remote destination. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `s3_bucket_folder` - (Optional) The folder name in s3 bucket where backup will be stored. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
 * `save_local` - (Optional) Local backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `ssh_user_ref` - (Optional) Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_gslb.html.markdown b/website/docs/r/avi_gslb.html.markdown
index 3d6eae44d..ccc6507b3 100644
--- a/website/docs/r/avi_gslb.html.markdown
+++ b/website/docs/r/avi_gslb.html.markdown
@@ -44,7 +44,7 @@ The following arguments are supported:
 * `send_interval` - (Optional) Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `send_interval_prior_to_maintenance_mode` - (Optional) The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. 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) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_scoped` - (Optional) This field indicates tenant visibility for gs pool member selection across the gslb federated objects. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `tenant_scoped` - (Optional) This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
 * `third_party_sites` - (Optional) Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
 * `view_id` - (Optional) The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.