Merge pull request #102 from avinetworks/AV-112569

AV-112569 Update 18.2.13 for terraform registry and new terraform plugin

Author: yograjshisode

Diff for: .golangci.yml

@@ -1,16 +1,20 @@
 issues:
   max-per-linter: 0
   max-same-issues: 0
+  exclude:
+      - SA1019
 
 run:
   deadline: 5m
+  skip-files:
+      - avi/resource_avi_rest_dependants.go
 
 linters:
   disable-all: true
   enable:
     - deadcode
     - errcheck
-    # - gofmt
+    - gofmt
     - goimports
     - golint
     - gosimple
@@ -30,4 +34,4 @@ linters:
 
 linters-settings:
   errcheck:
-    ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
+    ignore: github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,fmt:.*,io:Close

Diff for: .travis.yml

@@ -16,7 +16,7 @@ install:
 # packages that live there.
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
-- go get github.com/hashicorp/terraform@v0.12.24
+- go get github.com/hashicorp/terraform-plugin-sdk/v2
 - go get github.com/kardianos/govendor
 - go get github.com/avinetworks/sdk/go/clients
 - go get github.com/avinetworks/sdk/go/session

Diff for: GNUmakefile

@@ -1,11 +1,20 @@
 TEST?=$$(go list ./... | grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
+AVI_PROVIDER_NAMESPACE=vmware.com/avi/avi
 
 default: build
 
 build: fmtcheck
 	go install
 
+build13: GOOS=$(shell go env GOOS)
+build13: GOARCH=$(shell go env GOARCH)
+build13: DESTINATION=$(HOME)/.terraform.d/plugins/$(AVI_PROVIDER_NAMESPACE)/18.2.13/$(GOOS)_$(GOARCH)
+build13: fmtcheck
+	@echo "==> Installing plugin to $(DESTINATION)"
+	@mkdir -p $(DESTINATION)
+	go build -o $(DESTINATION)/terraform-provider-avi_v18.2.13
+
 test: fmtcheck
 	go test -i $(TEST) || exit 1
 	echo $(TEST) | \

Diff for: README.md

@@ -1,70 +1,59 @@
 Terraform Provider
 ==================
-- [![Build Status](https://travis-ci.org/vmware/terraform-provider-avi.svg?branch=master)](https://travis-ci.org/vmware/terraform-provider-avi)
 - [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
 - Website: https://www.terraform.io
 - Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 
 <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,
+you'll first need [Go](http://www.golang.org) and [Terraform](https://www.terraform.io) installed on your machine.
+You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin`
+to your `$PATH`.
+
 Requirements
 ------------
 
--	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
--	[Go](https://golang.org/doc/install) 1.8 (to build the provider plugin)
+-	[Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible)
+-	[Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
 
-Usage
----------------------
+Building The Provider (Terraform v0.12+)
+----------------------------------------
 
-Create Avi Provider in terraform plan
+Clone repository to: `$GOPATH/src/github.com/vmware/terraform-provider-avi`
 
+```sh
+$ mkdir -p $GOPATH/src/github.com/vmware; cd $GOPATH/src/github.com/vmware
+$ git clone https://github.com/vmware/terraform-provider-avi.git
 ```
-# For example, restrict template version in 0.1.x
-provider "avi" {
-  avi_username = "admin"
-  avi_tenant = "admin"
-  avi_password = "something"
-  avi_controller= "42.42.42.42"
-}
-```
-
-Create Avi Pool Example. Here Pool depends on read only tenant data source and another health monitor defined as resource in the terraform plan
 
-```
-resource "avi_pool" "testpool" {
-  name= "pool-42",
-  health_monitor_refs= ["${avi_healthmonitor.test_hm_1.id}"]
-  tenant_ref= "${data.avi_tenant.default_tenant.id}"
-  cloud_ref= "${data.avi_cloud.default_cloud.id}"
-  application_persistence_profile_ref= "${avi_applicationpersistenceprofile.test_applicationpersistenceprofile.id}"
-  servers {
-    ip= {
-      type= "V4",
-      addr= "10.90.64.66",
-    }
-    port= 8080
-  }
-  fail_action= {
-    type= "FAIL_ACTION_CLOSE_CONN"
-  }
-}
+Enter the provider directory and build the provider.
 
+```sh
+$ cd $GOPATH/src/github.com/vmware/terraform-provider-avi
+$ make
 ```
-
-Reference existing resources as readonly or data sources
+For Terraform v0.12.x to use a locally built version of a provider add following to ~/.terraformrc on Linux/Unix.
 
 ```
-data "avi_applicationprofile" "system_http_profile" {
-  name= "System-HTTP"
+providers {
+  "avi" = "$GOPATH/bin/terraform-provider-avi"
 }
-
-application_profile_ref= "${data.avi_applicationprofile.system_https_profile.id}"
-
+```
+Or copy provider binary in ~./.terraform/plugins/linux_amd64/
+```shell
+$ mkdir -p ~./.terraform/plugins/linux_amd64/
+$ cp $GOPATH/bin/terraform-provider-avi ~./.terraform/plugins/linux_amd64/
 ```
 
-
-Building The Provider
----------------------
+Building The Provider (Terraform v0.13+)
+----------------------------------------
 
 Clone repository to: `$GOPATH/src/github.com/vmware/terraform-provider-avi`
 
@@ -77,36 +66,104 @@ Enter the provider directory and build the provider
 
 ```sh
 $ cd $GOPATH/src/github.com/vmware/terraform-provider-avi
+$ make build13
+```
+This will put the provider binary in the ~/.terraform.d/plugins/vmware.com/avi/avi/<provider_version>/$(GOOS)_$(GOARCH)
+directory.
+
+For Terraform v0.13+, to use a locally built version of a provider you must add the following snippet to every
+terraform plan.
+```
+terraform {
+  required_providers {
+    avi = {
+      source  = "vmware.com/avi/avi"
+      version = "<provider_version>"
+    }
+  }
+}
+```
 
+------
+Usage
+------
 
-$ make
+Create Avi Provider in terraform plan
+
+```
+provider "avi" {
+  avi_username = "admin"
+  avi_tenant = "admin"
+  avi_password = "password"
+  avi_controller = "x.x.x.x"
+  avi_version = "20.1.4"
+}
 ```
 
-Using the provider
-----------------------
-## Fill in for each provider
+Create Avi Pool Example. Here Pool depends on read only tenant data source and another health monitor defined as
+resource in the terraform plan
+
+```
+data "avi_tenant" "default_tenant" {
+  name= "admin"
+}
+data "avi_cloud" "default_cloud" {
+  name= "Default-Cloud"
+}
+
+resource "avi_applicationpersistenceprofile" "test_applicationpersistenceprofile" {
+  name             = "terraform-app-pers-profile"
+  tenant_ref       = data.avi_tenant.default_tenant.id
+  persistence_type = "PERSISTENCE_TYPE_CLIENT_IP_ADDRESS"
+}
+
+resource "avi_healthmonitor" "test_hm_1" {
+  name       = "terraform-monitor"
+  type       = "HEALTH_MONITOR_HTTP"
+  tenant_ref = data.avi_tenant.default_tenant.id
+}
+
+resource "avi_pool" "testpool" {
+  name= "pool-42"
+  health_monitor_refs = [avi_healthmonitor.test_hm_1.id]
+  tenant_ref = data.avi_tenant.default_tenant.id
+  cloud_ref = data.avi_cloud.default_cloud.id
+  application_persistence_profile_ref= avi_applicationpersistenceprofile.test_applicationpersistenceprofile.id
+  servers {
+    ip {
+      type = "V4"
+      addr = "10.90.64.66"
+    }
+    port= 8080
+  }
+  fail_action {
+    type = "FAIL_ACTION_CLOSE_CONN"
+  }
+}
+```
 
-Developing the Provider
----------------------------
+Reference existing resources as readonly or data sources
 
-If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.8+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+```
+data "avi_applicationprofile" "system_http_profile" {
+  name= "System-HTTP"
+}
 
-To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
+application_profile_ref= data.avi_applicationprofile.system_https_profile.id
 
-```sh
-$ make bin
-...
-$ $GOPATH/bin/terraform-provider-avi
-...
 ```
+-----------------
 
+Test The Provider
+-----------------
 In order to test the provider, you can simply run `make test`.
 
 ```sh
 $ make test
 ```
 
-In order to run the full suite of Acceptance tests, run `make testacc`.
+In order to run the full suite of Acceptance tests, run `make testacc`. 
+Running the tests for a provider requires version 0.12.26 or higher of the Terraform CLI.
 
 *Note:* Acceptance tests create real resources, and often cost money to run.
 

Diff for: avi/data_source_avi_actiongroupconfig_test.go

@@ -1,8 +1,12 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
 package avi
 
 import (
-	"github.com/hashicorp/terraform/helper/resource"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAVIDataSourceActionGroupConfigBasic(t *testing.T) {
@@ -31,11 +35,11 @@ data "avi_tenant" "default_tenant"{
     name= "admin"
 }
 resource "avi_actiongroupconfig" "testActionGroupConfig" {
-	name = "test-System-Alert-Level-High-abc"
-	tenant_ref = data.avi_tenant.default_tenant.id
-	level = "ALERT_HIGH"
 	autoscale_trigger_notification = false
 	external_only = false
+	tenant_ref = data.avi_tenant.default_tenant.id
+	name = "test-System-Alert-Level-High-abc"
+	level = "ALERT_HIGH"
 }
 
 data "avi_actiongroupconfig" "testActionGroupConfig" {

Diff for: avi/data_source_avi_alertconfig_test.go

@@ -1,8 +1,12 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
 package avi
 
 import (
-	"github.com/hashicorp/terraform/helper/resource"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAVIDataSourceAlertConfigBasic(t *testing.T) {
@@ -15,10 +19,10 @@ func TestAVIDataSourceAlertConfigBasic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"avi_alertconfig.testAlertConfig", "name", "test-System-CC-Alert-abc"),
-					resource.TestCheckResourceAttr(
-						"avi_alertconfig.testAlertConfig", "enabled", "true"),
 					resource.TestCheckResourceAttr(
 						"avi_alertconfig.testAlertConfig", "expiry_time", "86400"),
+					resource.TestCheckResourceAttr(
+						"avi_alertconfig.testAlertConfig", "enabled", "true"),
 					resource.TestCheckResourceAttr(
 						"avi_alertconfig.testAlertConfig", "rolling_window", "300"),
 					resource.TestCheckResourceAttr(
@@ -40,11 +44,11 @@ data "avi_actiongroupconfig" "system_actiongroupconfig" {
     name= "System-Alert-Level-Medium"
 }
 resource "avi_alertconfig" "testAlertConfig" {
+	category = "REALTIME"
+	expiry_time = "86400"
 	name = "test-System-CC-Alert-abc"
 	enabled = true
 	tenant_ref = data.avi_tenant.default_tenant.id
-	category = "REALTIME"
-	expiry_time = "86400"
 	summary = "System-CC-Alert System Alert Triggered"
 	rolling_window = "300"
 	source = "EVENT_LOGS"

Diff for: avi/data_source_avi_alertemailconfig_test.go

@@ -1,8 +1,12 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
 package avi
 
 import (
-	"github.com/hashicorp/terraform/helper/resource"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAVIDataSourceAlertEmailConfigBasic(t *testing.T) {
@@ -27,11 +31,11 @@ data "avi_tenant" "default_tenant"{
     name= "admin"
 }
 resource "avi_alertemailconfig" "testAlertEmailConfig" {
-	name = "test-aec-abc"
-	tenant_ref = data.avi_tenant.default_tenant.id
+	to_emails = "[email protected]"
 	cc_emails = "[email protected]"
+	tenant_ref = data.avi_tenant.default_tenant.id
+	name = "test-aec-abc"
 	description = "test alert email"
-	to_emails = "[email protected]"
 }
 
 data "avi_alertemailconfig" "testAlertEmailConfig" {