Skip to content

Commit

Permalink
Updates for v0.1.2 release (#65)
Browse files Browse the repository at this point in the history
* Update readme for v0.1.2 release

* Ignore Visual Studio Code config

* Fix enums and use mode from source
  • Loading branch information
Kevin Rowlandson authored Mar 31, 2021
1 parent fbbdd3a commit 96be8a1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ class PolicyAssignmentProperties : ESLTBase {
$this.parameters = $that.parameters ?? $this.parameters
$this.description = $that.description ?? $that.displayName
$this.metadata = $that.metadata ?? $this.metadata
$this.enforcementMode = [PolicyAssignmentPropertiesEnforcementMode]($that.enforcementMode ?? $this.enforcementMode)
$this.enforcementMode = ([PolicyAssignmentPropertiesEnforcementMode]($that.enforcementMode ?? $this.enforcementMode)).ToString()
}

}
Expand All @@ -334,7 +334,7 @@ class PolicyAssignmentIdentity : ESLTBase {
PolicyAssignmentIdentity(): base() {}

PolicyAssignmentIdentity([Object]$that): base() {
$this.type = [PolicyAssignmentIdentityType]($that.type ?? $this.type)
$this.type = ([PolicyAssignmentIdentityType]($that.type ?? $this.type)).ToString()
}

}
Expand All @@ -351,8 +351,8 @@ class PolicyDefinitionProperties : ESLTBase {
PolicyDefinitionProperties(): base() {}

PolicyDefinitionProperties([Object]$that): base() {
$this.policyType = [PolicySetDefinitionPropertiesPolicyType]($that.policyType ?? $this.policyType)
$this.mode = [PolicyDefinitionPropertiesMode]($that.mode)
$this.policyType = ([PolicySetDefinitionPropertiesPolicyType]($that.policyType ?? $this.policyType)).ToString()
$this.mode = ([PolicyDefinitionPropertiesMode]($that.mode)).ToString()
$this.displayName = $that.displayName
$this.description = $that.description ?? $that.displayName
$this.metadata = $that.metadata ?? $this.metadata
Expand Down Expand Up @@ -410,7 +410,7 @@ class PolicySetDefinitionProperties : ESLTBase {
PolicySetDefinitionProperties(): base() {}

PolicySetDefinitionProperties([Object]$that): base() {
$this.policyType = [PolicySetDefinitionPropertiesPolicyType]($that.policyType ?? $this.policyType)
$this.policyType = ([PolicySetDefinitionPropertiesPolicyType]($that.policyType ?? $this.policyType)).ToString()
$this.displayName = $that.displayName ?? ""
$this.description = $that.description ?? $that.displayName
$this.metadata = $that.metadata ?? $this.metadata
Expand Down Expand Up @@ -507,7 +507,6 @@ class ArmTemplateResource : ESLTBase {
$this.location = "`${default_location}"
}
if ($this.type -eq "Microsoft.Authorization/policyDefinitions") {
$this.properties.mode = "All"
$this.properties.policyType = "Custom"
}
if ($this.type -eq "Microsoft.Authorization/policySetDefinitions") {
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ override.tf.json

# Ignore macOS .DS_Store files which are generated automatically by Finder.
.DS_Store

# Ignore Visual Studio Code config
**/.vscode/*
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<br>

[![Build Status](https://dev.azure.com/mscet/CAE-ESTF/_apis/build/status/Tests/E2E?branchName=main)](https://dev.azure.com/mscet/CAE-ESTF/_build/latest?definitionId=26&branchName=main)
![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/Azure/terraform-azurerm-caf-enterprise-scale?style=flat&logo=github)

## Documentation

Expand All @@ -23,6 +24,7 @@ For detailed information about how to use, configure and extend this module, ple
- [Deploy Default Configuration][wiki_deploy_default_configuration]
- [Deploy Demo Landing Zone Archetypes][wiki_deploy_demo_landing_zone_archetypes]
- [Deploy Custom Landing Zone Archetypes][wiki_deploy_custom_landing_zone_archetypes]
- [Deploy Using Module Nesting][wiki_deploy_using_module_nesting]
- [Frequently Asked Questions][wiki_frequently_asked_questions]
- [Troubleshooting][wiki_troubleshooting]
- [Contributing][wiki_contributing]
Expand Down Expand Up @@ -79,7 +81,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = ">= 2.34.0"
version = ">= 2.46.1"
}
}
}
Expand Down Expand Up @@ -112,7 +114,7 @@ variable "root_name" {
module "enterprise_scale" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "0.1.1"
version = "0.1.2"
root_parent_id = data.azurerm_client_config.current.tenant_id
root_id = var.root_id
Expand Down Expand Up @@ -174,6 +176,7 @@ module "enterprise_scale" {
[wiki_deploy_default_configuration]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Deploy-Default-Configuration "Wiki - Deploy Default Configuration"
[wiki_deploy_demo_landing_zone_archetypes]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Deploy-Demo-Landing-Zone-Archetypes "Wiki - Deploy Demo Landing Zone Archetypes"
[wiki_deploy_custom_landing_zone_archetypes]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Deploy-Custom-Landing-Zone-Archetypes "Wiki - Deploy Custom Landing Zone Archetypes"
[wiki_deploy_using_module_nesting]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Deploy-Using-Module-Nesting "Wiki - Deploy Using Module Nesting"
[wiki_frequently_asked_questions]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/Frequently-Asked-Questions "Wiki - Frequently Asked Questions"
[wiki_troubleshooting]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/Troubleshooting "Wiki - Troubleshooting"
[wiki_contributing]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/Contributing "Wiki - Contributing"
Expand Down

0 comments on commit 96be8a1

Please sign in to comment.