From 0638d128a7371af82bbf90ffd9ba27d987b7581f Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 14:26:23 -0500 Subject: [PATCH 1/7] Bump copyright range --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 919c27c..e1c4cde 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,4 +1,4 @@ -Copyright 2016-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2016-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License is located at From 7c1995a2f94c8aabe0623acec13f1b0cba9f9174 Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 14:28:04 -0500 Subject: [PATCH 2/7] Bump pre-commit-configs to latest --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e0ec44b..a617978 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,6 @@ repos: - repo: https://github.com/aws-ia/pre-commit-configs # To update run: # pre-commit autoupdate --freeze - rev: 82b2dd4f3c3c8b064ce15c7cc518e14c43f6a068 # frozen: v1.4.1 + rev: c7091ec774495a41986bd9c5ea59152655ec4f3a # frozen: v1.6.2 hooks: - id: aws-ia-meta-hook From 6cc2a3fb8d2bee08605d6f675c6bad198477dc3d Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 14:28:20 -0500 Subject: [PATCH 3/7] Bump tflint-ruleset-aws to latest --- .tflint.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tflint.hcl b/.tflint.hcl index 4c5f008..26c436d 100644 --- a/.tflint.hcl +++ b/.tflint.hcl @@ -3,7 +3,7 @@ plugin "aws" { enabled = true - version = "0.12.0" + version = "0.21.1" source = "github.com/terraform-linters/tflint-ruleset-aws" } From 9823ede2ad0dc0895dad4800f12a548989bd046d Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 15:08:23 -0500 Subject: [PATCH 4/7] Update reference links to vSphere 8.0 docs --- .header.md | 4 ++-- README.md | 12 ++++++------ examples/basic/.header.md | 2 +- examples/basic/README.md | 4 ++-- examples/basic/variables.tf | 4 ++-- examples/pub-sub/.header.md | 2 +- examples/pub-sub/README.md | 6 +++--- examples/pub-sub/variables.tf | 4 ++-- variables.tf | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.header.md b/.header.md index f86263b..4155414 100644 --- a/.header.md +++ b/.header.md @@ -1,8 +1,8 @@ # vSphere Content Library Terraform Module -This Terraform module creates or imports a [datastore](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)‑backed [content library](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. You can configure the content library as one of three types: standalone, publisher, or subscriber. +This Terraform module creates or imports a [datastore](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)‑backed [content library](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. You can configure the content library as one of three types: standalone, publisher, or subscriber. -You can optionally specify a list of new [items](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html), such as OVA and ISO images, to deploy into the new or existing content library or a list of items to import from an existing content library. +You can optionally specify a list of new [items](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html), such as OVA and ISO images, to deploy into the new or existing content library or a list of items to import from an existing content library. ## Usage diff --git a/README.md b/README.md index e6badc6..577ed37 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # vSphere Content Library Terraform Module -This Terraform module creates or imports a [datastore](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)‑backed [content library](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. You can configure the content library as one of three types: standalone, publisher, or subscriber. +This Terraform module creates or imports a [datastore](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)‑backed [content library](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. You can configure the content library as one of three types: standalone, publisher, or subscriber. -You can optionally specify a list of new [items](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html), such as OVA and ISO images, to deploy into the new or existing content library or a list of items to import from an existing content library. +You can optionally specify a list of new [items](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html), such as OVA and ISO images, to deploy into the new or existing content library or a list of items to import from an existing content library. ## Usage @@ -156,12 +156,12 @@ No modules. |------|-------------|------|---------|:--------:| | [authentication\_method](#input\_authentication\_method) | Method for authenticating users if creating a publication/subscription relationship between content libraries. | `string` | `null` | no | | [content\_library\_description](#input\_content\_library\_description) | The description of the vSphere content library. | `string` | `null` | no | -| [content\_library\_items](#input\_content\_library\_items) | List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file\_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty. | `list(map(string))` | `[]` | no | -| [content\_library\_name](#input\_content\_library\_name) | The name of the vSphere content library (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA). | `string` | `"Content library"` | no | +| [content\_library\_items](#input\_content\_library\_items) | List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file\_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty. | `list(map(string))` | `[]` | no | +| [content\_library\_name](#input\_content\_library\_name) | The name of the vSphere content library (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html). | `string` | `"Content library"` | no | | [create\_content\_library](#input\_create\_content\_library) | If true, a new vSphere content library will be created; otherwise, the corresponding content library will be imported as a data source. | `bool` | `false` | no | | [create\_content\_library\_items](#input\_create\_content\_library\_items) | If true, new vSphere content library items will be created for each specified; otherwise, the corresponding content library items will be imported as a data source. | `bool` | `false` | no | -| [datacenter\_name](#input\_datacenter\_name) | The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vcenterhost.doc/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html). | `string` | `"SDDC-Datacenter"` | no | -| [datastore\_name](#input\_datastore\_name) | The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html). | `string` | `"WorkloadDatastore"` | no | +| [datacenter\_name](#input\_datacenter\_name) | The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vcenter-esxi-management/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html). | `string` | `"SDDC-Datacenter"` | no | +| [datastore\_name](#input\_datastore\_name) | The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html). | `string` | `"WorkloadDatastore"` | no | | [password](#input\_password) | Password if creating a publication/subscription relationship between content libraries with authentication. Password length and complexity requirements are determined by the configuration in vCenter. | `string` | `null` | no | | [publication\_published](#input\_publication\_published) | If true, publish the content library if creating a publication/subscription relationship between content libraries. | `bool` | `null` | no | | [subscription\_automatic\_sync](#input\_subscription\_automatic\_sync) | If true, enable automatic synchronization with the published library if creating a publication/subscription relationship between content libraries. | `bool` | `null` | no | diff --git a/examples/basic/.header.md b/examples/basic/.header.md index 2507dee..07234a1 100644 --- a/examples/basic/.header.md +++ b/examples/basic/.header.md @@ -1,6 +1,6 @@ # Basic example -If deployed with the default values, this example will create a [content library](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) named `example-content-library` backed by a [datastore](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html) named `WorkloadDatastore`, and one ISO [item](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html) named `vmware-tools-windows-11.3.0-18` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. +If deployed with the default values, this example will create a [content library](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) named `example-content-library` backed by a [datastore](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html) named `WorkloadDatastore`, and one ISO [item](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html) named `vmware-tools-windows-11.3.0-18` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. ## Usage diff --git a/examples/basic/README.md b/examples/basic/README.md index df8da39..b60d76d 100644 --- a/examples/basic/README.md +++ b/examples/basic/README.md @@ -1,7 +1,7 @@ # Basic example -If deployed with the default values, this example will create a [content library](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) named `example-content-library` backed by a [datastore](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html) named `WorkloadDatastore`, and one ISO [item](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html) named `vmware-tools-windows-11.3.0-18` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. +If deployed with the default values, this example will create a [content library](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) named `example-content-library` backed by a [datastore](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html) named `WorkloadDatastore`, and one ISO [item](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html) named `vmware-tools-windows-11.3.0-18` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. ## Usage @@ -62,7 +62,7 @@ No resources. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [content\_library\_description](#input\_content\_library\_description) | The description of the vSphere content library. | `string` | `null` | no | -| [content\_library\_items](#input\_content\_library\_items) | List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file\_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty. | `list(map(string))` | 
[
  {
    "description": "VMware Tools for Windows.",
    "file_url": "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso",
    "name": "vmware-tools-windows-11.3.0-18",
    "type": "iso"
  }
]
| no | +| [content\_library\_items](#input\_content\_library\_items) | List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file\_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty. | `list(map(string))` | 
[
  {
    "description": "VMware Tools for Windows.",
    "file_url": "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso",
    "name": "vmware-tools-windows-12.0.6-20",
    "type": "iso"
  }
]
| no | | [content\_library\_name](#input\_content\_library\_name) | The name of the vSphere content library (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA). | `string` | `"example-content-library"` | no | | [create\_content\_library](#input\_create\_content\_library) | If true, a new vSphere content library will be created; otherwise, the corresponding content library will be imported as a data source. | `bool` | `true` | no | | [create\_content\_library\_items](#input\_create\_content\_library\_items) | If true, new vSphere content library items will be created for each specified; otherwise, the corresponding content library items will be imported as a data source. | `bool` | `true` | no | diff --git a/examples/basic/variables.tf b/examples/basic/variables.tf index 46dbf0c..3304153 100644 --- a/examples/basic/variables.tf +++ b/examples/basic/variables.tf @@ -33,9 +33,9 @@ variable "content_library_items" { description = "List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty." default = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "VMware Tools for Windows." - file_url = "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso" + file_url = "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso" type = "iso" }, ] diff --git a/examples/pub-sub/.header.md b/examples/pub-sub/.header.md index 8e2eabf..9830127 100644 --- a/examples/pub-sub/.header.md +++ b/examples/pub-sub/.header.md @@ -1,6 +1,6 @@ # Publisher/subscriber (pub/sub) example -If deployed with the default values, this example will create two [content libraries](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) named: 1/ `example-pub` and 2/ `example-sub` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. +If deployed with the default values, this example will create two [content libraries](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) named: 1/ `example-pub` and 2/ `example-sub` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. ## Usage diff --git a/examples/pub-sub/README.md b/examples/pub-sub/README.md index 39a3867..54fd9b1 100644 --- a/examples/pub-sub/README.md +++ b/examples/pub-sub/README.md @@ -1,7 +1,7 @@ # Publisher/subscriber (pub/sub) example -If deployed with the default values, this example will create two [content libraries](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA) named: 1/ `example-pub` and 2/ `example-sub` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. +If deployed with the default values, this example will create two [content libraries](https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html) named: 1/ `example-pub` and 2/ `example-sub` in your [VMware Cloud on AWS](https://aws.amazon.com/vmware/) or [VMware vSphere](https://docs.vmware.com/en/VMware-vSphere/index.html) on‑premises environment. ## Usage @@ -63,8 +63,8 @@ No resources. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [password](#input\_password) | Password if creating a publication/subscription relationship between content libraries with authentication. | `string` | n/a | yes | -| [datacenter\_name](#input\_datacenter\_name) | The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vcenterhost.doc/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html). | `string` | `"SDDC-Datacenter"` | no | -| [datastore\_name](#input\_datastore\_name) | The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html). | `string` | `"WorkloadDatastore"` | no | +| [datacenter\_name](#input\_datacenter\_name) | The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vcenter-esxi-management/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html). | `string` | `"SDDC-Datacenter"` | no | +| [datastore\_name](#input\_datastore\_name) | The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html). | `string` | `"WorkloadDatastore"` | no | ## Outputs diff --git a/examples/pub-sub/variables.tf b/examples/pub-sub/variables.tf index c2a9fb7..006f4b0 100644 --- a/examples/pub-sub/variables.tf +++ b/examples/pub-sub/variables.tf @@ -1,12 +1,12 @@ variable "datacenter_name" { type = string - description = "The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vcenterhost.doc/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html)." + description = "The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vcenter-esxi-management/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html)." default = "SDDC-Datacenter" } variable "datastore_name" { type = string - description = "The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)." + description = "The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)." default = "WorkloadDatastore" } diff --git a/variables.tf b/variables.tf index 393a626..89ea4ba 100644 --- a/variables.tf +++ b/variables.tf @@ -1,6 +1,6 @@ variable "datacenter_name" { type = string - description = "The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vcenterhost.doc/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html)." + description = "The name of the vSphere datacenter object where the content library will be created (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vcenter-esxi-management/GUID-7FDFBDBE-F8AC-4D00-AE5E-3F14D7472FAF.html)." default = "SDDC-Datacenter" nullable = false @@ -12,7 +12,7 @@ variable "datacenter_name" { variable "datastore_name" { type = string - description = "The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.storage.doc/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)." + description = "The name of the vSphere datastore object where the content library items will be stored (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-storage/GUID-7BED10DD-3EF2-4670-BA7F-0EEB4EC6EB85.html)." default = "WorkloadDatastore" nullable = false @@ -24,7 +24,7 @@ variable "datastore_name" { variable "content_library_name" { type = string - description = "The name of the vSphere content library (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html?hWord=N4IghgNiBcIMYHsB2AXApqgBBAlgIwCcwCBPEAXyA)." + description = "The name of the vSphere content library (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-254B2CE8-20A8-43F0-90E8-3F6776C2C896.html)." default = "Content library" nullable = false @@ -50,7 +50,7 @@ variable "create_content_library" { variable "content_library_items" { type = list(map(string)) - description = "List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty." + description = "List of maps of strings defining either OVA/OVF or ISO vSphere content library items (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-vm-administration/GUID-D3DD122F-16A5-4F36-8467-97994A854B16.html). At this time, VM template items are not supported by this module, but can be easily added separately. Each map must have the following keys: 'name', 'description', 'file_url', and 'type'. The value for each 'type' key must be set to either 'ovf' or 'iso'. Last, only the value for 'description' can be empty." default = [] nullable = false From af18467b4cae60a663139296ba9ee57e18275f1e Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 15:10:05 -0500 Subject: [PATCH 5/7] Bump VMware Tools version + URL to latest --- .header.md | 10 +++++----- README.md | 10 +++++----- test/examples_basic_test.go | 8 ++++---- test/examples_pub-sub_test.go | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.header.md b/.header.md index 4155414..68a9c1d 100644 --- a/.header.md +++ b/.header.md @@ -36,9 +36,9 @@ module "vsphere_content_library" { create_content_library_items = true content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "VMware Tools for Windows." - file_url = "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso" + file_url = "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso" type = "iso" }, ] @@ -57,9 +57,9 @@ module "vsphere_content_library" { create_content_library_items = true content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "VMware Tools for Windows." - file_url = "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso" + file_url = "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso" type = "iso" }, ] @@ -78,7 +78,7 @@ module "vsphere_content_library" { create_content_library_items = false content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "" file_url = "n/a" type = "iso" diff --git a/README.md b/README.md index 577ed37..4f4bad3 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ module "vsphere_content_library" { create_content_library_items = true content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "VMware Tools for Windows." - file_url = "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso" + file_url = "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso" type = "iso" }, ] @@ -58,9 +58,9 @@ module "vsphere_content_library" { create_content_library_items = true content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "VMware Tools for Windows." - file_url = "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso" + file_url = "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso" type = "iso" }, ] @@ -79,7 +79,7 @@ module "vsphere_content_library" { create_content_library_items = false content_library_items = [ { - name = "vmware-tools-windows-11.3.0-18" + name = "vmware-tools-windows-12.0.6-20" description = "" file_url = "n/a" type = "iso" diff --git a/test/examples_basic_test.go b/test/examples_basic_test.go index e2b214a..49ef856 100644 --- a/test/examples_basic_test.go +++ b/test/examples_basic_test.go @@ -53,9 +53,9 @@ func TestExamplesNewContentLibraryNoItems(t *testing.T) { // // "create_tag_category": false, // // "create_tags": false, // "content_library_items": []interface{}{map[string]interface{}{ - // "name": "vmware-tools-windows-11.3.0-18", + // "name": "vmware-tools-windows-12.0.6-20", // "description": "VMware Tools for Windows.", - // "file_url": "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso", + // "file_url": "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso", // "type": "iso", // }}, // }, @@ -145,9 +145,9 @@ func TestExamplesNewContentLibraryImportItem(t *testing.T) { // "create_tag_category": false, // "create_tags": false, "content_library_items": []interface{}{map[string]interface{}{ - "name": "vmware-tools-windows-11.3.0-18", + "name": "vmware-tools-windows-12.0.6-20", "description": "VMware Tools for Windows.", - "file_url": "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso", + "file_url": "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso", "type": "iso", }}, }, diff --git a/test/examples_pub-sub_test.go b/test/examples_pub-sub_test.go index 8ff6836..a8498b8 100644 --- a/test/examples_pub-sub_test.go +++ b/test/examples_pub-sub_test.go @@ -35,9 +35,9 @@ func TestExamplesPubSub(t *testing.T) { // // "create_tag_category": false, // // "create_tags": false, // "content_library_items": []interface{}{map[string]interface{}{ - // "name": "vmware-tools-windows-11.3.0-18", + // "name": "vmware-tools-windows-12.0.6-20", // "description": "VMware Tools for Windows.", - // "file_url": "https://packages.vmware.com/tools/esx/7.0u3/windows/VMware-tools-windows-11.3.0-18090558.iso", + // "file_url": "https://packages.vmware.com/tools/esx/8.0/windows/VMware-tools-windows-12.0.6-20104755.iso", // "type": "iso", // }}, // }, From 806984e54875bddd7bff43f01331180779d297df Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 15:11:43 -0500 Subject: [PATCH 6/7] Bump example module version to 1.0.0 * In advance of release --- .header.md | 12 ++++++------ README.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.header.md b/.header.md index 68a9c1d..f5f235d 100644 --- a/.header.md +++ b/.header.md @@ -11,7 +11,7 @@ You can optionally specify a list of new [items](https://docs.vmware.com/en/VMwa ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" datacenter_name = "SDDC-Datacenter" datastore_name = "WorkloadDatastore" @@ -26,7 +26,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" datacenter_name = "SDDC-Datacenter" datastore_name = "WorkloadDatastore" @@ -50,7 +50,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-content-library" create_content_library = false @@ -71,7 +71,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-content-library" create_content_library = false @@ -92,7 +92,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-publisher" create_content_library = true @@ -108,7 +108,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-subscriber" create_content_library = true diff --git a/README.md b/README.md index 4f4bad3..04950cd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You can optionally specify a list of new [items](https://docs.vmware.com/en/VMwa ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" datacenter_name = "SDDC-Datacenter" datastore_name = "WorkloadDatastore" @@ -27,7 +27,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" datacenter_name = "SDDC-Datacenter" datastore_name = "WorkloadDatastore" @@ -51,7 +51,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-content-library" create_content_library = false @@ -72,7 +72,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-content-library" create_content_library = false @@ -93,7 +93,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-publisher" create_content_library = true @@ -109,7 +109,7 @@ module "vsphere_content_library" { ```hcl module "vsphere_content_library" { source = "aws-ia/content-library/vsphere" - version = ">= 0.0.1" + version = ">= 1.0.0" content_library_name = "example-subscriber" create_content_library = true @@ -133,7 +133,7 @@ module "vsphere_content_library" { | Name | Version | |------|---------| -| [vsphere](#provider\_vsphere) | >= 2.1.0 | +| [vsphere](#provider\_vsphere) | 2.2.0 | ## Modules From ede8e2ce0fa52a5bab1fcc9fba5866fd51bd95e4 Mon Sep 17 00:00:00 2001 From: Troy Lindsay Date: Thu, 5 Jan 2023 15:45:09 -0500 Subject: [PATCH 7/7] Fix vSphere provider version in docs * Forgot to ignore the lockfile ``` terraform-docs -c ./.terraform-docs.yaml --lockfile=false . ``` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04950cd..84f5f41 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ module "vsphere_content_library" { | Name | Version | |------|---------| -| [vsphere](#provider\_vsphere) | 2.2.0 | +| [vsphere](#provider\_vsphere) | >= 2.1.0 | ## Modules