makfile, website lint changes

komalsharmaaa · komalsharmaaa · commit a6a68ec6cde5 · 2023-05-18T17:11:07.000+05:30
diff --git a/GNUmakefile b/GNUmakefile
@@ -8,7 +8,6 @@ default: build
 tools:
 	GO111MODULE=on go install -mod=mod github.com/client9/misspell/cmd/misspell
 	GO111MODULE=on go install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint
-	GO111MODULE=on go install -mod=mod github.com/katbyte/terrafmt
 
 build: fmtcheck
 	go install -ldflags "-X github.com/vmware/terraform-provider-for-vmware-nsxt-virtual-private-cloud/nsxt.GitCommit=$(GIT_COMMIT)"
@@ -54,16 +53,10 @@ website-lint:
 	    echo "Unexpected mispelling found in website files."; \
 	    echo "To automatically fix the misspelling, run 'make website-lint-fix' and commit the changes."; \
 	    exit 1)
-	@terrafmt diff ./website --check --pattern '*.markdown' --quiet || (echo; \
-	    echo "Unexpected differences in website HCL formatting."; \
-	    echo "To see the full differences, run: terrafmt diff ./website --pattern '*.markdown'"; \
-	    echo "To automatically fix the formatting, run 'make website-lint-fix' and commit the changes."; \
-	    exit 1)
 
 website-lint-fix:
 	@echo "==> Applying automatic website linter fixes..."
 	@misspell -w -source=text website/
-	@terrafmt fmt ./website --pattern '*.markdown'
 
 .PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website-lint website-lint-fix tools
 
diff --git a/nsxt/custom_provider_test.go b/nsxt/custom_provider_test.go
@@ -109,7 +109,7 @@ func testAccPreCheck(t *testing.T) {
 	}
 
 	_, err := nsxtclient.NewNsxtClient(config.NsxManagerHost, config.Username, config.OrgId, config.ProjectId, config.VpcId,
-		"", "", "", "", "", "", true, nsxtsession.SetInsecure(false),
+		"", "", "", "", "", "", true, nsxtsession.SetPassword(config.Password), nsxtsession.SetInsecure(false),
 		nsxtsession.SetMaxAPIRetries(5), nsxtsession.SetTimeout(time.Duration(90*int(time.Second))))
 
 	if err != nil {
diff --git a/nsxt/session/custom_nsxtsession.go b/nsxt/session/custom_nsxtsession.go
@@ -220,7 +220,7 @@ func (nsxtsess *NsxtSession) initiateSession() error {
 	var res interface{}
 
 	// now login to get session_id, csrfToken
-	cred := make(map[string]string)
+	cred := make(map[string]interface{})
 	cred["username"] = nsxtsess.username
 	cred["password"] = nsxtsess.password
 
@@ -611,7 +611,7 @@ func (nsxtsess *NsxtSession) restRequestInterfaceResponse(verb string, url strin
 		return err
 	}
 
-	if len(res) != 0 {
+	if len(res) != 0 && url != "login" {
 		return json.Unmarshal(res, &response)
 	}
 	return nil
diff --git a/website/docs/r/custom_nsxt_vpc_vm_tags.html.markdown b/website/docs/r/custom_nsxt_vpc_vm_tags.html.markdown
@@ -58,7 +58,7 @@ An existing VpcVmTags collection can be [imported][docs-import] into this resour
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_vm_tags.test-vpc-vm-tags ID
 ```
 
diff --git a/website/docs/r/nsxt_dhcp_v4_static_binding_config.html.markdown b/website/docs/r/nsxt_dhcp_v4_static_binding_config.html.markdown
@@ -122,7 +122,7 @@ An existing DhcpV4StaticBindingConfig can be [imported][docs-import] into this r
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_dhcp_v4_static_binding_config.test-dhcpv4staticbindingconfig ID
 ```
 
diff --git a/website/docs/r/nsxt_gateway_policy.html.markdown b/website/docs/r/nsxt_gateway_policy.html.markdown
@@ -120,7 +120,7 @@ An existing GatewayPolicy can be [imported][docs-import] into this resource, via
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_gateway_policy.test-gatewaypolicy ID
 ```
 
diff --git a/website/docs/r/nsxt_gateway_policy_rule.html.markdown b/website/docs/r/nsxt_gateway_policy_rule.html.markdown
@@ -140,7 +140,7 @@ An existing GatewayPolicyRule can be [imported][docs-import] into this resource,
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_gateway_policy_rule.test-gatewaypolicyrule ID
 ```
 
diff --git a/website/docs/r/nsxt_group.html.markdown b/website/docs/r/nsxt_group.html.markdown
@@ -114,7 +114,7 @@ An existing Group can be [imported][docs-import] into this resource, via the fol
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_group.test-group ID
 ```
 
diff --git a/website/docs/r/nsxt_policy_vpc_nat_rule.html.markdown b/website/docs/r/nsxt_policy_vpc_nat_rule.html.markdown
@@ -136,7 +136,7 @@ An existing PolicyVpcNatRule can be [imported][docs-import] into this resource,
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_policy_vpc_nat_rule.test-policyvpcnatrule ID
 ```
 
diff --git a/website/docs/r/nsxt_security_policy.html.markdown b/website/docs/r/nsxt_security_policy.html.markdown
@@ -85,7 +85,7 @@ the lock, other users can update this security policy.
 * `display_name` - (Optional) Defaults to ID if not set
 * `description` - (Optional) Description of this resource
 * `connectivity_preference` - (Optional) This field indicates the default connectivity policy for the security
-policy. Based on the connectivitiy preference, a default rule for this
+policy. Based on the connectivity preference, a default rule for this
 security policy will be created. An appropriate action will be set on
 the rule based on the value of the connectivity preference. If NONE is
 selected or no connectivity preference is specified, then no default
@@ -179,7 +179,7 @@ An existing SecurityPolicy can be [imported][docs-import] into this resource, vi
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_security_policy.test-securitypolicy ID
 ```
 
diff --git a/website/docs/r/nsxt_security_policy_rule.html.markdown b/website/docs/r/nsxt_security_policy_rule.html.markdown
@@ -144,7 +144,7 @@ An existing SecurityPolicyRule can be [imported][docs-import] into this resource
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_security_policy_rule.test-securitypolicyrule ID
 ```
 
diff --git a/website/docs/r/nsxt_static_routes.html.markdown b/website/docs/r/nsxt_static_routes.html.markdown
@@ -76,7 +76,7 @@ An existing StaticRoutes can be [imported][docs-import] into this resource, via
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_static_routes.test-staticroutes ID
 ```
 
diff --git a/website/docs/r/nsxt_subnet_ip_address_allocation.html.markdown b/website/docs/r/nsxt_subnet_ip_address_allocation.html.markdown
@@ -57,7 +57,7 @@ An existing IpAddressAllocation can be [imported][docs-import] into this resourc
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_subnet_ip_address_allocation.test-ipaddressallocation ID
 ```
 
diff --git a/website/docs/r/nsxt_vpc_ip_address_allocation.html.markdown b/website/docs/r/nsxt_vpc_ip_address_allocation.html.markdown
@@ -62,7 +62,7 @@ An existing VpcIpAddressAllocation can be [imported][docs-import] into this reso
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_ip_address_allocation.test-vpcipaddressallocation ID
 ```
 
diff --git a/website/docs/r/nsxt_vpc_subnet.html.markdown b/website/docs/r/nsxt_vpc_subnet.html.markdown
@@ -42,7 +42,7 @@ The following arguments are supported:
 If not specified, then the local DHCP server will be configured for all connected subnets.
 
   * `dns_client_config` - (Optional) 
-    * `dns_server_ips` - (Optional) IPs of the DNS servers which need to be configured on teh workload VMs
+    * `dns_server_ips` - (Optional) IPs of the DNS servers which need to be configured on the workload VMs
 
   * `static_pool_config` - (Optional) 
     * `ipv4_pool_size` - (Optional) Number of IPs to be reserved in static ip pool. Maximum allowed value is 'subnet size - 4'.
@@ -56,7 +56,7 @@ If disabled then neither DHCP server nor relay shall be configured.
 * `display_name` - (Optional) Defaults to ID if not set
 * `description` - (Optional) Description of this resource
 * `access_mode` - (Optional) There are three kinds of Access Types supported for an Application.
-Private  - Subnet is accessbile only within the application and its IPs are allocated from
+Private  - Subnet is accessible only within the application and its IPs are allocated from
            private IP address pool from VPC configuration unless specified explicitly by user.
 Public   - Subnet is accessible from external networks and its IPs are allocated from public IP
            address pool from VPC configuration unless specified explicitly by user.
@@ -90,7 +90,7 @@ An existing VpcSubnet can be [imported][docs-import] into this resource, via the
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_subnet.test-vpcsubnet ID
 ```
 
diff --git a/website/docs/r/nsxt_vpc_subnet_port.html.markdown b/website/docs/r/nsxt_vpc_subnet_port.html.markdown
@@ -110,7 +110,7 @@ An existing VpcSubnetPort can be [imported][docs-import] into this resource, via
 
 [docs-import]: https://www.terraform.io/cli/import
 
-```hcl
+```
 terraform import nsxt_vpc_subnet_port.test-vpcsubnetport ID
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func testAccPreCheck(t *testing.T) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`_, err := nsxtclient.NewNsxtClient(config.NsxManagerHost, config.Username, config.OrgId, config.ProjectId, config.VpcId,`
`112`		`- "", "", "", "", "", "", true, nsxtsession.SetInsecure(false),`
	`112`	`+ "", "", "", "", "", "", true, nsxtsession.SetPassword(config.Password), nsxtsession.SetInsecure(false),`
`113`	`113`	`nsxtsession.SetMaxAPIRetries(5), nsxtsession.SetTimeout(time.Duration(90*int(time.Second))))`
`114`	`114`
`115`	`115`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func (nsxtsess *NsxtSession) initiateSession() error {`
`220`	`220`	`var res interface{}`
`221`	`221`
`222`	`222`	`// now login to get session_id, csrfToken`
`223`		`- cred := make(map[string]string)`
	`223`	`+ cred := make(map[string]interface{})`
`224`	`224`	`cred["username"] = nsxtsess.username`
`225`	`225`	`cred["password"] = nsxtsess.password`
`226`	`226`
`@@ -611,7 +611,7 @@ func (nsxtsess *NsxtSession) restRequestInterfaceResponse(verb string, url strin`
`611`	`611`	`return err`
`612`	`612`	`}`
`613`	`613`
`614`		`- if len(res) != 0 {`
	`614`	`+ if len(res) != 0 && url != "login" {`
`615`	`615`	`return json.Unmarshal(res, &response)`
`616`	`616`	`}`
`617`	`617`	`return nil`