Merge pull request #576 from vmware/jenkins_sync_22.1.6_tf

Auto updated assets for terraform 22.1.6
vmware · Feb 29, 2024 · 7293e7a · 7293e7a
2 parents fb6f827 + 5043981
commit 7293e7a
Show file tree

Hide file tree

Showing 145 changed files with 1,253 additions and 552 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -14,7 +14,7 @@ linters:
   enable:
     - errcheck
     - gofmt
-    - goimports
+    # - goimports
     - gosimple
     - govet
     - ineffassign

diff --git a/GNUmakefile b/GNUmakefile
@@ -13,7 +13,7 @@ build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/22.1
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-avi_v22.1.5
+	go build -o $(DESTINATION)/terraform-provider-avi_v22.1.6
 
 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
@@ -104,8 +104,13 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		allow_dots_in_header_name = false
 		max_bad_rps_uri = "0"
 		use_app_keepalive_timeout = false
+		http2_profile {
+		}
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 
 data "avi_applicationprofile" "testApplicationProfile" {

diff --git a/avi/data_source_avi_user_test.go b/avi/data_source_avi_user_test.go
@@ -42,7 +42,7 @@ data "avi_useraccountprofile" "default-user-account-profile" {
 }
 resource "avi_user" "testUser" {
 	access {
-	role_ref = data.avi_role.default-system-admin-role.id
+	role_ref = "${data.avi_tenant.default_tenant.id}/role/${element(split("/", data.avi_role.default-system-admin-role.id),5)}"
 	tenant_ref = data.avi_tenant.default_tenant.id
 	all_tenants = false
 }

diff --git a/avi/datasource_avi_albservicesjob.go b/avi/datasource_avi_albservicesjob.go
@@ -54,6 +54,11 @@ func dataSourceAviALBServicesJob() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"status_update_time": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTimeStampSchema(),
+			},
 			"tenant_ref": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/avi/datasource_avi_alertscriptconfig.go b/avi/datasource_avi_alertscriptconfig.go
@@ -28,6 +28,10 @@ func dataSourceAviAlertScriptConfig() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"timeout": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go
@@ -69,10 +69,18 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"cloud_discovery_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cloud_reconcile": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"cloud_reconcile_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cluster_ip_gratuitous_arp_period": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -316,6 +324,14 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeInt},
 			},
+			"system_report_cleanup_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"system_report_limit": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"unresponsive_se_reboot": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
@@ -708,6 +708,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"se_debug_trace_sz": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"se_delayed_flow_delete": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go
@@ -97,6 +97,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceProxyConfigurationSchema(),
 			},
+			"sddcmanager_fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"secure_channel_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,

diff --git a/avi/datasource_avi_systemreport.go b/avi/datasource_avi_systemreport.go
@@ -0,0 +1,69 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviSystemReport() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviSystemReportRead,
+		Schema: map[string]*schema.Schema{
+			"archive_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"controller_patch_image_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"downloadable": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"events": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceReportEventSchema(),
+			},
+			"image_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"readiness_reports": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceReportDetailSchema(),
+			},
+			"se_patch_image_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceReportOpsStateSchema(),
+			},
+			"summary": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceReportSummarySchema(),
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_upgradestatusinfo.go b/avi/datasource_avi_upgradestatusinfo.go
@@ -174,6 +174,11 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"system_report_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"tasks_completed": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/avi/provider.go b/avi/provider.go
@@ -85,6 +85,7 @@ func Provider() *schema.Provider {
 			"avi_upgradestatussummary":            dataSourceAviUpgradeStatusSummary(),
 			"avi_licenseledgerdetails":            dataSourceAviLicenseLedgerDetails(),
 			"avi_ssopolicy":                       dataSourceAviSSOPolicy(),
+			"avi_systemreport":                    dataSourceAviSystemReport(),
 			"avi_authprofile":                     dataSourceAviAuthProfile(),
 			"avi_authmappingprofile":              dataSourceAviAuthMappingProfile(),
 			"avi_controllerproperties":            dataSourceAviControllerProperties(),
@@ -200,6 +201,7 @@ func Provider() *schema.Provider {
 			"avi_upgradestatussummary":            resourceAviUpgradeStatusSummary(),
 			"avi_licenseledgerdetails":            resourceAviLicenseLedgerDetails(),
 			"avi_ssopolicy":                       resourceAviSSOPolicy(),
+			"avi_systemreport":                    resourceAviSystemReport(),
 			"avi_authprofile":                     resourceAviAuthProfile(),
 			"avi_authmappingprofile":              resourceAviAuthMappingProfile(),
 			"avi_controllerproperties":            resourceAviControllerProperties(),

diff --git a/avi/resource_avi_actiongroupconfig.go b/avi/resource_avi_actiongroupconfig.go
@@ -4,9 +4,8 @@
 package avi
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
 )
 
 func ResourceActionGroupConfigSchema() map[string]*schema.Schema {
@@ -103,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)
 	}
@@ -113,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)
 	}

diff --git a/avi/resource_avi_albservicesconfig.go b/avi/resource_avi_albservicesconfig.go
@@ -4,9 +4,8 @@
 package avi
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
 )
 
 func ResourceALBServicesConfigSchema() map[string]*schema.Schema {
@@ -133,7 +132,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)
 	}
@@ -143,7 +142,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)
 	}

diff --git a/avi/resource_avi_albservicesfileupload.go b/avi/resource_avi_albservicesfileupload.go
@@ -4,9 +4,8 @@
 package avi
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
 )
 
 func ResourceALBServicesFileUploadSchema() map[string]*schema.Schema {
@@ -81,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)
 	}
@@ -91,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)
 	}

diff --git a/avi/resource_avi_albservicesjob.go b/avi/resource_avi_albservicesjob.go
@@ -4,9 +4,8 @@
 package avi
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
 )
 
 func ResourceALBServicesJobSchema() map[string]*schema.Schema {
@@ -63,6 +62,12 @@ func ResourceALBServicesJobSchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "PENDING",
 		},
+		"status_update_time": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceTimeStampSchema(),
+		},
 		"tenant_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -110,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)
 	}
@@ -120,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)
 	}

diff --git a/avi/resource_avi_alertconfig.go b/avi/resource_avi_alertconfig.go
@@ -4,9 +4,8 @@
 package avi
 
 import (
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
 )
 
 func ResourceAlertConfigSchema() map[string]*schema.Schema {
@@ -142,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)
 	}
@@ -152,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)
 	}