Updated avi terraform provider for 20.1.5 (#98)

* Updated avi terraform provider for 20.1.5 Signed-off-by: Mayank Sharma <[email protected]> * Added kb link in README Signed-off-by: Mayank Sharma <[email protected]> * Updated kb link in README Signed-off-by: Mayank Sharma <[email protected]> Co-authored-by: Mayank Sharma <[email protected]>
vmware · Apr 16, 2021 · ba8779b · ba8779b
1 parent bda5e23
commit ba8779b
Show file tree

Hide file tree

Showing 305 changed files with 2,100 additions and 1,478 deletions.
diff --git 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)/20.1.4/$(GOOS)_$(GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/20.1.5/$(GOOS)_$(GOARCH)
 build13: fmtcheck
 	@echo "==> Installing plugin to $(DESTINATION)"
 	@mkdir -p $(DESTINATION)
-	go build -o $(DESTINATION)/terraform-provider-avi_v20.1.4
+	go build -o $(DESTINATION)/terraform-provider-avi_v20.1.5
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1

diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ Terraform Provider
 
 <img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-text.svg" width="600px">
 
+Integrating Terraform with Avi Vantage
+--------------------------------------
+Please refer [this](https://avinetworks.com/docs/20.1/integrating-terraform-with-avi-vantage) article.
+
 Developing the Provider or Use Locally Built Provider
 ----------------------------------------------------
 If you wish to work on the provider or want to use the locally built provider,
@@ -165,4 +169,4 @@ Running the tests for a provider requires version 0.12.26 or higher of the Terra
 
 ```sh
 $ make testacc
-```
+```
diff --git a/avi/datasource_avi_analyticsprofile.go b/avi/datasource_avi_analyticsprofile.go
@@ -311,10 +311,10 @@ func dataSourceAviAnalyticsProfile() *schema.Resource {
 				Type:     schema.TypeFloat,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_applicationpersistenceprofile.go b/avi/datasource_avi_applicationpersistenceprofile.go
@@ -39,10 +39,10 @@ func dataSourceAviApplicationPersistenceProfile() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_applicationprofile.go b/avi/datasource_avi_applicationprofile.go
@@ -38,6 +38,11 @@ func dataSourceAviApplicationProfile() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceHTTPApplicationProfileSchema(),
 			},
+			"markers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/avi/datasource_avi_autoscalelaunchconfig.go b/avi/datasource_avi_autoscalelaunchconfig.go
@@ -19,10 +19,10 @@ func dataSourceAviAutoScaleLaunchConfig() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"mesos": {
 				Type:     schema.TypeSet,

diff --git a/avi/datasource_avi_cloud.go b/avi/datasource_avi_cloud.go
@@ -56,6 +56,11 @@ func dataSourceAviCloud() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"dns_resolvers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceDnsResolverSchema(),
+			},
 			"docker_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -173,6 +178,10 @@ func dataSourceAviCloud() *schema.Resource {
 				Computed: true,
 				Elem:     ResourcevCenterConfigurationSchema(),
 			},
+			"vmc_deployment": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"vtype": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go
@@ -95,6 +95,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"del_offline_se_after_reboot_delay": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"dns_refresh_period": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -183,6 +187,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"resmgr_log_caching_period": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"safenet_hsm_version": {
 				Type:     schema.TypeString,
 				Computed: true,

diff --git a/avi/datasource_avi_dnspolicy.go b/avi/datasource_avi_dnspolicy.go
@@ -20,10 +20,10 @@ func dataSourceAviDnsPolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_errorpagebody.go b/avi/datasource_avi_errorpagebody.go
@@ -19,10 +19,10 @@ func dataSourceAviErrorPageBody() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_errorpageprofile.go b/avi/datasource_avi_errorpageprofile.go
@@ -16,10 +16,10 @@ func dataSourceAviErrorPageProfile() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceErrorPageSchema(),
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go
@@ -33,6 +33,10 @@ func dataSourceAviGslb() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceDNSConfigSchema(),
 			},
+			"enable_config_by_members": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"error_resync_interval": {
 				Type:     schema.TypeInt,
 				Computed: true,

diff --git a/avi/datasource_avi_gslbgeodbprofile.go b/avi/datasource_avi_gslbgeodbprofile.go
@@ -24,10 +24,10 @@ func dataSourceAviGslbGeoDbProfile() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_gslbservice.go b/avi/datasource_avi_gslbservice.go
@@ -63,10 +63,10 @@ func dataSourceAviGslbService() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"min_members": {
 				Type:     schema.TypeInt,

diff --git a/avi/datasource_avi_hardwaresecuritymodulegroup.go b/avi/datasource_avi_hardwaresecuritymodulegroup.go
@@ -16,10 +16,10 @@ func dataSourceAviHardwareSecurityModuleGroup() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceHardwareSecurityModuleSchema(),
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_healthmonitor.go b/avi/datasource_avi_healthmonitor.go
@@ -52,10 +52,25 @@ func dataSourceAviHealthMonitor() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceHealthMonitorHttpSchema(),
 			},
+			"imap_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorImapSchema(),
+			},
+			"imaps_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorImapSchema(),
+			},
 			"is_federated": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"markers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
+			},
 			"monitor_port": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -65,6 +80,16 @@ func dataSourceAviHealthMonitor() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"pop3_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorPop3Schema(),
+			},
+			"pop3s_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorPop3Schema(),
+			},
 			"radius_monitor": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -83,6 +108,16 @@ func dataSourceAviHealthMonitor() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceHealthMonitorSIPSchema(),
 			},
+			"smtp_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorSmtpSchema(),
+			},
+			"smtps_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorSmtpSchema(),
+			},
 			"successful_checks": {
 				Type:     schema.TypeInt,
 				Computed: true,

diff --git a/avi/datasource_avi_httppolicyset.go b/avi/datasource_avi_httppolicyset.go
@@ -46,10 +46,10 @@ func dataSourceAviHTTPPolicySet() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_ipaddrgroup.go b/avi/datasource_avi_ipaddrgroup.go
@@ -35,11 +35,6 @@ func dataSourceAviIpAddrGroup() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceIpAddrPortSchema(),
 			},
-			"labels": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
-			},
 			"marathon_app_name": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -48,6 +43,11 @@ func dataSourceAviIpAddrGroup() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"markers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/avi/datasource_avi_ipamdnsproviderprofile.go b/avi/datasource_avi_ipamdnsproviderprofile.go
@@ -46,10 +46,10 @@ func dataSourceAviIpamDnsProviderProfile() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceIpamDnsInternalProfileSchema(),
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_ipreputationdb.go b/avi/datasource_avi_ipreputationdb.go
@@ -25,10 +25,10 @@ func dataSourceAviIPReputationDB() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/avi/datasource_avi_jwtprofile.go b/avi/datasource_avi_jwtprofile.go
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2017. Avi Networks.
+* Author: Gaurav Rastogi ([email protected])
+*
+ */
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviJWTProfile() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviJWTProfileRead,
+		Schema: map[string]*schema.Schema{
+			"is_federated": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"jwks_keys": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceJWSKeySchema(),
+			},
+			"jwt_auth_type": {
+				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/datasource_avi_l4policyset.go b/avi/datasource_avi_l4policyset.go
@@ -28,10 +28,10 @@ func dataSourceAviL4PolicySet() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceL4ConnectionPolicySchema(),
 			},
-			"labels": {
+			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     ResourceKeyValueSchema(),
+				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,