Граф коммитов

21 Коммитов

Автор SHA1 Сообщение Дата
RKSelvi 8b8ecd33ef
Modified Shared Services environment & added new MS-VDI environment - In support for this new environment changes have been made to support all Azure environments (#163)
* Update dockerimage.yml

* Removed build.yml file

* Run toolkit container

* update

* fix

* mm

* bb

* nn

* qq

* ww

* ee

* rr

* pp

* aa

* Added storageblobURL to resources

* Added StorageblobURL to resources and env variable

* added storageblobURL

* added storageblobURL

* Commented out the Azure Provider feature Bastion

* added condition for resources gov vs com

* changed old GUID for Az Policy

* New change for gov. But need to adjust for com

* changed linux agent version number

* 1

* 2

* 3

* 4

* added logic for the ethernet

* added the ADDS module back after fixing script

* Updated modules IIS, SQLServerAlwaysOn,VM Scale sets for storagebloburl

* 5

* 6

* 7

* aa

* jj

* Update

* ll

* ll

* mm

* vv

* cv

* df

* Added logic for the NSG flow logs com vs gov

* changes to merge conflicts

* fixed conflict merge

* ee

* bnm

* yh

* vv

* sd

* bn

* xx

* vb

* tt

* ss

* zz

* remove sub ids

* aa

* updates

* ff

* updates

* tt

* updates

* mm

* rr

* Added info Azure cli to remove legal hold & other misc updates

* Fix typos

* Moved env variables for toolkit & subscription in the code

* ss

* kk

* Adding Az.Accounts to dockerfile

* cc

* ii

* ll

* yy

* vv

* cc

* ee

* Added all azure regions to AzureBastion module

* nn

* gg

* tt

* dd

* Adding install module in the code itself

* jk

* Added condition to connect to azure & install modules for dev ops

* qaz

* wsx

* bb

* Commented env variables in debug

* ff

* HUB vnet module

* changed MSVDI to connect to shrd svcs hub

* dummy values for config files

* changed para for msvdi with shrd svcs

* do not need to lowercase regions so commented out

* added variables to file so don't need to input

* new prereq script. Not necessary to run

* readme for shared services

* updated readme

* Update

* edc

* Topological path for DevOps pipeline

* test

* Update

* Running individual modules

* Updates

* updated comments

* new modules

* Create dockflow.yml

* Updates to SharedServices & MS-VDI readme

* qq

* Added more info on password restrictions

* Update

* 56

* 985

* 12

* 67

* 45

* 12

* 678

* 12

* 456

* tt

* 12

* 12

* 1q23

* 125

* 343

* 25

* 345

* 2134

* 12

* 2

* 454

* 124

* 312

* 12

* 23

* 34

* mylife

* q3

* 12

* 24

* q1234

* 696

* qw23

* q12e4

* w5

* 213

* 2198

* qw

* 255

* 89876

* 447

* 3242

* 89

* 43234

* 2342342

* q4eq3214

* 87

* 323

* 2345

* 123456

* New version of code for github action

* updates to files

* updated av set infoo

* 789234

* 234143

* 24223412342

* Teardown test

* Copied workflow from Jack's branch

* new changes

* update to readme in shrdsvcs

* new document for github actions

* 234

* adding changes to script for cleanup

* update readme

* update readme

* sdf

* 235

* 123

* 2345

* new changes to readme

* new changes to readme

* readme

* readme

* readmeupdate

* readme

* red

* read

* readme

* 1234

* readme

* 7897894

* update readme shrd svcs

* 345

* new changes to readme

* removed the cleanup and added to different script

* new change to clean up script

* Updates to shared services readme

* update

* 234

* Added passing parameters for subscription & tenant to parameters.json for shared services

* update for networkwatcher

* removed statement in av sets

* Test GH Actions

* Test GH Actions

* Update

* Update

* Cleared values

* Update

* changes to dockerfile version.

* Update

* Update readme

* Update README.md

* Updates to docs - added SPN info

Co-authored-by: jvalley19 <52843322+jvalley19@users.noreply.github.com>
2020-04-30 09:37:04 -04:00
Kungumaraj Nachimuthu d66ef4a76e Toolkit Config Change and Validation RG Enhancement (#134)
* Completed the initial implementation.

* Finalized the changes and tested

* Changes based on feedback from today's review

* Changes post running tested.

* Changes to optimize the code.
2019-09-19 21:49:54 -07:00
Kungumaraj Nachimuthu afdebb4d06 AKS and On-Premise Archetype updates (#112)
* Changes based on feedback. First round of corrections.

* Fix added for multi-subscription deployment

* Added Debug argument for troubleshooting pipeline

* Reset the context change after storage setup

* Minor update to fix type

* Added Debug flag

* Minor update

* Update to avoid switching subscription when in validation mode

* Debugging consolidation script

* More debugging

* Debugging continued

* Debugging continued 2

* Removed extra Cmdlet that pollutes the outputs

* Logging to troubleshoot invalid cache in pipeline added

* Applied a fix for AzureDevOps Cache implementation to cache objects arrays and object

* Convert cache string to object when possible

* More logging added

* Test-Json  logic may be flawed. Debugging it.

* Debug

* Pipeline bootstrap var added

* Debugging failed module - AKS

* Merged the rootcert.ps1 and rootcert.sh

* Debugging On-Prem Archetype

* Debugging On-Prem

* Feedback based on recent changes.

* Changes based on PR feedback

* Changed based on PR feedback

* Added Debug for storage accounts

* Preserving the context after bootstrap.

* Added the missing parameter

* Initialize and Teardown of Validation Resource Group logic added

* Excluding the dependency on the SetupValidationResourceGroup job because it was removed.

* Removed orphaned dependencies

* Added missing mode parameter

* Fixed  invalid function name

* Validation Resource Group default location set

* Passing the validation resource group created based on archetype instance name

* Missing variable fixed

* Missing parameter is passed to the method

* ResourceGroupName for validation RG is reset

* Minor change to validation group name

* Minor updates

* Removed the constrain to switch subscription on deploy mode only

* Setup and Teardown testing in the same job

* Resource Group name being reset on delete

* Commented out the write-host used for debugging

* Destroy the validation resource group at the end

* Setup of validation resource group is now merged with deployment resource group setup logic.

* Typo in function name

* typo in function name fixed

* Added debug lines

* Removed the extra condition that prevented the creation of rg in validation mode

* Fix for teardown of rg

* Running SecurityCenter module in debug mode

* Fix for UpdateAzureFirewall added

* Storing outputs as objects instead of hashtables.

* Avoiding ConvertTo-Json due to serialization problem

* Fix applied for Output conversion

* Comments added.

* Cleaned up comments.

* Cleaned up based on feedback item

* Change to AzureFirewall Id to reference the output

* Fixed the incorrect token

* Running storage module in debug mode

* Empty string values need to evaluate to false

* Modified cache key retrieval logic

* Validation of resource group moved inside InvokeARMOperation method

* Minor var name fix

* Debugging UpdateAzFw module

* Teardown should also create the validation resource group

* Using different secrets group

* Updated the service conn. profile

* Updated the CreateRootCertificate module

* Pipeline will now use test var group

* OnPremises pipeline's sc updated

* Updated the path after on-premises folder name change

* Added isOutput=true to bootstrap initialize

* Updated Shared Services Pipeline yaml for testing

* Shared Services OnPrem Extension updated

* Adding Debug to Azfw for troubleshooting

* P2S root certificate generation script fixed

* Debug added for vgw

* Updated the deployment name for Shared Services without OnPremises extension for testing

* Debug added for OnPremises extension for storage account

* Debug added to all modules

* Fixed indention and Null Guid issue

* Location updated

* Debugging all modules

* Minor fix

* Removed isOutput from the PowerShell script

* Fixed Test-JsonContent

* Enabled artifacts storage account

* Reverted the changes to pipeline yaml files

* Reverted changes to pipeline yaml

* Revert the change to deployment name in Shared Services

* Reverted the artifacts storage account name

* Removed comments in Test-JsonContent

* Merging the changes from AKS & OnPremises (#121)

* Continuing Shared Services deployment

* Updated the order of execution of the components

* Updated location of the Shared Services Archetype

* Modified the code to use the location from the parameters file or module configuration and not subscription

* Removed additional logic for location of the resource group and reusing the existing location var

* Updated the parameters value being passed for Disk Encryption module

* Accounting for output of simple data types

* Using Test Var Group

* Updated the SC

* Debugging EventHub

* Changed the order of execution of AKS LandingZone in pipeline

* Reordering the modules

* AKS deployment

* Fix

* Added a new rule to the firewall

* Reverted changes before PR submission

* Removed the additional Debug flag during invocation

* Reverting the ArtifactsStorageAccount and making it disabled

* Reverting the changes to Parameters.json for OnPremises Extended version

* Reverting Artifacts Storage Account Name.

* Reverting the parameters file in Shared Service Non-Extended Version

* Added RBAC to AKS

* Merging deltas / updates to AKS-OnPrem-Feedback Branch (#129)

* Updated the pipeline to run in MS Subscription

* Fixed the name of the var group

* Updated the region.

* Minor changes as per discussion

* Added NSG flow module to the archetypes - AKS and OnPremises

* Adding the enable.flow.logs under NetworkSecurityGroups module. This will be added again after merge vnext post jcotillo/governance-stage branch merge to vnext.

* Reverted back the secret group name and service connection name

* Added the Enable NSG Flow Logs module to pipeline yaml file.

* Split the AKS into three stage deployment - included ApplyGovernance stage

* Minor updates to stage names

* Updates from today's discussion

* Corrected the DeployEnvironment Stage

* Minor update

* Added the missing switch for TearDownValidationResourceGroup

* Shared Services non extended version updated

* Updates to add diagnostic settings to EventHub

* PR finalized.
2019-09-09 08:24:03 -07:00
Jorge Cotillo c349884086 Task 7157, tear down an environment (#123)
* Task 757, tear down an environment

* fixed cross subscription validation
2019-09-04 12:06:02 -07:00
Jorge Cotillo 85f24aca1f Bug fix and task implementation (#118)
* fixed bugs: 7105, 7107, implemented task: 7088

* enabled public ip on dc, updated hard coded onprem organization name

* Disabled certificate creation in onprem. added blob upload inline script

* Updated artifacts reference, included onprem deployment instance name
2019-08-29 08:24:42 -05:00
Jorge Cotillo cfd3849b34 replaced extension 2019-08-26 08:14:39 -07:00
Jorge Cotillo e514547774 Jcotillo/ntier iaas v2 (#109)
* initial push of ntier iaas modules

* added azure bastion subnet

* updated landing zone dependencies, added topological sort

* added topological sort implementation

* added project file

* added newtonsoft package

* added todo comment

* added circular reference verification on topological sort

* moved landing zone to its own folder. added domain join extension to vm template

* added joined to domain extension on VMSS

* renamed sql server always on template and added join domain extension in vmss

* fixed unit test

* fixed all unit tests

* added IIS template

* added parameters to ntier-iaas archetype

* finished orchestration of ntier-iaas

* fixed unit test

* added missing files

* updated parameter values

* fix access token retrieval

* added missing module definitions
2019-08-23 22:31:50 -07:00
Kungumaraj Nachimuthu 409770cc0b Error parser logic fixed (#108) 2019-08-21 16:38:34 -07:00
Jorge Cotillo 546f201162 fixed Get-Exception cmdlet invocation 2019-08-17 22:16:16 -07:00
Jorge Cotillo b98130c5cc added exception analyzer to ARM REST API call 2019-08-17 15:08:07 -07:00
Jorge Cotillo 3dd8eb7b83 updated adds vm name 2019-08-16 20:27:56 -07:00
Jorge Cotillo cb084c16b9 enhanced error message details 2019-08-16 20:02:03 -07:00
Jorge Cotillo bdb73cdf37 fixed - expression syntax 2019-08-16 16:57:20 -07:00
Jorge Cotillo 5fb27d9675
Added exponential backoff logic (#103)
* output az graph query

* Update pipeline.yml for Azure Pipelines

* Restore pipeline stages

* added exponential backoff

* added exponential backoff

* added debug function
2019-08-16 16:42:46 -07:00
Jorge Cotillo ba3cce2bdb added logic for more than one resource ids 2019-08-16 01:10:14 -07:00
Jorge Cotillo 31e188900e removed additional api calls 2019-08-16 00:42:41 -07:00
Jorge Cotillo 735b05069b Modularization of Virtual Machine templates (#101)
* initial commit

* moved parameters file outside of the module

* initial commit of new Jumpbox design

* added encryption task

* removed unnecessary parameters

* initial implementation of encryption using kek

* fixed output storage from custom script

* Added format data disks DSC

* added adds dsc that excludes disk formatting

* removed dsc folder

* added policy and rbac tests

* removed 0 file

* updated template static test

* updated ad and adds templates

* updated non-extended shared services environment

* updated display names

* added enable key vault service endpoint task

* fix validate dependency

* fixed task name

* fixed module definition reference

* fixed azure firewall api version

* fixed pipeline and added new environment variable

* updated azure firewall api version

* fixed key vault access policy

* updated parameters comment

* updated zones copy loop

* updated zones condition

* fixed parameters.json error

* removed double quote encoding

* added string array to zones

* updated description name

* updated output reference to lowercase

* enabled debug on AD encryption

* enabled debug on AD encryption

* moved enabling service endpoint of Key Vault after VM deployment

* disabled validation stage

* enabled pipelines

* added SQL Analytics solution

* removed uneeded parameter

* added disk verification before formatting a disk

* updated DSC code

* removed data jumpbox datadisk

* added drive letter parameter to adds

* added workaround to prevent storage initialization multiple times

* added get public IP ps1

* removed finally block

* updated get ip ps1 path

* updated network rules copy loop:

* removed networkacls from initial key vault deployment

* explicit set of ps1 argument

* updated initialize file

* fixed return type

* fixed return type from getSasToken function

* added ashashtable to convert from json cmdlet

* added networkAcls with IP whitelisting

* added test-jsoncontent to helper

* added debug

* updated storage account details cache value

* removed debug flag

* updated set variable syntax

* fixed variable name

* added -Compress to JSON string creation

* updated default action on kv networkacls

* added global variable

* updated variable name

* Update pipeline.yml for Azure Pipelines

* moved org name as env variable

* update pipeline

* Update pipeline.yml for Azure Pipelines

* added additional logging info

* temp reduced validation tasks

* fixed dependency

* removed global variable from pipeline

* enabled debug on deployment

* enabled debug

* moved similar tasks into same job

* updated shared services extended pipeline

* removed write-host

* enabled multi-stage jobs

* added env variables

* updated variable set

* removed comments from inline script

* updated pipeline, pass variable between jobs

* added missing environment variable retrieval

* removed unnecessary write-host

* added vnet dependency

* updated job output dependency name

* added multi-job variable

* updated modules path of shared services onprem extension

* fixed parameters

* removed active directory reference

* added Virtual Network dependency

* added spn access policy

* moved dns server as a separate task
2019-08-15 22:40:53 -07:00
Jorge Cotillo 61aae825fd
Shared services - without extending onpremises Active Directory (#90)
* initial commit

* updated orchestration and pipeline for shared services that doesn't extends onprem

* removed onpremises references

* fixed cyclic reference

* added missing parameters

* added missing parameters

* added debug on get access token

* fixed if condition

* Update pipeline.yml for Azure Pipelines

* Update pipeline.yml for Azure Pipelines

* Update pipeline.yml for Azure Pipelines

* removed break condition

* added ActiveDirectory module deployment

* Update pipeline.yml for Azure Pipelines

* added dns server

* moved vnet before jumpbox

* fixed DNS Server IPs

* removed invalid dependency

* removed invalid dns server

* moved sas token to part of uri

* added back all resources

* Update pipeline.yml for Azure Pipelines

* updated route table module

* added jobs to shared services pipeline

* removed repeated job name

* moved upload task into artifacts storage

* fixed dependency
2019-07-23 23:57:20 -07:00
Kungumaraj Nachimuthu 9248c009f5 Fixes for multi-tenant access token and error message for user not lo… (#80)
* Fixes for multi-tenant access token and error message for user not logged in

* Minor update based on feedback
2019-07-12 16:10:57 -07:00
Jorge Cotillo 7a33fbccc5
ASE/SQL DB pipeline (#73)
* moved hardcoded parameters to reference tokens

* updated org name

* added missing location

* downgrade api versions - adds

* updated adds vm name

* Update pipeline.yml for Azure Pipelines

* Update pipeline.yml for Azure Pipelines

* temp update of self hosted agent name

* restablish self hosted agent name

* updated organization name

* added dependsOn to landing zone pipeline

* fixed module configuration names

* fixed missing pipeline property

* fixed yaml syntax

* fixed dependson

* fixed path

* fixed deployment name

* fixed parameter format

* set diagnostic storage access key as secured string

* removed service endpoint on storage account

* fixed output references

* fixed parameter name

* Moved phased wait log to write-debug

* fixed travis path
2019-07-06 14:08:46 -07:00
Jorge Cotillo fc1327053c
ASE sql archetype (#71)
* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* Fixes to pester tests applied

* added baseline archetype

* added Nist controls

* added new NIST policies

* update settings

* fixed repeated policy display name

* Update Archetype Instance Json with Script Output (#65)

* Completed the implementation of the archetype instance update with script outpout

* Created script to create / use a subscription and associate it to a new / existing management group

* SQL database  (#64)

* Add files via upload

* Delete _README.md

* Add files via upload

* Delete sql.database.deploy.json

* Delete sql.database.parameters.json

* Add files via upload

* Delete sql.database.azuredevops.ci.yaml

* Add files via upload

* Add files via upload

* Delete git_placeholder.md

* Update module.tests.ps1

* Update module.tests.ps1

* added new NIST policies

* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* Fixes to pester tests applied

* added baseline archetype

* Completed the implementation of the archetype instance update with script outpout

* Created script to create / use a subscription and associate it to a new / existing management group

* update settings

* fixed repeated policy display name

* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* Fixes to pester tests applied

* added baseline archetype

* Completed the implementation of the archetype instance update with script outpout

* Created script to create / use a subscription and associate it to a new / existing management group

* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* Completed the implementation of the archetype instance update with script outpout

* Completed the implementation of the archetype instance update with script outpout

* Created script to create / use a subscription and associate it to a new / existing management group

* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* added baseline archetype

* Completed the implementation of the archetype instance update with script outpout

* initial commit that creates the new archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* initial commit that creates the new archetype

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* added infra baseline to ASE/SQL deployment

* added vnet peering module configurations

* set app service plan and webapp as generic modules, added ASE orchestration modules to archetype

* Completed the implementation of the archetype instance update with script outpout

* Resolved a conflict

* removed subscription verification

* running custom script

* cleaned up variables

* Tested custom script execution

* Updated the subscription name for testing

* Check for null subscript and tenant id added

* Added debug for pipeline failures

* Updated Add-SubscriptionAndTenantIds to run only for archetype configuration

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* Throw more information when script execution fails

* finished NIST Controls

* moved baseline configuration to ASE-SQL

* fixed common file path reference

* updated Shared Services pipeline

* updated file name - case sensitive issue

* updated validation rg creation

* Changed the tenant id and subscription id in New-AzureResourceManagerDeployment to string

* added workload baseline pipeline

* added ase sql pipeline

* fixed invalid subscription id saved to resource state

* updated variable name

* Reference Functions scope changed to Module Configuration Object (#66)

* Initial changes

* Completed the implementation

* Cleaned up prior to PR submission

* adding LandingZone

* updated pipeline paths

* updated pipeline paths

* updated parameters file

* correcting case

* removed folders

* placing files back

* delete files

* put files back

* Fix to resolving reference functions

* fixed casing

* fixed casing in code

* updated modules to Modules in pipeline.yml

* Updated config folder name

* Updated config folder name

* fixed casing

* added vpn shared key

* finished ASE SQLDB landing zone

* added ASE-SQL archetype

* replaced hardcoded resource group name

* fixed relative path

* fixed automation account alias

* fixed relative paths

* renamed ADDS to ActiveDirectoryDomainServices

* fixed onprem vgw name

* fixed artifacts storage account name

* fixed custom extensions casing

* enabled adds deployment

* updated on-premises AD information

* updated Key Vault name to pass deployment error

* fixed bug on resource group creation

* updated adds vm name and set pipeline timeout to 0

* updated ADDS address start

* updated ADDS name

* updated dockerignore

* Fixed the pester test failure
2019-07-05 14:33:50 -07:00