Skip to content

Adds autorest directive to prevent null response objects to output streams via WriteObject #2226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 9, 2023
Merged

Adds autorest directive to prevent null response objects to output streams via WriteObject #2226

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e49b35
Added directive to prevent null response objects
timayabi2020 Aug 7, 2023
f9e254c
Updated directive as per comment
timayabi2020 Aug 8, 2023
fe7bd45
Update src/readme.graph.md
timayabi2020 Aug 8, 2023
e5d7bd8
Updated regex to include changes in beta cs files
timayabi2020 Aug 8, 2023
71ba6d0
Merge branch 'dev' into fix-null-response
timayabi2020 Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/readme.graph.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,20 @@ directive:
let errorDetailsRegex = /(ErrorDetails\s*=\s*)(new.*ErrorDetails\(message\).*)/gmi
$ = $.replace(errorDetailsRegex, '$1await this.GetErrorDetailsAsync((await response)?.Error, responseMessage)');

// Prevents null response objects to the output stream for scenarios where response is a model type
let responseTypeRegex = /global::System.Threading.Tasks.Task<Microsoft.Graph(.|.Beta.)PowerShell.Models.\w*> \w*\)[^]*?(WriteObject.*(await response).*;)/gm
var writeObjectRegex = /(WriteObject.*(await response).*;)/gm
var responseTypeRegexMatch = $.match(responseTypeRegex);
if(responseTypeRegexMatch){
responseTypeRegexMatch.forEach((item)=>{
var writeObjectRegexMatch = writeObjectRegex.exec($);
if(writeObjectRegexMatch){
var newContent = item.replace(writeObjectRegex, `var result = ${writeObjectRegexMatch[2]}; if(result!=null){WriteObject(result);}`)
$ = $.replace(item, newContent);
}
});
}

return $;
}

Expand Down