From ddfdc49458096cb46ebc259aad99d10a9c789632 Mon Sep 17 00:00:00 2001 From: Ruslan Riznyk Date: Thu, 22 Feb 2024 16:42:26 +0200 Subject: [PATCH] fix: replaced pre-commit repo docs creation/update by GH Actions new file: .github/workflows/documentation.yml modified: .pre-commit-config.yaml new file: .terraform-docs.yml modified: LICENSE modified: README.md --- .github/workflows/documentation.yml | 22 ++++ .pre-commit-config.yaml | 3 - .terraform-docs.yml | 48 +++++++ LICENSE | 188 ---------------------------- README.md | 77 +++++++----- 5 files changed, 114 insertions(+), 224 deletions(-) create mode 100644 .github/workflows/documentation.yml create mode 100644 .terraform-docs.yml diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml new file mode 100644 index 0000000..fe37cf9 --- /dev/null +++ b/.github/workflows/documentation.yml @@ -0,0 +1,22 @@ +name: Generate terraform docs +on: + pull_request: + branches: + - main + - master + +jobs: + AutogenerateTerraformRepoDocs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + + - name: Render terraform docs and push changes back to PR + uses: terraform-docs/gh-actions@main + with: + working-dir: . + output-file: README.md + output-method: inject + git-push: "true" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a8a23a..d66171f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,9 +4,6 @@ repos: hooks: - id: terraform_fmt - id: terraform_validate - - id: terraform_docs - args: - - '--args=--lockfile=false' - id: terraform_tflint args: - '--args=--only=terraform_deprecated_interpolation' diff --git a/.terraform-docs.yml b/.terraform-docs.yml new file mode 100644 index 0000000..a62f4e4 --- /dev/null +++ b/.terraform-docs.yml @@ -0,0 +1,48 @@ +formatter: "markdown table" # this is required + +version: "" + +header-from: "main.tf" +footer-from: "" + +recursive: + enabled: false + path: modules + +sections: + hide: [] + show: [] + +content: "" + +# see: https://terraform-docs.io/user-guide/configuration/output +output: + file: README.md + mode: inject + template: |- + + {{ .Content }} + + +output-values: + enabled: false + from: "" + +sort: + enabled: true + by: name + +settings: + anchor: true + color: true + default: true + description: false + escape: true + hide-empty: false + html: true + indent: 2 + lockfile: true + read-comments: true + required: true + sensitive: true + type: true diff --git a/LICENSE b/LICENSE index b08cca5..edf6efa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,191 +1,3 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - Copyright 2022 EPAM Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/README.md b/README.md index ea1d6ae..f531bf1 100644 --- a/README.md +++ b/README.md @@ -29,54 +29,65 @@ module "vm_scale_sets" { ## Requirements -| Name | Version | -| ---------------------------------------------------------------------------- | --------- | -| [terraform](#requirement\_terraform) | >= 1.0.0 | -| [azurerm](#requirement\_azurerm) | >= 3.75.0 | +| Name | Version | +|------|---------| +| [terraform](#requirement\_terraform) | >=1.0.0 | +| [azurerm](#requirement\_azurerm) | >=3.75.0 | ## Providers -| Name | Version | -| ---------------------------------------------------------------------- | ------- | -| [azurerm](#provider\_azurerm) | 3.75.0 | +| Name | Version | +|------|---------| +| [azurerm](#provider\_azurerm) | >=3.75.0 | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------|:--------:| -| [scale\_set\_name](#input\_scale\_set\_name)| Virtual Machine Scale Set name. | `string` | n/a | yes | -| [resource\_group](#input\_resource\_group)| The name of the resource group. | `string` | n/a| yes | -| [location](#input\_location)| The Azure Region in which all resources in this example should be created. | `string` | n/a | yes | -| [subnet\_id](#input\_subnet\_id)| The ID of the Subnet where this Network first Interface should be located in. | `string` | n/a | yes | -| [admin\_ssh\_key](#input\_admin\_ssh\_key)| Objects to configure ssh key reference for Virtual Machine Scale Sets |
object({
username = optional(string, "azureuser")
public_key = string
})
|
{
username = null
public_key = null
}
| yes | -| [tags](#input\_tags)| list of tags | map(string) | {} | no | -| [public\_ip\_prefix\_enabled](#input\_public\_ip\_prefix\_enabled)| Boolean flag that determines whether Public IP Address prefix is created for VM Scale Set. | bool | true | no | -| [public\_ip\_prefix\_name](#input\_public\_ip\_prefix\_name)| Public IP Address prefix name. | string | null | no | -| [public\_ip\_prefix\_length](#input\_public\_ip\_prefix\_length)| Public IP Address prefix length. Possible value are between 0 and 31. | string | 30 | no | -| [scale\_set\_configuration](#input\_scale\_set\_configuration)| Configuration options for linux virtual machine scale set |
object({
sku = optional(string)
instances = optional(string)
admin_username = optional(string)
admin_password = optional(string)
disable_password_authentication = optional(bool)
priority = optional(string)
overprovision = optional(bool)
single_placement_group = optional(bool)
upgrade_mode = optional(string)
enable_ip_forwarding_interface = optional(bool)
domain_name_label = optional(string)
lb_backend_address_pool_ids = optional(list(string))
})
|
object({
sku = optional(string, "Standard_D2_v2")
instances = optional(string, "2")
admin_username = optional(string, "azureuser")
admin_password = optional(string, null)
disable_password_authentication = optional(bool, true)
priority = optional(string, "Regular")
overprovision = optional(bool, false)
single_placement_group = optional(bool, false)
upgrade_mode = optional(string, "Manual")
enable_ip_forwarding_interface = optional(bool, false)
domain_name_label = optional(string, null)
lb_backend_address_pool_ids = optional(list(string), [])
})
| no | -| [extensions](#input\_extensions)| Virtual Machine scale set extensions config |
set(object({
name = string
publisher = string
type = string
type_handler_version = string
settings = optional(string)
protected_settings = optional(string)
}))
| [] | no | -| [os\_disk](#input\_os\_disk)| Objects to configure os disk reference for Virtual Machine Scale Sets |
object({
caching = string
storage_account_type = string
})
|
{
caching = "ReadWrite"
storage_account_type = "Standard_LRS"
}
| no | -| [source\_image\_reference](#input\_source\_image\_reference)| Objects to configure source image reference for Virtual Machine Scale Sets |
object({
publisher = string
offer = string
sku = string
version = string
})
|
{
publisher = "Canonical"
offer = "0001-com-ubuntu-server-jammy"
sku = "22_04-lts"
version = "latest"
}
| no | - ## Modules No modules. ## Resources -| Name | Type | -| ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | -| [azurerm_public_ip_prefix.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip_prefix) | resource | -| [azurerm_linux_virtual_machine_scale_set.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/linux_virtual_machine_scale_set) | resource | +| Name | Type | +|------|------| +| [azurerm_linux_virtual_machine_scale_set.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/linux_virtual_machine_scale_set) | resource | +| [azurerm_monitor_data_collection_rule.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_data_collection_rule) | resource | +| [azurerm_monitor_data_collection_rule_association.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_data_collection_rule_association) | resource | +| [azurerm_public_ip_prefix.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip_prefix) | resource | + +## Inputs + +| Name | Description | Type | Default | Required | +|------|-------------|------|---------|:--------:| +| [admin\_ssh\_key](#input\_admin\_ssh\_key) | Objects to configure ssh key reference for Virtual Machine Scale Sets |
object({
username = optional(string, "azureuser")
public_key = string
})
|
{
"public_key": null,
"username": null
}
| no | +| [analytics\_workspace\_id](#input\_analytics\_workspace\_id) | Resource ID of Log Analytics Workspace | `string` | `null` | no | +| [data\_collection\_rule\_association\_name](#input\_data\_collection\_rule\_association\_name) | Data collection rule association name | `string` | `null` | no | +| [data\_collection\_rule\_name](#input\_data\_collection\_rule\_name) | Data collection rule name | `string` | `null` | no | +| [datasource\_name](#input\_datasource\_name) | Datasource syslog name | `string` | `"datasource-syslog"` | no | +| [dcr\_association\_description](#input\_dcr\_association\_description) | Description of Data collection rule association | `string` | `"Association between the Data Collection Rule and the Linux VM."` | no | +| [dependency\_agent\_extension\_version](#input\_dependency\_agent\_extension\_version) | Version of VMSS extension required for logging | `string` | `"9.5"` | no | +| [enable\_data\_collection\_rule](#input\_enable\_data\_collection\_rule) | Enable data collection rule. var.analytics\_workspace\_id must be provided | `bool` | `false` | no | +| [enable\_data\_collection\_rule\_association](#input\_enable\_data\_collection\_rule\_association) | Enable data collection rule association. var.analytics\_workspace\_id must be provided | `bool` | `true` | no | +| [enable\_scale\_set\_extension](#input\_enable\_scale\_set\_extension) | Enable scale set extension. var.analytics\_workspace\_id must be provided | `bool` | `true` | no | +| [extensions](#input\_extensions) | Virtual Machine scale set extensions config |
set(object({
name = string
publisher = string
type = string
type_handler_version = string
settings = optional(string)
protected_settings = optional(string)
}))
| `[]` | no | +| [facility\_names](#input\_facility\_names) | List of Facility names | `list(string)` |
[
"daemon",
"syslog",
"user"
]
| no | +| [location](#input\_location) | The Azure Region in which all resources in this example should be created. | `string` | n/a | yes | +| [log\_levels](#input\_log\_levels) | List of Log levels | `list(string)` |
[
"Debug"
]
| no | +| [os\_disk](#input\_os\_disk) | Objects to configure os disk reference for Virtual Machine Scale Sets |
object({
caching = optional(string, "ReadWrite")
storage_account_type = optional(string, "Standard_LRS")
})
| `{}` | no | +| [public\_ip\_prefix\_enabled](#input\_public\_ip\_prefix\_enabled) | Boolean flag that determines whether Public IP Address prefix is created for VM Scale Set. | `bool` | `true` | no | +| [public\_ip\_prefix\_length](#input\_public\_ip\_prefix\_length) | Public IP Address prefix length. Possible value are between 0 and 31. | `string` | `30` | no | +| [public\_ip\_prefix\_name](#input\_public\_ip\_prefix\_name) | Public IP Address prefix name. | `string` | `null` | no | +| [resource\_group](#input\_resource\_group) | The name of the resource group. | `string` | n/a | yes | +| [scale\_set\_configuration](#input\_scale\_set\_configuration) | Configuration options for linux virtual machine scale set |
object({
sku = optional(string, "Standard_D2_v2")
instances = optional(string, "2")
admin_username = optional(string, "azureuser")
admin_password = optional(string, null)
disable_password_authentication = optional(bool, true)
priority = optional(string, "Regular")
overprovision = optional(bool, false)
single_placement_group = optional(bool, false)
upgrade_mode = optional(string, "Manual")
enable_ip_forwarding_interface = optional(bool, false)
domain_name_label = optional(string, null)
lb_backend_address_pool_ids = optional(list(string), [])
})
| `{}` | no | +| [scale\_set\_name](#input\_scale\_set\_name) | Virtual Machine Scale Set name. | `string` | n/a | yes | +| [source\_image\_reference](#input\_source\_image\_reference) | Objects to configure source image reference for Virtual Machine Scale Sets |
object({
publisher = string
offer = string
sku = string
version = string
})
|
{
"offer": "0001-com-ubuntu-server-jammy",
"publisher": "Canonical",
"sku": "22_04-lts",
"version": "latest"
}
| no | +| [subnet\_id](#input\_subnet\_id) | The ID of the Subnet where this Network first Interface should be located in. | `string` | n/a | yes | +| [tags](#input\_tags) | list of tags | `map(string)` | `{}` | no | ## Outputs -| Name | Description | -| ----------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | +| Name | Description | +|------|-------------| | [id](#output\_id) | Linux virtual machine scale set id | | [public\_ips](#output\_public\_ips) | Public IP Address Prefix CIDR | - ## License