Skip to content

Commit 9862e9a

Browse files
kumarvnakumarvna
authored
Merge pull request #1 from kumarvna/develop
adding terraform v0.15 support
2 parents 104de1b + d414a67 commit 9862e9a

File tree

8 files changed

+45
-40
lines changed

8 files changed

+45
-40
lines changed

‎README.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ Type of resources are supported:
1818
```hcl
1919
module "vnet" {
2020
source = "kumarvna/vnet/azurerm"
21-
version = "2.0.0"
21+
version = "2.1.0"
2222
2323
# By default, this module will not create a resource group, proivde the name here
2424
# to use an existing resource group, specify the existing resource group name,
2525
# and set the argument to `create_resource_group = true`. Location will be same as existing RG.
26-
create_resource_group = true
27-
resource_group_name = "rg-demo-westeurope-01"
28-
vnetwork_name = "vnet-demo-westeurope-001"
26+
resource_group_name = "rg-shared-westeurope-02"
27+
vnetwork_name = "vnet-shared-hub-westeurope-002"
2928
location = "westeurope"
3029
vnet_address_space = ["10.1.0.0/16"]
3130
firewall_subnet_address_prefix = ["10.1.0.0/26"]
3231
gateway_subnet_address_prefix = ["10.1.1.0/27"]
32+
create_network_watcher = false
3333
3434
# Adding Standard DDoS Plan, and custom DNS servers (Optional)
35-
create_ddos_plan = true
35+
create_ddos_plan = false
3636
3737
# Multiple Subnets, Service delegation, Service Endpoints, Network security groups
3838
# These are default subnets with required configuration, check README.md for more details
@@ -42,7 +42,7 @@ module "vnet" {
4242
# subnet name will be set as per Azure naming convention by defaut. expected value here is: <App or project name>
4343
subnets = {
4444
mgnt_subnet = {
45-
subnet_name = "management"
45+
subnet_name = "snet-management"
4646
subnet_address_prefix = ["10.1.2.0/24"]
4747
delegation = {
4848
name = "testdelegation"
@@ -51,6 +51,7 @@ module "vnet" {
5151
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
5252
}
5353
}
54+
5455
nsg_inbound_rules = [
5556
# [name, priority, direction, access, protocol, destination_port_range, source_address_prefix, destination_address_prefix]
5657
# To use defaults, use "" without adding any values.
@@ -67,7 +68,7 @@ module "vnet" {
6768
}
6869
6970
dmz_subnet = {
70-
subnet_name = "appgateway"
71+
subnet_name = "snet-appgateway"
7172
subnet_address_prefix = ["10.1.3.0/24"]
7273
service_endpoints = ["Microsoft.Storage"]
7374
@@ -132,7 +133,7 @@ This module supports enabling the service endpoint of your choosing under the vi
132133
```hcl
133134
module "vnet" {
134135
source = "kumarvna/vnet/azurerm"
135-
version = "2.0.0"
136+
version = "2.1.0"
136137
137138
# .... omitted
138139
@@ -160,7 +161,7 @@ This module supports enabling the service delegation of your choosing under the
160161
```hcl
161162
module "vnet" {
162163
source = "kumarvna/vnet/azurerm"
163-
version = "2.0.0"
164+
version = "2.1.0"
164165
165166
# .... omitted
166167
@@ -194,7 +195,7 @@ This module Enable or Disable network policies for the private link endpoint on
194195
```hcl
195196
module "vnet" {
196197
source = "kumarvna/vnet/azurerm"
197-
version = "2.0.0"
198+
version = "2.1.0"
198199
199200
# .... omitted
200201
@@ -224,7 +225,7 @@ This module Enable or Disable network policies for the private link service on t
224225
```hcl
225226
module "vnet" {
226227
source = "kumarvna/vnet/azurerm"
227-
version = "2.0.0"
228+
version = "2.1.0"
228229
229230
# .... omitted
230231
@@ -260,7 +261,7 @@ In the Source and Destination columns, `VirtualNetwork`, `AzureLoadBalancer`, an
260261
```hcl
261262
module "vnet" {
262263
source = "kumarvna/vnet/azurerm"
263-
version = "2.0.0"
264+
version = "2.1.0"
264265
265266
# .... omitted
266267
@@ -322,7 +323,7 @@ End Date of the Project|Date when this application, workload, or service is plan
322323
```hcl
323324
module "vnet" {
324325
source = "kumarvna/vnet/azurerm"
325-
version = "2.0.0"
326+
version = "2.1.0"
326327
327328
# ... omitted
328329
@@ -341,13 +342,13 @@ module "vnet" {
341342
Name | Version
342343
-----|--------
343344
terraform | >= 0.13
344-
azurerm | ~> 2.27
345+
azurerm | >= 2.59.0
345346

346347
## Providers
347348

348349
| Name | Version |
349350
|------|---------|
350-
azurerm | ~> 2.27
351+
azurerm | >= 2.59.0
351352

352353
## Inputs
353354

‎examples/README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Following example to create a virtual network with subnets and network watcher r
1111
```hcl
1212
module "vnet" {
1313
source = "kumarvna/vnet/azurerm"
14-
version = "2.0.0"
14+
version = "2.1.0"
1515
1616
# By default, this module will not create a resource group, proivde the name here
1717
# to use an existing resource group, specify the existing resource group name,
@@ -64,21 +64,21 @@ Following example to create a virtual network with subnets, NSG, DDoS protection
6464
```hcl
6565
module "vnet" {
6666
source = "kumarvna/vnet/azurerm"
67-
version = "2.0.0"
67+
version = "2.1.0"
6868
6969
# By default, this module will not create a resource group, proivde the name here
7070
# to use an existing resource group, specify the existing resource group name,
7171
# and set the argument to `create_resource_group = true`. Location will be same as existing RG.
72-
create_resource_group = true
73-
resource_group_name = "rg-demo-westeurope-01"
74-
vnetwork_name = "vnet-demo-westeurope-001"
72+
resource_group_name = "rg-shared-westeurope-02"
73+
vnetwork_name = "vnet-shared-hub-westeurope-002"
7574
location = "westeurope"
7675
vnet_address_space = ["10.1.0.0/16"]
7776
firewall_subnet_address_prefix = ["10.1.0.0/26"]
7877
gateway_subnet_address_prefix = ["10.1.1.0/27"]
78+
create_network_watcher = false
7979
8080
# Adding Standard DDoS Plan, and custom DNS servers (Optional)
81-
create_ddos_plan = true
81+
create_ddos_plan = false
8282
8383
# Multiple Subnets, Service delegation, Service Endpoints, Network security groups
8484
# These are default subnets with required configuration, check README.md for more details
@@ -88,7 +88,7 @@ module "vnet" {
8888
# subnet name will be set as per Azure naming convention by defaut. expected value here is: <App or project name>
8989
subnets = {
9090
mgnt_subnet = {
91-
subnet_name = "management"
91+
subnet_name = "snet-management"
9292
subnet_address_prefix = ["10.1.2.0/24"]
9393
delegation = {
9494
name = "testdelegation"
@@ -97,6 +97,7 @@ module "vnet" {
9797
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
9898
}
9999
}
100+
100101
nsg_inbound_rules = [
101102
# [name, priority, direction, access, protocol, destination_port_range, source_address_prefix, destination_address_prefix]
102103
# To use defaults, use "" without adding any values.
@@ -113,7 +114,7 @@ module "vnet" {
113114
}
114115
115116
dmz_subnet = {
116-
subnet_name = "appgateway"
117+
subnet_name = "snet-appgateway"
117118
subnet_address_prefix = ["10.1.3.0/24"]
118119
service_endpoints = ["Microsoft.Storage"]
119120

‎examples/complete/README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ Following example to create a virtual network with subnets, NSG, DDoS protection
99
```hcl
1010
module "vnet" {
1111
source = "kumarvna/vnet/azurerm"
12-
version = "2.0.0"
12+
version = "2.1.0"
1313
1414
# By default, this module will not create a resource group, proivde the name here
1515
# to use an existing resource group, specify the existing resource group name,
1616
# and set the argument to `create_resource_group = true`. Location will be same as existing RG.
17-
create_resource_group = true
18-
resource_group_name = "rg-demo-westeurope-01"
19-
vnetwork_name = "vnet-demo-westeurope-001"
17+
resource_group_name = "rg-shared-westeurope-02"
18+
vnetwork_name = "vnet-shared-hub-westeurope-002"
2019
location = "westeurope"
2120
vnet_address_space = ["10.1.0.0/16"]
2221
firewall_subnet_address_prefix = ["10.1.0.0/26"]
2322
gateway_subnet_address_prefix = ["10.1.1.0/27"]
23+
create_network_watcher = false
2424
2525
# Adding Standard DDoS Plan, and custom DNS servers (Optional)
26-
create_ddos_plan = true
26+
create_ddos_plan = false
2727
2828
# Multiple Subnets, Service delegation, Service Endpoints, Network security groups
2929
# These are default subnets with required configuration, check README.md for more details
@@ -33,7 +33,7 @@ module "vnet" {
3333
# subnet name will be set as per Azure naming convention by defaut. expected value here is: <App or project name>
3434
subnets = {
3535
mgnt_subnet = {
36-
subnet_name = "management"
36+
subnet_name = "snet-management"
3737
subnet_address_prefix = ["10.1.2.0/24"]
3838
delegation = {
3939
name = "testdelegation"
@@ -42,6 +42,7 @@ module "vnet" {
4242
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
4343
}
4444
}
45+
4546
nsg_inbound_rules = [
4647
# [name, priority, direction, access, protocol, destination_port_range, source_address_prefix, destination_address_prefix]
4748
# To use defaults, use "" without adding any values.
@@ -58,7 +59,7 @@ module "vnet" {
5859
}
5960
6061
dmz_subnet = {
61-
subnet_name = "appgateway"
62+
subnet_name = "snet-appgateway"
6263
subnet_address_prefix = ["10.1.3.0/24"]
6364
service_endpoints = ["Microsoft.Storage"]
6465

‎examples/complete/main.tf

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module "vnet" {
22
source = "kumarvna/vnet/azurerm"
3-
version = "2.0.0"
3+
version = "2.1.0"
44

55
# By default, this module will not create a resource group, proivde the name here
66
# to use an existing resource group, specify the existing resource group name,
77
# and set the argument to `create_resource_group = true`. Location will be same as existing RG.
8-
create_resource_group = true
9-
resource_group_name = "rg-demo-westeurope-01"
10-
vnetwork_name = "vnet-demo-westeurope-001"
8+
resource_group_name = "rg-shared-westeurope-02"
9+
vnetwork_name = "vnet-shared-hub-westeurope-002"
1110
location = "westeurope"
1211
vnet_address_space = ["10.1.0.0/16"]
1312
firewall_subnet_address_prefix = ["10.1.0.0/26"]
1413
gateway_subnet_address_prefix = ["10.1.1.0/27"]
14+
create_network_watcher = false
1515

1616
# Adding Standard DDoS Plan, and custom DNS servers (Optional)
17-
create_ddos_plan = true
17+
create_ddos_plan = false
1818

1919
# Multiple Subnets, Service delegation, Service Endpoints, Network security groups
2020
# These are default subnets with required configuration, check README.md for more details
@@ -24,7 +24,7 @@ module "vnet" {
2424
# subnet name will be set as per Azure naming convention by defaut. expected value here is: <App or project name>
2525
subnets = {
2626
mgnt_subnet = {
27-
subnet_name = "management"
27+
subnet_name = "snet-management"
2828
subnet_address_prefix = ["10.1.2.0/24"]
2929
delegation = {
3030
name = "testdelegation"
@@ -33,6 +33,7 @@ module "vnet" {
3333
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
3434
}
3535
}
36+
3637
nsg_inbound_rules = [
3738
# [name, priority, direction, access, protocol, destination_port_range, source_address_prefix, destination_address_prefix]
3839
# To use defaults, use "" without adding any values.
@@ -49,7 +50,7 @@ module "vnet" {
4950
}
5051

5152
dmz_subnet = {
52-
subnet_name = "appgateway"
53+
subnet_name = "snet-appgateway"
5354
subnet_address_prefix = ["10.1.3.0/24"]
5455
service_endpoints = ["Microsoft.Storage"]
5556

‎examples/simple_VNet_exmaple/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Following example to create a simple virtual network with subnets and network wa
99
```hcl
1010
module "vnet" {
1111
source = "kumarvna/vnet/azurerm"
12-
version = "2.0.0"
12+
version = "2.1.0"
1313
1414
# By default, this module will not create a resource group, proivde the name here
1515
# to use an existing resource group, specify the existing resource group name,

‎examples/simple_VNet_exmaple/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "vnet" {
22
source = "kumarvna/vnet/azurerm"
3-
version = "2.0.0"
3+
version = "2.1.0"
44

55
# By default, this module will not create a resource group, proivde the name here
66
# to use an existing resource group, specify the existing resource group name,

‎main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,4 @@ resource "azurerm_subnet_network_security_group_association" "nsg-assoc" {
146146
subnet_id = azurerm_subnet.snet[each.key].id
147147
network_security_group_id = azurerm_network_security_group.nsg[each.key].id
148148
}
149+

‎versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
azurerm = {
44
source = "hashicorp/azurerm"
5-
version = "~>2.27.0"
5+
version = ">= 2.59.0"
66
}
77
}
88
required_version = ">= 0.13"

0 commit comments

Comments
 (0)