linting updates, error checking iterator

hashicorp · Aug 11, 2021 · 5ad1a47 · 5ad1a47
1 parent 0df60de
commit 5ad1a47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/internal/services/web/app_service_environment_v3_data_source.go b/internal/services/web/app_service_environment_v3_data_source.go
@@ -201,8 +201,7 @@ func (r AppServiceEnvironmentV3DataSource) Read() sdk.ResourceFunc {
 				model.AllowNewPrivateEndpointConnections = *props.AllowNewPrivateEndpointConnections
 			}
 
-			inboundNetworkDependencies := &[]AppServiceV3InboundDependencies{}
-			inboundNetworkDependencies, err = flattenInboundNetworkDependencies(ctx, client, &id)
+			inboundNetworkDependencies, err := flattenInboundNetworkDependencies(ctx, client, &id)
 			if err != nil {
 				return err
 			}

diff --git a/internal/services/web/app_service_environment_v3_resource.go b/internal/services/web/app_service_environment_v3_resource.go
@@ -337,8 +337,7 @@ func (r AppServiceEnvironmentV3Resource) Read() sdk.ResourceFunc {
 				model.AllowNewPrivateEndpointConnections = *props.AllowNewPrivateEndpointConnections
 			}
 
-			inboundNetworkDependencies := &[]AppServiceV3InboundDependencies{}
-			inboundNetworkDependencies, err = flattenInboundNetworkDependencies(ctx, client, id)
+			inboundNetworkDependencies, err := flattenInboundNetworkDependencies(ctx, client, id)
 			if err != nil {
 				return err
 			}
@@ -469,7 +468,8 @@ func expandClusterSettingsModel(input []ClusterSettingModel) *[]web.NameValuePai
 
 func flattenInboundNetworkDependencies(ctx context.Context, client *web.AppServiceEnvironmentsClient, id *parse.AppServiceEnvironmentId) (*[]AppServiceV3InboundDependencies, error) {
 	var results []AppServiceV3InboundDependencies
-	for inboundNetworking, err := client.GetInboundNetworkDependenciesEndpointsComplete(ctx, id.ResourceGroup, id.HostingEnvironmentName); inboundNetworking.NotDone(); inboundNetworking.NextWithContext(ctx) {
+	inboundNetworking, err := client.GetInboundNetworkDependenciesEndpointsComplete(ctx, id.ResourceGroup, id.HostingEnvironmentName)
+	for inboundNetworking.NotDone() {
 		if err != nil {
 			return nil, fmt.Errorf("reading Inbound Network dependencies for %s: %+v", id, err)
 		}
@@ -487,6 +487,11 @@ func flattenInboundNetworkDependencies(ctx context.Context, client *web.AppServi
 		}
 
 		results = append(results, result)
+
+		err = inboundNetworking.NextWithContext(ctx)
+		if err != nil {
+			return nil, fmt.Errorf("reading paged results for Inbound Network Dependencies for %s: %+v", id, err)
+		}
 	}
 
 	return &results, nil