Skip to content

Commit 8b24632

Browse files
ksamorayksamoray
committed
Add status code to getSessionContext
To handle invalid configuration of a context in both object and provider levels. Signed-off-by: Kobi Samoray <[email protected]>
1 parent b2db212 commit 8b24632

File tree

94 files changed

+1100
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1100
-291
lines changed

Diff for: ‎nsxt/data_source_nsxt_policy_bfd_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ func dataSourceNsxtPolicyBfdProfile() *schema.Resource {
2323
func dataSourceNsxtPolicyBfdProfileRead(d *schema.ResourceData, m interface{}) error {
2424
connector := getPolicyConnector(m)
2525

26-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "BfdProfile", nil)
26+
context, err := getSessionContext(d, m)
27+
if err != nil {
28+
return err
29+
}
30+
_, err = policyDataSourceResourceRead(d, connector, context, "BfdProfile", nil)
2731
if err != nil {
2832
return err
2933
}

Diff for: ‎nsxt/data_source_nsxt_policy_bridge_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ func dataSourceNsxtPolicyBridgeProfile() *schema.Resource {
2323
func dataSourceNsxtPolicyBridgeProfileRead(d *schema.ResourceData, m interface{}) error {
2424
connector := getPolicyConnector(m)
2525

26-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "L2BridgeEndpointProfile", nil)
26+
context, err := getSessionContext(d, m)
27+
if err != nil {
28+
return err
29+
}
30+
_, err = policyDataSourceResourceRead(d, connector, context, "L2BridgeEndpointProfile", nil)
2731
if err != nil {
2832
return err
2933
}

Diff for: ‎nsxt/data_source_nsxt_policy_certificate.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ func dataSourceNsxtPolicyCertificate() *schema.Resource {
2323
func dataSourceNsxtPolicyCertificateRead(d *schema.ResourceData, m interface{}) error {
2424
connector := getPolicyConnector(m)
2525

26-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "TlsCertificate", nil)
26+
context, err := getSessionContext(d, m)
27+
if err != nil {
28+
return err
29+
}
30+
_, err = policyDataSourceResourceRead(d, connector, context, "TlsCertificate", nil)
2731
if err != nil {
2832
return err
2933
}

Diff for: ‎nsxt/data_source_nsxt_policy_context_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ func dataSourceNsxtPolicyContextProfile() *schema.Resource {
2222
}
2323

2424
func dataSourceNsxtPolicyContextProfileRead(d *schema.ResourceData, m interface{}) error {
25-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "PolicyContextProfile", nil)
25+
context, err := getSessionContext(d, m)
26+
if err != nil {
27+
return err
28+
}
29+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "PolicyContextProfile", nil)
2630
if err != nil {
2731
return err
2832
}

Diff for: ‎nsxt/data_source_nsxt_policy_dhcp_server.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ func dataSourceNsxtPolicyDhcpServer() *schema.Resource {
2424
func dataSourceNsxtPolicyDhcpServerRead(d *schema.ResourceData, m interface{}) error {
2525
connector := getPolicyConnector(m)
2626

27-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "DhcpServerConfig", nil)
27+
context, err := getSessionContext(d, m)
28+
if err != nil {
29+
return err
30+
}
31+
_, err = policyDataSourceResourceRead(d, connector, context, "DhcpServerConfig", nil)
2832
if err != nil {
2933
return err
3034
}

Diff for: ‎nsxt/data_source_nsxt_policy_distributed_flood_protection_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ func dataSourceNsxtPolicyDistributedFloodProtectionProfile() *schema.Resource {
2424
func dataSourceNsxtPolicyDistributedFloodProtectionProfileRead(d *schema.ResourceData, m interface{}) error {
2525
connector := getPolicyConnector(m)
2626

27-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "DistributedFloodProtectionProfile", nil)
27+
context, err := getSessionContext(d, m)
28+
if err != nil {
29+
return err
30+
}
31+
_, err = policyDataSourceResourceRead(d, connector, context, "DistributedFloodProtectionProfile", nil)
2832
if err != nil {
2933
return err
3034
}

Diff for: ‎nsxt/data_source_nsxt_policy_edge_cluster.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ func dataSourceNsxtPolicyEdgeClusterRead(d *schema.ResourceData, m interface{})
4141
query := make(map[string]string)
4242
globalPolicyEnforcementPointPath := getGlobalPolicyEnforcementPointPath(m, &objSitePath)
4343
query["parent_path"] = globalPolicyEnforcementPointPath
44-
_, err := policyDataSourceResourceReadWithValidation(d, getPolicyConnector(m), getSessionContext(d, m), "PolicyEdgeCluster", query, false)
44+
context, err := getSessionContext(d, m)
45+
if err != nil {
46+
return err
47+
}
48+
_, err = policyDataSourceResourceReadWithValidation(d, getPolicyConnector(m), context, "PolicyEdgeCluster", query, false)
4549
if err != nil {
4650
return err
4751
}
@@ -50,7 +54,11 @@ func dataSourceNsxtPolicyEdgeClusterRead(d *schema.ResourceData, m interface{})
5054

5155
// Local manager
5256
connector := getPolicyConnector(m)
53-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "PolicyEdgeCluster", nil)
57+
context, err := getSessionContext(d, m)
58+
if err != nil {
59+
return err
60+
}
61+
_, err = policyDataSourceResourceRead(d, connector, context, "PolicyEdgeCluster", nil)
5462
if err != nil {
5563
return err
5664
}

Diff for: ‎nsxt/data_source_nsxt_policy_edge_node.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ func dataSourceNsxtPolicyEdgeNodeRead(d *schema.ResourceData, m interface{}) err
5050
if memberIndexSet {
5151
query["member_index"] = strconv.Itoa(memberIndex.(int))
5252
}
53-
obj, err := policyDataSourceResourceReadWithValidation(d, getPolicyConnector(m), getSessionContext(d, m), "PolicyEdgeNode", query, false)
53+
context, err := getSessionContext(d, m)
54+
if err != nil {
55+
return err
56+
}
57+
obj, err := policyDataSourceResourceReadWithValidation(d, getPolicyConnector(m), context, "PolicyEdgeNode", query, false)
5458
if err != nil {
5559
return err
5660
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_dns_forwarder.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ func dataSourceNsxtPolicyGatewayDNSForwarderRead(d *schema.ResourceData, m inter
3232
if len(gwPath) > 0 {
3333
query["parent_path"] = fmt.Sprintf("%s*", gwPath)
3434
}
35-
_, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "PolicyDnsForwarder", query, false)
35+
context, err := getSessionContext(d, m)
36+
if err != nil {
37+
return err
38+
}
39+
_, err = policyDataSourceResourceReadWithValidation(d, connector, context, "PolicyDnsForwarder", query, false)
3640
if err != nil {
3741
return err
3842
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_flood_protection_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ func dataSourceNsxtPolicyGatewayFloodProtectionProfile() *schema.Resource {
2424
func dataSourceNsxtPolicyGatewayFloodProtectionProfileRead(d *schema.ResourceData, m interface{}) error {
2525
connector := getPolicyConnector(m)
2626

27-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "GatewayFloodProtectionProfile", nil)
27+
context, err := getSessionContext(d, m)
28+
if err != nil {
29+
return err
30+
}
31+
_, err = policyDataSourceResourceRead(d, connector, context, "GatewayFloodProtectionProfile", nil)
2832
if err != nil {
2933
return err
3034
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_interface_realization.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ func dataSourceNsxtPolicyGatewayInterfaceRealization() *schema.Resource {
7272

7373
func dataSourceNsxtPolicyGatewayInterfaceRealizationRead(d *schema.ResourceData, m interface{}) error {
7474
connector := getPolicyConnector(m)
75-
client := realizedstate.NewRealizedEntitiesClient(getSessionContext(d, m), connector)
75+
context, err := getSessionContext(d, m)
76+
if err != nil {
77+
return err
78+
}
79+
client := realizedstate.NewRealizedEntitiesClient(context, connector)
7680

7781
id := d.Get("id").(string)
7882
gatewayPath := d.Get("gateway_path").(string)
@@ -154,7 +158,7 @@ func dataSourceNsxtPolicyGatewayInterfaceRealizationRead(d *schema.ResourceData,
154158
MinTimeout: 1 * time.Second,
155159
Delay: time.Duration(delay) * time.Second,
156160
}
157-
_, err := stateConf.WaitForState()
161+
_, err = stateConf.WaitForState()
158162
if err != nil {
159163
return fmt.Errorf("Failed to get gateway interface realization information for %s: %v", gatewayPath, err)
160164
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_locale_service.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ func dataSourceNsxtPolicyGatewayLocaleServiceRead(d *schema.ResourceData, m inte
3939
gwPath := d.Get("gateway_path").(string)
4040
query := make(map[string]string)
4141
query["parent_path"] = gwPath
42-
obj, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "LocaleServices", query, false)
42+
context, err := getSessionContext(d, m)
43+
if err != nil {
44+
return err
45+
}
46+
obj, err := policyDataSourceResourceReadWithValidation(d, connector, context, "LocaleServices", query, false)
4347

4448
if err != nil {
4549
return err

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_policy.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ func dataSourceNsxtPolicyGatewayPolicyRead(d *schema.ResourceData, m interface{}
7474

7575
category := d.Get("category").(string)
7676
domain := d.Get("domain").(string)
77-
context := getSessionContext(d, m)
77+
context, err := getSessionContext(d, m)
78+
if err != nil {
79+
return err
80+
}
7881
if isPolicyGlobalManager(m) {
7982
query := make(map[string]string)
8083
query["parent_path"] = "*/" + domain

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_prefix_list.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ func dataSourceNsxtPolicyGatewayPrefixListRead(d *schema.ResourceData, m interfa
3131
if len(gwPath) > 0 {
3232
query["parent_path"] = fmt.Sprintf("%s*", gwPath)
3333
}
34-
_, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "PrefixList", query, false)
34+
context, err := getSessionContext(d, m)
35+
if err != nil {
36+
return err
37+
}
38+
_, err = policyDataSourceResourceReadWithValidation(d, connector, context, "PrefixList", query, false)
3539
if err != nil {
3640
return err
3741
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_qos_profile.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ func dataSourceNsxtPolicyGatewayQosProfile() *schema.Resource {
2222
}
2323

2424
func dataSourceNsxtPolicyGatewayQosProfileRead(d *schema.ResourceData, m interface{}) error {
25-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "GatewayQosProfile", nil)
25+
context, err := getSessionContext(d, m)
26+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "GatewayQosProfile", nil)
2627
if err != nil {
2728
return err
2829
}

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_route_map.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ func dataSourceNsxtPolicyGatewayRouteMapRead(d *schema.ResourceData, m interface
3131
if len(gwPath) > 0 {
3232
query["parent_path"] = fmt.Sprintf("%s*", gwPath)
3333
}
34-
_, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "Tier0RouteMap", query, false)
34+
context, err := getSessionContext(d, m)
35+
if err != nil {
36+
return err
37+
}
38+
_, err = policyDataSourceResourceReadWithValidation(d, connector, context, "Tier0RouteMap", query, false)
3539
if err != nil {
3640
return err
3741
}

Diff for: ‎nsxt/data_source_nsxt_policy_group.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ func dataSourceNsxtPolicyGroupRead(d *schema.ResourceData, m interface{}) error
2626
domain := d.Get("domain").(string)
2727
query := make(map[string]string)
2828
query["parent_path"] = "*/" + domain
29-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "Group", query)
29+
context, err := getSessionContext(d, m)
30+
if err != nil {
31+
return err
32+
}
33+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "Group", query)
3034
if err != nil {
3135
return err
3236
}

Diff for: ‎nsxt/data_source_nsxt_policy_host_transport_node.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ func dataSourceNsxtPolicyHostTransportNode() *schema.Resource {
2828
}
2929

3030
func dataSourceNsxtPolicyHostTransportNodeRead(d *schema.ResourceData, m interface{}) error {
31-
obj, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "HostTransportNode", nil)
31+
context, err := getSessionContext(d, m)
32+
if err != nil {
33+
return err
34+
}
35+
obj, err := policyDataSourceResourceRead(d, getPolicyConnector(m), context, "HostTransportNode", nil)
3236
if err != nil {
3337
return err
3438
}

Diff for: ‎nsxt/data_source_nsxt_policy_host_transport_node_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ func dataSourceNsxtPolicyHostTransportNodeProfile() *schema.Resource {
2121
}
2222

2323
func dataSourceNsxtPolicyHostTransportNodeProfileRead(d *schema.ResourceData, m interface{}) error {
24-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "PolicyHostTransportNodeProfile", nil)
24+
context, err := getSessionContext(d, m)
25+
if err != nil {
26+
return err
27+
}
28+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "PolicyHostTransportNodeProfile", nil)
2529
if err != nil {
2630
return err
2731
}

Diff for: ‎nsxt/data_source_nsxt_policy_intrusion_service_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ func dataSourceNsxtPolicyIntrusionServiceProfileRead(d *schema.ResourceData, m i
2828
return localManagerOnlyError()
2929
}
3030

31-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "IdsProfile", nil)
31+
context, err := getSessionContext(d, m)
32+
if err != nil {
33+
return err
34+
}
35+
_, err = policyDataSourceResourceRead(d, connector, context, "IdsProfile", nil)
3236
if err != nil {
3337
return err
3438
}

Diff for: ‎nsxt/data_source_nsxt_policy_ip_block.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ func dataSourceNsxtPolicyIPBlock() *schema.Resource {
2929

3030
func dataSourceNsxtPolicyIPBlockRead(d *schema.ResourceData, m interface{}) error {
3131
connector := getPolicyConnector(m)
32-
client := infra.NewIpBlocksClient(getSessionContext(d, m), connector)
32+
context, err := getSessionContext(d, m)
33+
if err != nil {
34+
return err
35+
}
36+
client := infra.NewIpBlocksClient(context, connector)
3337

3438
objID := d.Get("id").(string)
3539
objName := d.Get("display_name").(string)

Diff for: ‎nsxt/data_source_nsxt_policy_ip_discovery_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ func dataSourceNsxtPolicyIPDiscoveryProfile() *schema.Resource {
2222
}
2323

2424
func dataSourceNsxtPolicyIPDiscoveryProfileRead(d *schema.ResourceData, m interface{}) error {
25-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "IPDiscoveryProfile", nil)
25+
context, err := getSessionContext(d, m)
26+
if err != nil {
27+
return err
28+
}
29+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "IPDiscoveryProfile", nil)
2630
if err != nil {
2731
return err
2832
}

Diff for: ‎nsxt/data_source_nsxt_policy_ip_pool.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ func dataSourceNsxtPolicyIPPool() *schema.Resource {
3030
}
3131

3232
func dataSourceNsxtPolicyIPPoolRead(d *schema.ResourceData, m interface{}) error {
33-
obj, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "IpAddressPool", nil)
33+
context, err := getSessionContext(d, m)
34+
if err != nil {
35+
return err
36+
}
37+
obj, err := policyDataSourceResourceRead(d, getPolicyConnector(m), context, "IpAddressPool", nil)
3438
if err != nil {
3539
return err
3640
}

Diff for: ‎nsxt/data_source_nsxt_policy_ipsec_vpn_local_endpoint.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ func dataSourceNsxtPolicyIPSecVpnLocalEndpointRead(d *schema.ResourceData, m int
4949
}
5050
query["parent_path"] = fmt.Sprintf("%s*", servicePath)
5151
}
52-
objInt, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "IPSecVpnLocalEndpoint", query, false)
52+
context, err := getSessionContext(d, m)
53+
if err != nil {
54+
return err
55+
}
56+
objInt, err := policyDataSourceResourceReadWithValidation(d, connector, context, "IPSecVpnLocalEndpoint", query, false)
5357
if err != nil {
5458
return err
5559
}

Diff for: ‎nsxt/data_source_nsxt_policy_ipsec_vpn_service.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ func dataSourceNsxtPolicyIPSecVpnServiceRead(d *schema.ResourceData, m interface
3131
if len(gwPath) > 0 {
3232
query["parent_path"] = fmt.Sprintf("%s*", gwPath)
3333
}
34-
_, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "IPSecVpnService", query, false)
34+
context, err := getSessionContext(d, m)
35+
if err != nil {
36+
return err
37+
}
38+
_, err = policyDataSourceResourceReadWithValidation(d, connector, context, "IPSecVpnService", query, false)
3539
if err != nil {
3640
return err
3741
}

Diff for: ‎nsxt/data_source_nsxt_policy_ipv6_dad_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ func dataSourceNsxtPolicyIpv6DadProfile() *schema.Resource {
2222
}
2323

2424
func dataSourceNsxtPolicyIpv6DadProfileRead(d *schema.ResourceData, m interface{}) error {
25-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "Ipv6DadProfile", nil)
25+
context, err := getSessionContext(d, m)
26+
if err != nil {
27+
return err
28+
}
29+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "Ipv6DadProfile", nil)
2630
if err != nil {
2731
return err
2832
}

Diff for: ‎nsxt/data_source_nsxt_policy_ipv6_ndra_profile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ func dataSourceNsxtPolicyIpv6NdraProfile() *schema.Resource {
2222
}
2323

2424
func dataSourceNsxtPolicyIpv6NdraProfileRead(d *schema.ResourceData, m interface{}) error {
25-
_, err := policyDataSourceResourceRead(d, getPolicyConnector(m), getSessionContext(d, m), "Ipv6NdraProfile", nil)
25+
context, err := getSessionContext(d, m)
26+
if err != nil {
27+
return err
28+
}
29+
_, err = policyDataSourceResourceRead(d, getPolicyConnector(m), context, "Ipv6NdraProfile", nil)
2630
if err != nil {
2731
return err
2832
}

Diff for: ‎nsxt/data_source_nsxt_policy_l2_vpn_service.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ func dataSourceNsxtPolicyL2VpnServiceRead(d *schema.ResourceData, m interface{})
3131
if len(gwPath) > 0 {
3232
query["parent_path"] = fmt.Sprintf("%s*", gwPath)
3333
}
34-
_, err := policyDataSourceResourceReadWithValidation(d, connector, getSessionContext(d, m), "L2VPNService", query, false)
34+
context, err := getSessionContext(d, m)
35+
if err != nil {
36+
return err
37+
}
38+
_, err = policyDataSourceResourceReadWithValidation(d, connector, context, "L2VPNService", query, false)
3539
if err != nil {
3640
return err
3741
}

Diff for: ‎nsxt/data_source_nsxt_policy_lb_service.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ func dataSourceNsxtPolicyLbService() *schema.Resource {
2323
func dataSourceNsxtPolicyLbServiceRead(d *schema.ResourceData, m interface{}) error {
2424
connector := getPolicyConnector(m)
2525

26-
_, err := policyDataSourceResourceRead(d, connector, getSessionContext(d, m), "LBService", nil)
26+
context, err := getSessionContext(d, m)
27+
if err != nil {
28+
return err
29+
}
30+
_, err = policyDataSourceResourceRead(d, connector, context, "LBService", nil)
2731
if err != nil {
2832
return err
2933
}

0 commit comments

Comments
 (0)