Incorporated recent bug fixes

Author: komalsharmaaa

.gitignore

@@ -58,3 +58,5 @@ override.tf.json
 .terraformrc
 terraform.rc
 terraform
+
+dist/

.goreleaser.tmpl

@@ -0,0 +1 @@
+# Release {{ .Version }} ({{ .Date }})

.goreleaser.yaml

@@ -0,0 +1,45 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+    # you may remove this if you don't need go generate
+    - go generate ./...
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+
+archives:
+  - format: tar.gz
+    # this name template makes the OS and Arch compatible with the results of uname.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+    - goos: windows
+      format: zip
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ incpatch .Version }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
+
+# The lines beneath this are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/use them.
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj

README.md

@@ -121,9 +121,9 @@ require.
 
 Minimum environment variable :
 ```sh
-$ export NSXT_MANAGER_HOST="10.92.104.56"
+$ export NSXT_MANAGER_HOST="10.191.153.238"
 $ export NSXT_USERNAME="admin"
-$ export NSXT_PASSWORD="u2.OpqZc0Ptd"
+$ export NSXT_PASSWORD="e6+DgNzYA5D*"
 $ export NSXT_ALLOW_UNVERIFIED_SSL=true
 ```
 

nsxt/provider_test.go

@@ -74,9 +74,9 @@ func testAccEnvDefined(t *testing.T, envVar string) {
 
 func testAccPreCheck(t *testing.T) {
 	log.Printf("start of testAccPreCheck")
-	os.Setenv("NSXT_MANAGER_HOST", "10.92.104.56")
+	os.Setenv("NSXT_MANAGER_HOST", "10.191.153.238")
 	os.Setenv("NSXT_USERNAME", "admin")
-	os.Setenv("NSXT_PASSWORD", "u2.OpqZc0Ptd")
+	os.Setenv("NSXT_PASSWORD", "e6+DgNzYA5D*")
 	os.Setenv("NSXT_ORG", "default")
 	os.Setenv("NSXT_PROJECT", "Dev_project")
 	os.Setenv("NSXT_VPC", "dev_vpc")

nsxt/resource_nsxt_customised_dependants.go

@@ -14,28 +14,11 @@ import (
 func resourceExpressionsCustomSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"_revision": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"description": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
-			"display_name": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
 			"exclude": {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Elem:     resourceExcludedMembersListSchema(),
 			},
-			"nsx_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"key": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -76,73 +59,24 @@ func resourceExpressionsCustomSchema() *schema.Resource {
 				Optional: true,
 				Elem:     resourceTagSchema(),
 			},
-			"relative_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"remote_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"_protection": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"marked_for_delete": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  false,
 			},
-			"parent_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"overridden": {
-				Type:     schema.TypeBool,
-				Computed: true,
-			},
-			"path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
 
 func resourceExpressionCustomSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"_revision": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"description": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
-			"display_name": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
-			"nsx_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"tags": {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem:     resourceTagSchema(),
 				MaxItems: 30,
 			},
-			"path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"resource_type": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -200,35 +134,11 @@ func resourceExpressionCustomSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"relative_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"remote_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"_protection": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"marked_for_delete": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  false,
 			},
-			"parent_path": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"overridden": {
-				Type:     schema.TypeBool,
-				Computed: true,
-			},
 		},
 	}
 }

nsxt/session/nsxtsession.go

@@ -419,26 +419,6 @@ func (nsxtsess *NsxtSession) newNsxtRequest(verb string, url string, payload io.
 	return req, errorResult
 }
 
-// Helper routines for REST calls.
-
-func (nsxtsess *NsxtSession) collectCookiesFromResp(resp *http.Response) {
-	// collect cookies from the resp
-	var csrfToken string
-	var sessionID string
-	for _, cookie := range resp.Cookies() {
-		if cookie.Name == "csrftoken" {
-			csrfToken = cookie.Value
-		}
-		if cookie.Name == "sessionid" || cookie.Name == "nsxt-sessionid" {
-			sessionID = cookie.Value
-		}
-	}
-	if csrfToken != "" && sessionID != "" {
-		nsxtsess.csrfToken = csrfToken
-		nsxtsess.sessionid = sessionID
-	}
-}
-
 // RestRequest exports restRequest from the SDK
 // Returns http.Response for accessing the whole http Response struct including headers and response body
 func (nsxtsess *NsxtSession) RestRequest(verb string, uri string, payload interface{}, lastError error,
@@ -454,10 +434,7 @@ func (nsxtsess *NsxtSession) restRequest(verb string, uri string, payload interf
 	url := nsxtsess.prefix + uri
 
 	// If optional retryNum arg is provided, then count which retry number this is
-	retry := 0
-	if len(retryNum) > 0 {
-		retry = retryNum[0]
-	}
+	maxAPIRetries := nsxtsess.maxAPIRetries
 
 	var payloadIO io.Reader
 	if payload != nil {
@@ -487,23 +464,18 @@ func (nsxtsess *NsxtSession) restRequest(verb string, uri string, payload interf
 		retryReq = true
 	}
 
-	if !retryReq {
-		glog.Infof("Req for %s uri %v  RespCode %v", verb, url, resp.StatusCode)
-		errorResult.HTTPStatusCode = resp.StatusCode
-
-		if uri == "login" {
-			nsxtsess.collectCookiesFromResp(resp)
-		}
-		if resp.StatusCode == 401 && uri != "login" {
-			resp.Body.Close()
-			glog.Infof("Retrying url %s; retry %d due to Status Code %d", url, retry, resp.StatusCode)
-			err := nsxtsess.initiateSession()
-			if err != nil {
-				return nil, err
+	if retryReq {
+		for i := 0; i < maxAPIRetries; i++ {
+			glog.Infof("Retrying url %s; retry %d due to Status Code %d", url, i, resp.StatusCode)
+			glog.Infof("Req for %s uri %v  RespCode %v", verb, url, resp.StatusCode)
+			errorResult.HTTPStatusCode = resp.StatusCode
+			if resp.StatusCode != 200 {
+				resp, err := nsxtsess.client.Do(req)
+				if err == nil && resp != nil {
+					break
+				}
 			}
-		} else if resp.StatusCode == 419 || (resp.StatusCode >= 500 && resp.StatusCode < 599) {
-			resp.Body.Close()
-			glog.Infof("Retrying url: %s; retry: %d due to Status Code %d", url, retry, resp.StatusCode)
+			time.Sleep(time.Duration(nsxtsess.apiRetryInterval) * time.Millisecond)
 		}
 	}
 	return resp, nil

nsxt/session/nsxtsession_test.go

@@ -84,9 +84,9 @@ func testNsxtSession(t *testing.T, nsxtsess *NsxtSession) {
 func TestNsxtSession(t *testing.T) {
 	var err error
 	var session *NsxtSession
-	var NsxtManager = "10.92.104.56"
+	var NsxtManager = "10.191.153.238"
 	var NsxtUsername = "admin"
-	var NsxtPassword = "u2.OpqZc0Ptd"
+	var NsxtPassword = "e6+DgNzYA5D*"
 	session, err = NewNsxtSession(NsxtManager, NsxtUsername, nil, true, SetPassword(NsxtPassword), SetInsecure(true))
 
 	if err != nil {

nsxt/terraform_policy_utils.go

@@ -21,7 +21,6 @@ import (
 // create it. In case, it is present then automatically converts to PATCH semantics.
 func APICreateOrUpdate(d *schema.ResourceData, meta interface{}, objType string, s map[string]*schema.Schema,
 	opts ...bool) error {
-	//TODO: use autogenerated client for each resource for connection instead of direct session usage
 	log.Printf("[DEBUG] start of APICreateOrUpdate")
 	var robj interface{}
 	obj := d
@@ -140,8 +139,6 @@ func DatasourceRead(d *schema.ResourceData, meta interface{}, objType string, s
 	}
 	// Some objTypes (should be resource_type value) are differently worded in .yaml, hence correcting them for usage in Search query
 	switch objType {
-	case "SubnetPort":
-		objType = "VpcSubnetPort"
 	case "SecurityPolicyRule":
 		objType = "Rule"
 	case "GatewayPolicyRule":