From 885f503b1ded8348f14393b3c7548c4c8d330768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A4risch?= Date: Tue, 17 Sep 2024 09:57:21 +0200 Subject: [PATCH 1/5] fix: vm should depend on marketplace image agreement --- main.tf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index da25398..4a79dd1 100644 --- a/main.tf +++ b/main.tf @@ -55,7 +55,6 @@ resource "azurerm_linux_virtual_machine" "this" { admin_password = var.admin_credential.admin_password disable_password_authentication = var.admin_credential.admin_password == null - dynamic "admin_ssh_key" { for_each = var.admin_credential.public_key != null ? [1] : [] content { @@ -103,4 +102,8 @@ resource "azurerm_linux_virtual_machine" "this" { admin_password ] } -} + + depends_on = [ + azurerm_marketplace_agreement.default + ] +} \ No newline at end of file From 4ad71a2f0ae1fdca48d61f1de734ca6697568fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A4risch?= Date: Tue, 17 Sep 2024 09:59:16 +0200 Subject: [PATCH 2/5] fix: adjusted azurerm minimal version --- terraform.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform.tf b/terraform.tf index 320f9a4..1211c15 100644 --- a/terraform.tf +++ b/terraform.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0" + version = "~> 3.116.0" } } } \ No newline at end of file From 34dcb974c1e83f9b468b6ef03227cde7ea101e05 Mon Sep 17 00:00:00 2001 From: QBY-MauriceBaerisch Date: Tue, 17 Sep 2024 13:07:13 +0200 Subject: [PATCH 3/5] VMs now depend on marketplace image agreement --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d202d95..1ddee3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this module adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.4.1] - 2024-09-17 + - VMs now depend on marketplace image agreement created by enable_plan=true + ## [1.4.0] - 2024-09-16 - Added enable_plan option for marketplace images. From 24f38f7a523e4edf8f77e992ff4429cb094c682d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 17 Sep 2024 11:10:21 +0000 Subject: [PATCH 4/5] terraform-docs: automated action --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 663293a..ef8fd43 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ resource "azurerm_subnet" "this" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >=1.5.0 | -| [azurerm](#requirement\_azurerm) | >= 3.7.0 | +| [azurerm](#requirement\_azurerm) | ~> 3.116.0 | ## Inputs From b02aac6ccc3b40e5b3945a2f743cee8d9afed842 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Sep 2024 13:01:08 +0000 Subject: [PATCH 5/5] terraform-docs: automated action --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ef8fd43..89cb404 100644 --- a/README.md +++ b/README.md @@ -68,16 +68,16 @@ resource "azurerm_subnet" "this" { | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [admin\_credential](#input\_admin\_credential) | 
Specify either admin_password or public_key:
  admin_password: Password of the local administrator.
  public_key: SSH public key file (e.g. file(id_rsa.pub))
| 
object({
    admin_password = optional(string)
    public_key     = optional(string)
  })
| n/a | yes | +| [admin\_credential](#input\_admin\_credential) | 
Specify either admin_password or public_key:
  admin_password: Password of the local administrator.
  public_key: SSH public key file (e.g. file(id_rsa.pub))
| 
object({
    admin_password = optional(string)
    public_key     = optional(string)
  })
| n/a | yes | | [resource\_group\_name](#input\_resource\_group\_name) | Name of the resource group where the resources will be created. | `string` | n/a | yes | -| [subnet](#input\_subnet) | The variable takes the subnet as input and takes the id and the address prefix for further configuration. | 
object({
    id               = string
    address_prefixes = list(string)
  })
| n/a | yes | -| [virtual\_machine\_config](#input\_virtual\_machine\_config) | 
hostname: Name of system hostname.
  size: The size of the vm. Possible values can be seen here: https://learn.microsoft.com/en-us/azure/virtual-machines/sizes
  location: The location of the virtual machine.
  os_sku: (Required) The os that will be running on the vm.
  os_offer: (Required) Specifies the offer of the image used to create the virtual machines. Changing this forces a new resource to be created.
  os_version: (Required) Optionally specify an os version for the chosen sku.
  os_publisher: (Required) Specifies the Publisher of the Marketplace Image this Virtual Machine should be created from. Changing this forces a new resource to be created.
  os_disk_caching: Optionally change the caching option of the os disk. Defaults to ReadWrite.
  os_disk_size_gb: Optionally change the size of the os disk. Defaults to be specified by image.
  os_disk_storage_type: Optionally change the os_disk_storage_type. Defaults to StandardSSD_LRS.
  zone: Optionally specify an availibility zone for the vm. Values 1, 2 or 3.
  availability_set_id: Optionally specify an availibility set for the vm. Not compatible with zone.
  os_disk_write_accelerator_enabled: Optionally activate write accelaration for the os disk. Can only
    be activated on Premium disks and caching deactivated. Defaults to false.
  proximity_placement_group_id: (Optional) The ID of the Proximity Placement Group which the Virtual Machine should be assigned to.
  severity_group: (Required) Sets tag 'Severity Group Monthly' to a specific time and date when an update will be done automatically.
  update_allowed: Sets tag 'Update allowed' to yes or no to specify if this VM should currently receive updates.
  enable_plan: When using marketplace images, sending plan information might be required. Also accepts the terms of the marketplace product.
| 
object({
    hostname                          = string
    size                              = string
    location                          = string
    os_sku                            = string
    os_offer                          = string
    os_version                        = string
    os_publisher                      = string
    os_disk_caching                   = optional(string, "ReadWrite")
    os_disk_size_gb                   = optional(number)
    os_disk_storage_type              = optional(string, "Premium_LRS")
    os_disk_write_accelerator_enabled = optional(bool, false)
    zone                              = optional(number)
    availability_set_id               = optional(string)
    proximity_placement_group_id      = optional(string)
    severity_group                    = string
    update_allowed                    = optional(bool, true)
    enable_plan                       = optional(bool, false)
  })
| n/a | yes | +| [subnet](#input\_subnet) | The variable takes the subnet as input and takes the id and the address prefix for further configuration. | 
object({
    id               = string
    address_prefixes = list(string)
  })
| n/a | yes | +| [virtual\_machine\_config](#input\_virtual\_machine\_config) | 
hostname: Name of system hostname.
  size: The size of the vm. Possible values can be seen here: https://learn.microsoft.com/en-us/azure/virtual-machines/sizes
  location: The location of the virtual machine.
  os_sku: (Required) The os that will be running on the vm.
  os_offer: (Required) Specifies the offer of the image used to create the virtual machines. Changing this forces a new resource to be created.
  os_version: (Required) Optionally specify an os version for the chosen sku.
  os_publisher: (Required) Specifies the Publisher of the Marketplace Image this Virtual Machine should be created from. Changing this forces a new resource to be created.
  os_disk_caching: Optionally change the caching option of the os disk. Defaults to ReadWrite.
  os_disk_size_gb: Optionally change the size of the os disk. Defaults to be specified by image.
  os_disk_storage_type: Optionally change the os_disk_storage_type. Defaults to StandardSSD_LRS.
  zone: Optionally specify an availibility zone for the vm. Values 1, 2 or 3.
  availability_set_id: Optionally specify an availibility set for the vm. Not compatible with zone.
  os_disk_write_accelerator_enabled: Optionally activate write accelaration for the os disk. Can only
    be activated on Premium disks and caching deactivated. Defaults to false.
  proximity_placement_group_id: (Optional) The ID of the Proximity Placement Group which the Virtual Machine should be assigned to.
  severity_group: (Required) Sets tag 'Severity Group Monthly' to a specific time and date when an update will be done automatically.
  update_allowed: Sets tag 'Update allowed' to yes or no to specify if this VM should currently receive updates.
  enable_plan: When using marketplace images, sending plan information might be required. Also accepts the terms of the marketplace product.
| 
object({
    hostname                          = string
    size                              = string
    location                          = string
    os_sku                            = string
    os_offer                          = string
    os_version                        = string
    os_publisher                      = string
    os_disk_caching                   = optional(string, "ReadWrite")
    os_disk_size_gb                   = optional(number)
    os_disk_storage_type              = optional(string, "Premium_LRS")
    os_disk_write_accelerator_enabled = optional(bool, false)
    zone                              = optional(number)
    availability_set_id               = optional(string)
    proximity_placement_group_id      = optional(string)
    severity_group                    = string
    update_allowed                    = optional(bool, true)
    enable_plan                       = optional(bool, false)
  })
| n/a | yes | | [additional\_network\_interface\_ids](#input\_additional\_network\_interface\_ids) | List of ids for additional azurerm\_network\_interface. | `list(string)` | `[]` | no | | [admin\_username](#input\_admin\_username) | Optionally choose the admin\_username of the vm. Defaults to loc\_sysadmin. | `string` | `"loc_sysadmin"` | no | -| [data\_disks](#input\_data\_disks) | 
 = {
  lun: Number of the lun.
  disk_size_gb: The size of the data disk.
  storage_account_type: Optionally change the storage_account_type. Defaults to StandardSSD_LRS.
  caching: Optionally activate disk caching. Defaults to None.
  create_option: Optionally change the create option. Defaults to Empty disk.
  source_resource_id: (Optional) The ID of an existing Managed Disk or Snapshot to copy when create_option is Copy or
    the recovery point to restore when create_option is Restore. Changing this forces a new resource to be created.
  write_accelerator_enabled: Optionally activate write accelaration for the data disk. Can only
    be activated on Premium disks and caching deactivated. Defaults to false.
  on_demand_bursting_enabled: Optionally activate disk bursting. Only for Premium disk. Default false.
 }
| 
map(object({
    lun                        = number
    disk_size_gb               = number
    caching                    = optional(string, "ReadWrite")
    create_option              = optional(string, "Empty")
    source_resource_id         = optional(string)
    storage_account_type       = optional(string, "Premium_LRS")
    write_accelerator_enabled  = optional(bool, false)
    on_demand_bursting_enabled = optional(bool, false)
  }))
| `{}` | no | -| [name\_overrides](#input\_name\_overrides) | Possibility to override names that will be generated according to q.beyond naming convention. | 
object({
    nic             = optional(string)
    nic_ip_config   = optional(string)
    public_ip       = optional(string)
    virtual_machine = optional(string)
    os_disk         = optional(string)
    data_disks      = optional(map(string), {})
  })
| `{}` | no | -| [nic\_config](#input\_nic\_config) | 
private_ip: Optioanlly specify a private ip to use. Otherwise it will  be allocated dynamically.
  dns_servers: Optionally specify a list of dns servers for the nic.
  enable_accelerated_networking: Enabled Accelerated networking (SR-IOV) on the NIC. The machine SKU must support this feature.
  nsg: Although it is discouraged you can optionally assign an NSG to the NIC. Optionally specify a NSG object.
| 
object({
    private_ip                    = optional(string)
    dns_servers                   = optional(list(string))
    enable_accelerated_networking = optional(bool, false)
    nsg = optional(object({
      id = string
    }))
  })
| `{}` | no | -| [public\_ip\_config](#input\_public\_ip\_config) | 
allocation_method: The allocation method of the public ip that will be created. Defaults to static.
  stage: The stage of this PIP. Ex: prd, dev, tst, ...
| 
object({
    allocation_method = optional(string, "Static")
    stage             = string
  })
| `null` | no | +| [data\_disks](#input\_data\_disks) | 
 = {
  lun: Number of the lun.
  disk_size_gb: The size of the data disk.
  storage_account_type: Optionally change the storage_account_type. Defaults to StandardSSD_LRS.
  caching: Optionally activate disk caching. Defaults to None.
  create_option: Optionally change the create option. Defaults to Empty disk.
  source_resource_id: (Optional) The ID of an existing Managed Disk or Snapshot to copy when create_option is Copy or
    the recovery point to restore when create_option is Restore. Changing this forces a new resource to be created.
  write_accelerator_enabled: Optionally activate write accelaration for the data disk. Can only
    be activated on Premium disks and caching deactivated. Defaults to false.
  on_demand_bursting_enabled: Optionally activate disk bursting. Only for Premium disk. Default false.
 }
| 
map(object({
    lun                        = number
    disk_size_gb               = number
    caching                    = optional(string, "ReadWrite")
    create_option              = optional(string, "Empty")
    source_resource_id         = optional(string)
    storage_account_type       = optional(string, "Premium_LRS")
    write_accelerator_enabled  = optional(bool, false)
    on_demand_bursting_enabled = optional(bool, false)
  }))
| `{}` | no | +| [name\_overrides](#input\_name\_overrides) | Possibility to override names that will be generated according to q.beyond naming convention. | 
object({
    nic             = optional(string)
    nic_ip_config   = optional(string)
    public_ip       = optional(string)
    virtual_machine = optional(string)
    os_disk         = optional(string)
    data_disks      = optional(map(string), {})
  })
| `{}` | no | +| [nic\_config](#input\_nic\_config) | 
private_ip: Optioanlly specify a private ip to use. Otherwise it will  be allocated dynamically.
  dns_servers: Optionally specify a list of dns servers for the nic.
  enable_accelerated_networking: Enabled Accelerated networking (SR-IOV) on the NIC. The machine SKU must support this feature.
  nsg: Although it is discouraged you can optionally assign an NSG to the NIC. Optionally specify a NSG object.
| 
object({
    private_ip                    = optional(string)
    dns_servers                   = optional(list(string))
    enable_accelerated_networking = optional(bool, false)
    nsg = optional(object({
      id = string
    }))
  })
| `{}` | no | +| [public\_ip\_config](#input\_public\_ip\_config) | 
allocation_method: The allocation method of the public ip that will be created. Defaults to static.
  stage: The stage of this PIP. Ex: prd, dev, tst, ...
| 
object({
    allocation_method = optional(string, "Static")
    stage             = string
  })
| `null` | no | | [tags](#input\_tags) | A map of tags that will be set on every resource this module creates. | `map(string)` | `{}` | no | ## Outputs