Skip to content

Make az.guestconfiguration cmdlet support ARC senario #12036

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
VeryEarly merged 4 commits into from
Jun 9, 2020
Merged

Make az.guestconfiguration cmdlet support ARC senario #12036

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ab8686
support ARC senario
msft-gehuan Jun 1, 2020
2d2117c
support ARC senario -- add changelog
msft-gehuan Jun 1, 2020
ee074b9
upgrade guestconfiguration SDK version
msft-gehuan Jun 8, 2020
37ab3d7
re-record tests
msft-gehuan Jun 9, 2020
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
3 changes: 3 additions & 0 deletions src/GuestConfiguration/GuestConfiguration/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
-->
## Upcoming Release

## Version 0.10.8
Copy link
Collaborator

@VeryEarly VeryEarly Jun 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to update version, please move message under "upcoming release" section

Copy link
Contributor Author

@gehuang-dut gehuang-dut Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

* Support ARC machines

## Version 0.10.7
* Update references in .psd1 to use relative path

Expand Down
77 changes: 71 additions & 6 deletions src/GuestConfiguration/GuestConfiguration/Common/GuestConfigurationCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,18 +196,41 @@ protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailedByInitiativ
foreach (var gcPolicyAssignment in gcPolicyAssignmentsArray)
{
var reportGuid = CommonHelpers.GetReportGUIDFromID(gcPolicyAssignment.LatestReportId);
GuestConfigurationAssignmentReport gcrpVMReport = null;
GuestConfigurationAssignmentReport gcrpHCReport = null;
GuestConfigurationAssignmentReport gcrpReport = null;
if (gcPolicyAssignment.LatestReportId != null)
{
gcrpReport = GuestConfigurationClient.GuestConfigurationAssignmentReports.Get(resourceGroupName, gcPolicyAssignment.Configuration.Name, reportGuid, vmName);
//check Azure VM
try
{
gcrpVMReport = GuestConfigurationClient.GuestConfigurationAssignmentReports.Get(resourceGroupName, gcPolicyAssignment.Configuration.Name, reportGuid, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.NotFoundByReportId, reportGuid));
}

//check HybridCompute machine
try
{
gcrpHCReport = GuestConfigurationClient.GuestConfigurationHCRPAssignmentReports.Get(resourceGroupName, gcPolicyAssignment.Configuration.Name, reportGuid, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.NotFoundByReportId, reportGuid));
}

gcrpReport = gcrpVMReport != null ? gcrpVMReport : gcrpHCReport;
}


PolicyStatusDetailed policyDetailed = new PolicyStatusDetailed(gcrpReport, gcPolicyAssignment);
QueryOptions queryOptions = new QueryOptions();
queryOptions.Filter = string.Format("resourceGroup eq '{0}' and policyDefinitionAction eq 'deployifnotexists' and contains(ResourceId,'{1}')", resourceGroupName, vmName);
queryOptions.Filter = string.Format("PolicySetDefinitionName eq '{0}' and contains(ResourceId,'{1}')", gcPolicyAssignment.PolicySetDefinitionName, vmName);
queryOptions.OrderBy = "Timestamp desc";
queryOptions.Top = 1;
PolicyStatesQueryResults policyDbResults = PolicyInsightsClient.PolicyStates.ListQueryResultsForPolicySetDefinition("latest", DefaultContext.Subscription.Id, gcPolicyAssignment.PolicySetDefinitionName, queryOptions);
PolicyStatesQueryResults policyDbResults= PolicyInsightsClient.PolicyStates.ListQueryResultsForResourceGroup("latest", DefaultContext.Subscription.Id, resourceGroupName, queryOptions);
if (policyDbResults.Odatacount > 0 && policyDbResults.Value[0].IsCompliant.HasValue && !policyDbResults.Value[0].IsCompliant.Value)
{
policyDetailed.ComplianceStatus = "NonCompliant";
Expand Down Expand Up @@ -286,15 +309,34 @@ protected PolicyStatusDetailed GetPolicyStatusDetailedByReportId(string reportId
protected IEnumerable<GuestConfigurationAssignment> GetAllGCRPAssignments(string resourceGroupName, string vmName)
{
IEnumerable<GuestConfigurationAssignment> gcrpAssignments = null;
IEnumerable<GuestConfigurationAssignment> gcrpVMAssignments = null;
IEnumerable<GuestConfigurationAssignment> gcrpHCAssignments = null;
//check Azure VM
try
{
gcrpAssignments = GuestConfigurationClient.GuestConfigurationAssignments.List(resourceGroupName, vmName);
gcrpVMAssignments = GuestConfigurationClient.GuestConfigurationAssignments.List(resourceGroupName, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.InvalidRGOrVMName, resourceGroupName, vmName));
throw exception;
}

//check HybridCompute machine
try
{
gcrpHCAssignments = GuestConfigurationClient.GuestConfigurationHCRPAssignments.List(resourceGroupName, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.InvalidRGOrVMName, resourceGroupName, vmName));
}

gcrpAssignments = gcrpVMAssignments != null ? gcrpVMAssignments : gcrpHCAssignments;
if (gcrpAssignments == null)
{
throw new ErrorResponseException(StringResources.InvalidRGOrVMName);
}

return gcrpAssignments;
}

Expand Down Expand Up @@ -466,7 +508,30 @@ private IEnumerable<PolicyStatus> GetPolicyStatusHistoryForAssignments(string re

foreach (var gcPolicyAssignment in policyStatusesArray)
{
var gcrpReportss = GuestConfigurationClient.GuestConfigurationAssignmentReports.List(resourceGroupName, gcPolicyAssignment.Configuration.Name, vmName);
GuestConfigurationAssignmentReportList gcrpVMReportss = null;
GuestConfigurationAssignmentReportList gcrpHCReportss = null;

//check Azure VM
try
{
gcrpVMReportss = GuestConfigurationClient.GuestConfigurationAssignmentReports.List(resourceGroupName, gcPolicyAssignment.Configuration.Name, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.InvalidRGOrVMName, resourceGroupName, vmName));
}

//check HybridCompute machine
try
{
gcrpHCReportss = GuestConfigurationClient.GuestConfigurationHCRPAssignmentReports.List(resourceGroupName, gcPolicyAssignment.Configuration.Name, vmName);
}
catch (GuestConfigurationErrorResponseException exception) when (HttpStatusCode.NotFound.Equals(exception.Response.StatusCode))
{
this.WriteVerbose(string.Format(StringResources.InvalidRGOrVMName, resourceGroupName, vmName));
}

var gcrpReportss = gcrpVMReportss != null ? gcrpVMReportss : gcrpHCReportss;
var gcrpReportsList = gcrpReportss.Value;

if (isShowStatusChangeOnlyPresent)
Expand Down