Changed the code to make the provider parameters optional and provide… (

#34)

* Changed the code to make the provider parameters optional and provide defaults for username, tenant and version

* updated travis file

* fixed travis errors

* updated vendor.json

* Fixed travis errors

* changed path of the provider

* changed path of the provider with fmt

* updated readme with travis

.travis.yml

@@ -0,0 +1,28 @@
+dist: trusty
+sudo: false
+language: go
+go:
+- 1.9.1
+
+install:
+# This script is used by the Travis build to install a cookie for
+# go.googlesource.com so rate limits are higher when using `go get` to fetch
+# packages that live there.
+# See: https://github.com/golang/go/issues/12933
+- bash scripts/gogetcookie.sh
+- go get github.com/kardianos/govendor
+- go get github.com/avinetworks/sdk/go/clients
+- go get github.com/avinetworks/sdk/go/session
+
+script:
+- make
+- make test
+
+branches:
+  only:
+  - master
+matrix:
+  fast_finish: true
+  allow_failures:
+  - go: tip
+

README.md

@@ -1,5 +1,6 @@
 Terraform Provider
 ==================
+[![Build Status](https://travis-ci.org/avinetworks/terraform-provider-avi.svg?branch=master)](https://travis-ci.org/avinetworks/terraform-provider-avi)
 
 - Website: https://www.terraform.io
 - [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)

avi/provider.go

@@ -20,28 +20,34 @@ func Provider() terraform.ResourceProvider {
 		Schema: map[string]*schema.Schema{
 			"avi_username": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("AVI_USERNAME", nil),
 				Description: "Username for Avi Controller.",
 			},
 			"avi_controller": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("AVI_CONTROLLER", nil),
 				Description: "Avi Controller hostname or IP address.",
 			},
 			"avi_password": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("AVI_PASSWORD", nil),
 				Description: "Password for Avi Controller.",
 			},
 			"avi_tenant": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("AVI_TENANT", nil),
 				Description: "Avi tenant for Avi Controller.",
 			},
+			"avi_version": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("AVI_VERSION", nil),
+				Description: "Avi tenant for Avi Controller.",
+			},
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"avi_useraccountprofile":            dataSourceAviUserAccountProfile(),
@@ -178,10 +184,17 @@ func Provider() terraform.ResourceProvider {
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Credentials{
-		Username:   d.Get("avi_username").(string),
+		Username:   "admin",
 		Password:   d.Get("avi_password").(string),
 		Controller: d.Get("avi_controller").(string),
-		Tenant:     d.Get("avi_tenant").(string),
+		Tenant:     "admin",
+		Version:    "17.2.7",
+	}
+	if username, ok := d.GetOk("avi_username"); ok {
+		config.Username = username.(string)
+	}
+	if version, ok := d.GetOk("avi_version"); ok {
+		config.Version = version.(string)
 	}
 
 	if err := config.validate(); err != nil {
@@ -192,10 +205,11 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		config.Controller, config.Username,
 		session.SetPassword(config.Password),
 		session.SetTenant(config.Tenant),
-		session.SetVersion("17.2.8"),
+		session.SetVersion(config.Version),
 		session.SetInsecure)
 
-	log.Println("Avi Client created ")
+	log.Println("Avi Client created for user %v tenant %v version %v",
+		config.Username, config.Tenant, config.Version)
 
 	return aviClient, err
 }
@@ -206,6 +220,7 @@ type Credentials struct {
 	Controller string
 	Port       string
 	Tenant     string
+	Version    string
 }
 
 func (c *Credentials) validate() error {

avi/provider_test.go

@@ -78,20 +78,28 @@ func TestProvider(t *testing.T) {
 }
 
 func testAccPreCheck(t *testing.T) {
-	required := []string{"AVI_USERNAME", "AVI_PASSWORD", "AVI_CONTROLLER",
-		"AVI_TENANT"}
-	for _, property := range required {
-		if os.Getenv(property) == "" {
-			t.Fatalf("%s must be set for acceptance test", property)
-		}
-	}
 	config := Credentials{
 		Username:   os.Getenv("AVI_USERNAME"),
 		Password:   os.Getenv("AVI_PASSWORD"),
 		Controller: os.Getenv("AVI_CONTROLLER"),
 		Tenant:     os.Getenv("AVI_TENANT"),
+		Version:    os.Getenv("AVI_VERSION"),
+	}
+	required := []string{"AVI_PASSWORD", "AVI_CONTROLLER"}
+	for _, property := range required {
+		if os.Getenv(property) == "" {
+			t.Fatalf("%s must be set for acceptance test", property)
+		}
+	}
+	if config.Username == "" {
+		config.Username = "admin"
+	}
+	if config.Tenant == "" {
+		config.Tenant = "admin"
+	}
+	if config.Version == "" {
+		config.Version = "17.2.7"
 	}
-
 	_, err := clients.NewAviClient(
 		config.Controller, config.Username,
 		session.SetPassword(config.Password),

main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/avinetworks/terraform-provider-avi/avi"
 	"github.com/hashicorp/terraform/plugin"
-	"github.com/terraform-providers/terraform-provider-avi/avi"
 )
 
 func main() {

vendor/vendor.json

@@ -638,12 +638,19 @@
 			"versionExact": "v1.6.1"
 		},
 		{
-			"path": "github.com/avinetworks/sdk",
+			"path": "github.com/avinetworks/sdk/go/clients",
 			"revision": "796ddcccdc37a5a9771bfbb716b159ae5c9b4b11",
-			"revisionTime": "2018-01-10T12:15:28-08:00",
-			"version": "17.2.5",
-			"versionExact": "17.2.5"
+			"revisionTime": "2018-04-06T16:51:27.185773",
+			"version": "17.2.8",
+			"versionExact": "17.2.8"
+		},
+		{
+			"path": "github.com/avinetworks/sdk/go/session",
+			"revision": "796ddcccdc37a5a9771bfbb716b159ae5c9b4b11",
+			"revisionTime": "2018-04-06T16:51:27.185773",
+			"version": "17.2.8",
+			"versionExact": "17.2.8"
 		}
 	],
-	"rootPath": "github.com/terraform-providers/terraform-provider-avi"
+	"rootPath": "github.com/avinetworks/terraform-provider-avi"
 }