Skip to content

Commit c376c03

Browse files
committed
Updated the error message in microsoft365_user table and return the API error when they are need to be return
1 parent 5095e78 commit c376c03

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

microsoft365/table_microsoft365_organization.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func getSharePointSettings(ctx context.Context, d *plugin.QueryData, h *plugin.H
112112
settings, err := client.Admin().Sharepoint().Settings().Get(ctx, nil)
113113
if err != nil {
114114
logger.Error("microsoft365_organization.getSharePointSettings", "get_sharepoint_settings_error", err)
115-
return nil, nil
115+
return nil, err
116116
}
117117

118118
// Wrap in our info struct
@@ -138,7 +138,7 @@ func getAuthenticationSettings(ctx context.Context, d *plugin.QueryData, h *plug
138138
policy, err := client.Policies().AuthenticationMethodsPolicy().Get(ctx, nil)
139139
if err != nil {
140140
logger.Error("microsoft365_organization.getAuthenticationSettings", "get_auth_policy_error", err)
141-
return nil, nil
141+
return nil, err
142142
}
143143

144144
// Wrap in our info struct
@@ -164,7 +164,7 @@ func getSecurityDefaultEnforcementPolicy(ctx context.Context, d *plugin.QueryDat
164164
policy, err := client.Policies().IdentitySecurityDefaultsEnforcementPolicy().Get(ctx, nil)
165165
if err != nil {
166166
logger.Error("microsoft365_organization.getSecurityDefaultEnforcementPolicy", "get_security_defaults_error", err)
167-
return nil, nil
167+
return nil, err
168168
}
169169

170170
// Wrap in our info struct
@@ -190,7 +190,7 @@ func getSecuritySettings(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd
190190
security, err := client.Security().Get(ctx, nil)
191191
if err != nil {
192192
logger.Error("microsoft365_organization.getSecuritySettings", "get_security_settings_error", err)
193-
return nil, nil
193+
return nil, err
194194
}
195195

196196
// Wrap in our info struct

microsoft365/table_microsoft365_user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func listMicrosoft365Users(ctx context.Context, d *plugin.QueryData, _ *plugin.H
208208

209209
pageIterator, err := msgraphcore.NewPageIterator[models.Userable](result, adapter, models.CreateUserCollectionResponseFromDiscriminatorValue)
210210
if err != nil {
211-
logger.Error("listMicrosoft365Users", "create_iterator_instance_error", err)
211+
logger.Error("microsoft365_user.listMicrosoft365Users", "create_iterator_instance_error", err)
212212
return nil, err
213213
}
214214

@@ -221,7 +221,7 @@ func listMicrosoft365Users(ctx context.Context, d *plugin.QueryData, _ *plugin.H
221221
return d.RowsRemaining(ctx) != 0
222222
})
223223
if err != nil {
224-
logger.Error("listMicrosoft365Users", "paging_error", err)
224+
logger.Error("microsoft365_user.listMicrosoft365Users", "paging_error", err)
225225
return nil, err
226226
}
227227

0 commit comments

Comments
 (0)