Cherry-Picked 30.2.1 fixes (#595)

Signed-off-by: Rohan Suryawanshi <[email protected]>

avi/data_source_avi_applicationprofile_test.go

@@ -115,6 +115,9 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 
 data "avi_applicationprofile" "testApplicationProfile" {

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"

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"

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"

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"

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,

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,

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,

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,

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,

avi/resource_avi_actiongroupconfig.go

@@ -102,7 +102,7 @@ func ResourceAviActionGroupConfigRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviActionGroupConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceActionGroupConfigSchema()
-	err := APICreateOrUpdate(d, meta, "actiongroupconfig", s)
+	err := APICreate(d, meta, "actiongroupconfig", s)
 	if err == nil {
 		err = ResourceAviActionGroupConfigRead(d, meta)
 	}
@@ -112,7 +112,7 @@ func resourceAviActionGroupConfigCreate(d *schema.ResourceData, meta interface{}
 func resourceAviActionGroupConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceActionGroupConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "actiongroupconfig", s)
+	err = APIUpdate(d, meta, "actiongroupconfig", s)
 	if err == nil {
 		err = ResourceAviActionGroupConfigRead(d, meta)
 	}

avi/resource_avi_albservicesconfig.go

@@ -154,7 +154,7 @@ func ResourceAviALBServicesConfigRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviALBServicesConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesConfigSchema()
-	err := APICreateOrUpdate(d, meta, "albservicesconfig", s)
+	err := APICreate(d, meta, "albservicesconfig", s)
 	if err == nil {
 		err = ResourceAviALBServicesConfigRead(d, meta)
 	}
@@ -164,7 +164,7 @@ func resourceAviALBServicesConfigCreate(d *schema.ResourceData, meta interface{}
 func resourceAviALBServicesConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "albservicesconfig", s)
+	err = APIUpdate(d, meta, "albservicesconfig", s)
 	if err == nil {
 		err = ResourceAviALBServicesConfigRead(d, meta)
 	}

avi/resource_avi_albservicesfiledownload.go

@@ -90,7 +90,7 @@ func ResourceAviALBServicesFileDownloadRead(d *schema.ResourceData, meta interfa
 
 func resourceAviALBServicesFileDownloadCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesFileDownloadSchema()
-	err := APICreateOrUpdate(d, meta, "albservicesfiledownload", s)
+	err := APICreate(d, meta, "albservicesfiledownload", s)
 	if err == nil {
 		err = ResourceAviALBServicesFileDownloadRead(d, meta)
 	}
@@ -100,7 +100,7 @@ func resourceAviALBServicesFileDownloadCreate(d *schema.ResourceData, meta inter
 func resourceAviALBServicesFileDownloadUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesFileDownloadSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "albservicesfiledownload", s)
+	err = APIUpdate(d, meta, "albservicesfiledownload", s)
 	if err == nil {
 		err = ResourceAviALBServicesFileDownloadRead(d, meta)
 	}

avi/resource_avi_albservicesfileupload.go

@@ -80,7 +80,7 @@ func ResourceAviALBServicesFileUploadRead(d *schema.ResourceData, meta interface
 
 func resourceAviALBServicesFileUploadCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesFileUploadSchema()
-	err := APICreateOrUpdate(d, meta, "albservicesfileupload", s)
+	err := APICreate(d, meta, "albservicesfileupload", s)
 	if err == nil {
 		err = ResourceAviALBServicesFileUploadRead(d, meta)
 	}
@@ -90,7 +90,7 @@ func resourceAviALBServicesFileUploadCreate(d *schema.ResourceData, meta interfa
 func resourceAviALBServicesFileUploadUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesFileUploadSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "albservicesfileupload", s)
+	err = APIUpdate(d, meta, "albservicesfileupload", s)
 	if err == nil {
 		err = ResourceAviALBServicesFileUploadRead(d, meta)
 	}

avi/resource_avi_albservicesjob.go

@@ -115,7 +115,7 @@ func ResourceAviALBServicesJobRead(d *schema.ResourceData, meta interface{}) err
 
 func resourceAviALBServicesJobCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesJobSchema()
-	err := APICreateOrUpdate(d, meta, "albservicesjob", s)
+	err := APICreate(d, meta, "albservicesjob", s)
 	if err == nil {
 		err = ResourceAviALBServicesJobRead(d, meta)
 	}
@@ -125,7 +125,7 @@ func resourceAviALBServicesJobCreate(d *schema.ResourceData, meta interface{}) e
 func resourceAviALBServicesJobUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceALBServicesJobSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "albservicesjob", s)
+	err = APIUpdate(d, meta, "albservicesjob", s)
 	if err == nil {
 		err = ResourceAviALBServicesJobRead(d, meta)
 	}

avi/resource_avi_alertconfig.go

@@ -141,7 +141,7 @@ func ResourceAviAlertConfigRead(d *schema.ResourceData, meta interface{}) error
 
 func resourceAviAlertConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertConfigSchema()
-	err := APICreateOrUpdate(d, meta, "alertconfig", s)
+	err := APICreate(d, meta, "alertconfig", s)
 	if err == nil {
 		err = ResourceAviAlertConfigRead(d, meta)
 	}
@@ -151,7 +151,7 @@ func resourceAviAlertConfigCreate(d *schema.ResourceData, meta interface{}) erro
 func resourceAviAlertConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "alertconfig", s)
+	err = APIUpdate(d, meta, "alertconfig", s)
 	if err == nil {
 		err = ResourceAviAlertConfigRead(d, meta)
 	}

avi/resource_avi_alertemailconfig.go

@@ -76,7 +76,7 @@ func ResourceAviAlertEmailConfigRead(d *schema.ResourceData, meta interface{}) e
 
 func resourceAviAlertEmailConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertEmailConfigSchema()
-	err := APICreateOrUpdate(d, meta, "alertemailconfig", s)
+	err := APICreate(d, meta, "alertemailconfig", s)
 	if err == nil {
 		err = ResourceAviAlertEmailConfigRead(d, meta)
 	}
@@ -86,7 +86,7 @@ func resourceAviAlertEmailConfigCreate(d *schema.ResourceData, meta interface{})
 func resourceAviAlertEmailConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertEmailConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "alertemailconfig", s)
+	err = APIUpdate(d, meta, "alertemailconfig", s)
 	if err == nil {
 		err = ResourceAviAlertEmailConfigRead(d, meta)
 	}

avi/resource_avi_alertscriptconfig.go

@@ -73,7 +73,7 @@ func ResourceAviAlertScriptConfigRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviAlertScriptConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertScriptConfigSchema()
-	err := APICreateOrUpdate(d, meta, "alertscriptconfig", s)
+	err := APICreate(d, meta, "alertscriptconfig", s)
 	if err == nil {
 		err = ResourceAviAlertScriptConfigRead(d, meta)
 	}
@@ -83,7 +83,7 @@ func resourceAviAlertScriptConfigCreate(d *schema.ResourceData, meta interface{}
 func resourceAviAlertScriptConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertScriptConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "alertscriptconfig", s)
+	err = APIUpdate(d, meta, "alertscriptconfig", s)
 	if err == nil {
 		err = ResourceAviAlertScriptConfigRead(d, meta)
 	}

avi/resource_avi_alertsyslogconfig.go

@@ -77,7 +77,7 @@ func ResourceAviAlertSyslogConfigRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviAlertSyslogConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertSyslogConfigSchema()
-	err := APICreateOrUpdate(d, meta, "alertsyslogconfig", s)
+	err := APICreate(d, meta, "alertsyslogconfig", s)
 	if err == nil {
 		err = ResourceAviAlertSyslogConfigRead(d, meta)
 	}
@@ -87,7 +87,7 @@ func resourceAviAlertSyslogConfigCreate(d *schema.ResourceData, meta interface{}
 func resourceAviAlertSyslogConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAlertSyslogConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "alertsyslogconfig", s)
+	err = APIUpdate(d, meta, "alertsyslogconfig", s)
 	if err == nil {
 		err = ResourceAviAlertSyslogConfigRead(d, meta)
 	}

avi/resource_avi_analyticsprofile.go

@@ -554,7 +554,7 @@ func ResourceAviAnalyticsProfileRead(d *schema.ResourceData, meta interface{}) e
 
 func resourceAviAnalyticsProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAnalyticsProfileSchema()
-	err := APICreateOrUpdate(d, meta, "analyticsprofile", s)
+	err := APICreate(d, meta, "analyticsprofile", s)
 	if err == nil {
 		err = ResourceAviAnalyticsProfileRead(d, meta)
 	}
@@ -564,7 +564,7 @@ func resourceAviAnalyticsProfileCreate(d *schema.ResourceData, meta interface{})
 func resourceAviAnalyticsProfileUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAnalyticsProfileSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "analyticsprofile", s)
+	err = APIUpdate(d, meta, "analyticsprofile", s)
 	if err == nil {
 		err = ResourceAviAnalyticsProfileRead(d, meta)
 	}

avi/resource_avi_applicationpersistenceprofile.go

@@ -111,7 +111,7 @@ func ResourceAviApplicationPersistenceProfileRead(d *schema.ResourceData, meta i
 
 func resourceAviApplicationPersistenceProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceApplicationPersistenceProfileSchema()
-	err := APICreateOrUpdate(d, meta, "applicationpersistenceprofile", s)
+	err := APICreate(d, meta, "applicationpersistenceprofile", s)
 	if err == nil {
 		err = ResourceAviApplicationPersistenceProfileRead(d, meta)
 	}
@@ -121,7 +121,7 @@ func resourceAviApplicationPersistenceProfileCreate(d *schema.ResourceData, meta
 func resourceAviApplicationPersistenceProfileUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceApplicationPersistenceProfileSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "applicationpersistenceprofile", s)
+	err = APIUpdate(d, meta, "applicationpersistenceprofile", s)
 	if err == nil {
 		err = ResourceAviApplicationPersistenceProfileRead(d, meta)
 	}

avi/resource_avi_applicationprofile.go

@@ -145,7 +145,7 @@ func ResourceAviApplicationProfileRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviApplicationProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceApplicationProfileSchema()
-	err := APICreateOrUpdate(d, meta, "applicationprofile", s)
+	err := APICreate(d, meta, "applicationprofile", s)
 	if err == nil {
 		err = ResourceAviApplicationProfileRead(d, meta)
 	}
@@ -155,7 +155,7 @@ func resourceAviApplicationProfileCreate(d *schema.ResourceData, meta interface{
 func resourceAviApplicationProfileUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceApplicationProfileSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "applicationprofile", s)
+	err = APIUpdate(d, meta, "applicationprofile", s)
 	if err == nil {
 		err = ResourceAviApplicationProfileRead(d, meta)
 	}

avi/resource_avi_applicationprofile_test.go

@@ -183,6 +183,9 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 `
 
@@ -271,5 +274,8 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 `

avi/resource_avi_authmappingprofile.go

@@ -76,7 +76,7 @@ func ResourceAviAuthMappingProfileRead(d *schema.ResourceData, meta interface{})
 
 func resourceAviAuthMappingProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAuthMappingProfileSchema()
-	err := APICreateOrUpdate(d, meta, "authmappingprofile", s)
+	err := APICreate(d, meta, "authmappingprofile", s)
 	if err == nil {
 		err = ResourceAviAuthMappingProfileRead(d, meta)
 	}
@@ -86,7 +86,7 @@ func resourceAviAuthMappingProfileCreate(d *schema.ResourceData, meta interface{
 func resourceAviAuthMappingProfileUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAuthMappingProfileSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "authmappingprofile", s)
+	err = APIUpdate(d, meta, "authmappingprofile", s)
 	if err == nil {
 		err = ResourceAviAuthMappingProfileRead(d, meta)
 	}

avi/resource_avi_authprofile.go

@@ -111,7 +111,7 @@ func ResourceAviAuthProfileRead(d *schema.ResourceData, meta interface{}) error
 
 func resourceAviAuthProfileCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAuthProfileSchema()
-	err := APICreateOrUpdate(d, meta, "authprofile", s)
+	err := APICreate(d, meta, "authprofile", s)
 	if err == nil {
 		err = ResourceAviAuthProfileRead(d, meta)
 	}
@@ -121,7 +121,7 @@ func resourceAviAuthProfileCreate(d *schema.ResourceData, meta interface{}) erro
 func resourceAviAuthProfileUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAuthProfileSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "authprofile", s)
+	err = APIUpdate(d, meta, "authprofile", s)
 	if err == nil {
 		err = ResourceAviAuthProfileRead(d, meta)
 	}

avi/resource_avi_autoscalelaunchconfig.go

@@ -95,7 +95,7 @@ func ResourceAviAutoScaleLaunchConfigRead(d *schema.ResourceData, meta interface
 
 func resourceAviAutoScaleLaunchConfigCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAutoScaleLaunchConfigSchema()
-	err := APICreateOrUpdate(d, meta, "autoscalelaunchconfig", s)
+	err := APICreate(d, meta, "autoscalelaunchconfig", s)
 	if err == nil {
 		err = ResourceAviAutoScaleLaunchConfigRead(d, meta)
 	}
@@ -105,7 +105,7 @@ func resourceAviAutoScaleLaunchConfigCreate(d *schema.ResourceData, meta interfa
 func resourceAviAutoScaleLaunchConfigUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAutoScaleLaunchConfigSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "autoscalelaunchconfig", s)
+	err = APIUpdate(d, meta, "autoscalelaunchconfig", s)
 	if err == nil {
 		err = ResourceAviAutoScaleLaunchConfigRead(d, meta)
 	}

avi/resource_avi_availabilityzone.go

@@ -72,7 +72,7 @@ func ResourceAviAvailabilityZoneRead(d *schema.ResourceData, meta interface{}) e
 
 func resourceAviAvailabilityZoneCreate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAvailabilityZoneSchema()
-	err := APICreateOrUpdate(d, meta, "availabilityzone", s)
+	err := APICreate(d, meta, "availabilityzone", s)
 	if err == nil {
 		err = ResourceAviAvailabilityZoneRead(d, meta)
 	}
@@ -82,7 +82,7 @@ func resourceAviAvailabilityZoneCreate(d *schema.ResourceData, meta interface{})
 func resourceAviAvailabilityZoneUpdate(d *schema.ResourceData, meta interface{}) error {
 	s := ResourceAvailabilityZoneSchema()
 	var err error
-	err = APICreateOrUpdate(d, meta, "availabilityzone", s)
+	err = APIUpdate(d, meta, "availabilityzone", s)
 	if err == nil {
 		err = ResourceAviAvailabilityZoneRead(d, meta)
 	}