Skip to content

Commit

Permalink
Merge pull request #227 from aztfmod/ben_examples
Browse files Browse the repository at this point in the history
Rolling back to azurerm 2.40
  • Loading branch information
arnaudlh authored Jan 14, 2021
2 parents 906b6a7 + 86783ed commit 1a06a7a
Show file tree
Hide file tree
Showing 97 changed files with 192 additions and 162 deletions.
1 change: 1 addition & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ You can customize the examples execution by modifying the variables as follow:
| terraform | >= 0.13 |
| azuread | ~> 1.0.0 |
| azurecaf | ~> 1.1.0 |
| azurerm | ~> 2.40.0 |
| external | ~> 1.2.0 |
| null | ~> 2.1.0 |
| random | ~> 2.2.1 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/app_gateway/101-private-public/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/app_insights/100-simple/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ resource_groups = {

keyvaults = {
test_client = {
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
#soft_delete_enabled = true
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
soft_delete_enabled = true
creation_policies = {
logged_in_user = {
# if the key is set to "logged_in_user" add the user running terraform in the keyvault policy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ resource_groups = {

keyvaults = {
test_client = { #KeyVault Key
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
#soft_delete_enabled = true
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
soft_delete_enabled = true
creation_policies = {
logged_in_user = {
# if the key is set to "logged_in_user" add the user running terraform in the keyvault policy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
8 changes: 4 additions & 4 deletions examples/azure_ad/201-groups-and-roles/configuration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ resource_groups = {

keyvaults = {
test_kv = {
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
#soft_delete_enabled = true
name = "testkv"
resource_group_key = "test"
sku_name = "standard"
soft_delete_enabled = true
creation_policies = {
logged_in_user = {
# if the key is set to "logged_in_user" add the user running terraform in the keyvault policy
Expand Down
2 changes: 1 addition & 1 deletion examples/azure_ad/201-groups-and-roles/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
keyvaults = {
jumpbox = {
name = "jumpbox_akv"
resource_group_key = "aks_jumpbox_re1"
sku_name = "premium"
#soft_delete_enabled = true
name = "jumpbox_akv"
resource_group_key = "aks_jumpbox_re1"
sku_name = "premium"
soft_delete_enabled = true

creation_policies = {
logged_in_user = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/datalake/101-datalake-storage/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/keyvault/101-keyvault-policies/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
8 changes: 4 additions & 4 deletions examples/machine_learning/100-aml/configuration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ storage_accounts = {
#
keyvaults = {
aml_secrets = {
name = "amlsecrets"
resource_group_key = "dap_azure_ml_re1"
sku_name = "premium"
#soft_delete_enabled = true
name = "amlsecrets"
resource_group_key = "dap_azure_ml_re1"
sku_name = "premium"
soft_delete_enabled = true
}
}
2 changes: 1 addition & 1 deletion examples/machine_learning/100-aml/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
8 changes: 4 additions & 4 deletions examples/machine_learning/101-aml-vnet/configuration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ storage_accounts = {
#
keyvaults = {
aml_secrets = {
name = "amlsecrets"
resource_group_key = "dap_azure_ml_re1"
sku_name = "premium"
#soft_delete_enabled = true
name = "amlsecrets"
resource_group_key = "dap_azure_ml_re1"
sku_name = "premium"
soft_delete_enabled = true
}
}
2 changes: 1 addition & 1 deletion examples/machine_learning/101-aml-vnet/standalone/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.42.0"
version = "~> 2.40.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Loading

0 comments on commit 1a06a7a

Please sign in to comment.