Skip to content

Commit

Permalink
[Enhancement] GR8 V1 Update control for Network diagram and high leve…
Browse files Browse the repository at this point in the history
…l design doc (#213)

* ItemName update

* updating for  required document

* adding new additional module for the control

* test deploy

* messages update

* changed storage filename

* workflow main

* msg update

* deleted commented line

* removed extra line
  • Loading branch information
dutt0 authored Sep 19, 2024
1 parent 29c1150 commit 585649b
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 8 deletions.
Binary file modified psmodules/GR-Common.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion setup/IaC/modules/automationaccount.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ resource module11 'modules' = if (newDeployment || updatePSModules) {
properties: {
contentLink: {
uri: '${ModuleBaseURL}/GR-Common.zip'
version: '1.1.20'
version: '1.1.21'
}
}
}
Expand Down
31 changes: 30 additions & 1 deletion setup/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,36 @@
"localVariables": [
{
"Name": "DocumentName",
"Value": "ConfirmNetworkDiagramExists"
"Value": "NetworkArchitectureDiagram"
},
{
"Name": "itsgcode",
"Value": "SC7"
}
]
},
{
"ModuleName": "Check-DocumentExistsInStorage",
"Control": "Guardrails8",
"ModuleType": "Builtin",
"Status": "Enabled",
"Required": "True",
"Profiles": [1, 2, 3, 4, 5, 6],
"Script": "Check-DocumentExistsInStorage -StorageAccountName $vars.storageaccountname -ContainerName $vars.containerName -ResourceGroupName $ResourceGroupName -SubscriptionID $SubID -DocumentName $vars.DocumentName -ControlName $msgTable.CtrName8 -ItemName $msgTable.highLevelDesign -MsgTable $msgTable -ReportTime $ReportTime -itsgcode $vars.itsgcode -CloudUsageProfiles $cloudUsageProfilesString -ModuleProfiles $ModuleProfilesString",
"variables": [
{
"Name": "storageAccountName",
"Value": "StorageAccountName"
},
{
"Name": "containerName",
"Value": "ContainerName"
}
],
"localVariables": [
{
"Name": "DocumentName",
"Value": "HighLevelDesign"
},
{
"Name": "itsgcode",
Expand Down
3 changes: 2 additions & 1 deletion src/GuardRails-Localization/GR-ComplianceChecks-Msgs.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ noUDRMitigation = Please apply a custom route to this subnet, pointing to a virt
subnetExcludedByTag = Subnet '{0}' is excluded from compliance because VNET '{1}' has tag '{2}' with a value of 'true'
subnetExcludedByReservedName = Subnet '{0}' is excluded from compliance because its name is in the reserved subnet list '{1}'
subnetExcludedByVNET = Subnet '{0}' is not being checked for compliance because the VNET '{1}' has tag '{2}' with a value of 'true'
networkDiagram = Network architecture diagram
networkDiagram = Network architecture diagram
highLevelDesign = High level design documentation
noSubnets = No subnets found in the subscription.
cloudInfrastructureDeployGuide = Cloud Infrastructure Deployment Guide or Applicable Landing Zone Details
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ noUDRMitigation = Veuillez appliquer une route personnalisée à ce sous-réseau
subnetExcludedByTag = Subnet '{0}' is excluded from compliance because VNET '{1}' has tag '{2}' with a value of 'true'
subnetExcludedByReservedName = Subnet '{0}' is excluded from compliance because its name is in the reserved subnet list '{1}'
subnetExcludedByVNET = Subnet '{0}' is not being checked for compliance because the VNET '{1}' has tag '{2}' with a value of 'true'
networkDiagram = Diagramme d'architecture réseau
networkDiagram = Diagramme d'architecture réseau
highLevelDesign = Documentation de Conception de haut niveau
noSubnets = Aucun sous-réseau n'est présent.
cloudInfrastructureDeployGuide = Guide de déploiement de l'infrastructure cloud ou détails de la zone d'atterrissage applicable
Expand Down Expand Up @@ -236,8 +237,9 @@ bgAccountNoManager = Le compte BG {0} n'a pas de gestionnaire
bgBothHaveManager = Les deux comptes brise-glace ont un gestionnaire
# GR-Common
procedureFileFound = Compliant. Required file has been uploaded for review by Cloud Security Compliance assessors. '{0}' found.
procedureFileNotFound = Non conforme. N'a pas trouvé '{0}' créer et télécharger le fichier approprié dans le conteneur '{1}' dans le compte de stockage '{2}' pour devenir conforme.
procedureFileFound = Conforme. Le fichier requis a été téléchargé pour examen par les évaluateurs de Conformité à la sécurité infonuagique. « {0} » trouvé.
procedureFileNotFound = Non conforme. N'a pas trouvé « {0} » créer et télécharger le fichier approprié dans le conteneur « {1} » dans le compte de stockage « {2} » pour devenir conforme.
procedureFileDataInvalid = Le(s) fichier(s) d'administrateur général contiennent des noms principaux d'utilisateur non valides. Assurez-vous que les noms principaux d'utilisateur commencent par un trait d'union et tapez chacun d'eux sur une nouvelle ligne.
globalAdminFileFound = Fichier {0} trouvé dans le conteneur.
Expand Down
2 changes: 1 addition & 1 deletion src/Guardrails-Common/GR-Common.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
RootModule = 'GR-Common'

# Version number of this module.
ModuleVersion = '1.1.20'
ModuleVersion = '1.1.21'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
2 changes: 1 addition & 1 deletion src/Guardrails-Common/GR-Common.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ function Check-DocumentExistsInStorage {
else {
# no blob with the name $attestationFileName was found in the specified storage account
$docMissing = $true
$commentsArray += $msgTable.procedureFileNotFound -f $ItemName, $DocumentName[0], $ContainerName, $StorageAccountName
$commentsArray += $msgTable.procedureFileNotFound -f $ItemName, $ContainerName, $StorageAccountName
}

$Comments = $commentsArray -join ";"
Expand Down

0 comments on commit 585649b

Please sign in to comment.