Add a few new catalog item resources and datasources

* Add vra_catalog_item_vm_image resource and datasource
* Add vra_catalog_item_vro_workflow resource and datasource

Signed-off-by: Ferran Rodenas <[email protected]>

Author: frodenas

docs/data-sources/vra_catalog_item.md

@@ -41,17 +41,19 @@ data "vra_catalog_item" "this" {
 
 ## Attribute Reference
 
-* `created_at` - Date-time when the entity was created.
+* `created_at` - Date when the entity was created. The date is in ISO 8601 and UTC.
 
 * `created_by` - The user the entity was created by.
 
-* `description` - Catalog item description.
+* `description` - A human-friendly description for the catalog item.
 
-* `form_id` - Form ID.
+* `form_id` - ID of the form associated with this catalog item.
 
-* `icon_id` - Icon ID.
+* `global` - Whether to allow this catalog to be shared with multiple projects or to restrict it to the specified project.
 
-* `last_updated_at` - Date-time when the entity was last updated.
+* `icon_id` - ID of the icon associated with this catalog item.
+
+* `last_updated_at` - Date when the entity was last updated. The date is ISO 8601 and UTC.
 
 * `last_updated_by` - The user the entity was last updated by.
 
@@ -73,6 +75,8 @@ data "vra_catalog_item" "this" {
 
 * `source_name` - LibraryItem source name.
 
+* `source_project_id` - Project ID with which the catalog item was associated when created.
+
 * `type` -
 
   * `description` - A human friendly description.

docs/resources/vra_catalog_item_vm_image.md

@@ -0,0 +1,61 @@
+---
+page_title: "VMware Aria Automation: vra_catalog_item_vm_image"
+description: A resource for VM Image Catalog Items.
+---
+
+# Resource: vra_catalog_item_vm_image
+
+Creates a Catalog Item resource from a VM Image.
+
+## Example Usages
+
+The following example shows how to create a catalog item resource from a VM image:
+
+```hcl
+resource "vra_catalog_item_vm_image" "catalog_item_vm_image" {
+  name        = "terraform-vm-image"
+  description = "Catalog Item [terraform-vm-image] created by Terraform"
+  project_id  = var.project_id
+
+  image_name   = var.image_name
+  cloud_config = "#cloud-config\n# Sample cloud-config creating an admin user. Items in {{}} will appear as user inputs when deploying the VM.\nusers:\n  - name: {{user_name}}\n    plain_text_passwd: {{password}}\n    lock_passwd: false\n    sudo:\n      - ALL=(ALL) NOPASSWD:ALL\n    groups: sudo"
+}
+```
+
+## Argument Reference
+
+Create your resource with the following arguments:
+
+* `cloud_config` - (Optional) Cloud config script to be applied to VMs provisioned from this image.
+
+* `description` - (Optional) A human-friendly description for the catalog item.
+
+* `global` - (Optional) Whether to allow this catalog to be shared with multiple projects or to restrict it to the specified project.
+
+* `icon_id` - (Optional) ID of the icon to associate with this catalog item.
+
+* `image_name` - (Required) Name of the VM image to publish.
+
+* `name` - (Required) The name of the catalog item.
+
+* `project_id` - (Required) ID of the project to share this catalog item with.
+
+* `select_zone` - (Optional) Whether to create a zone input for the published catalog item.
+
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `created_at` - Date when the entity was created. The date is in ISO 8601 and UTC.
+
+* `created_by` - The user the entity was created by.
+
+* `last_updated_at` - Date when the entity was last updated. The date is ISO 8601 and UTC.
+
+* `last_updated_by` - The user the entity was last updated by.
+
+## Import
+
+To import an existing Catalog Item, use the `id` as in the following example:
+
+`$ terraform import vra_catalog_item_vm_image.catalog_item_vm_image "b580ef9f-f191-4de2-b6f4-96f29d8c8d3d"`

docs/resources/vra_catalog_item_vro_workflow.md

@@ -0,0 +1,56 @@
+---
+page_title: "VMware Aria Automation: vra_catalog_item_vro_workflow"
+description: A resource for vRO Workflow Catalog Items.
+---
+
+# Resource: vra_catalog_item_vro_workflow
+
+Creates a Catalog Item resource from a vRO Workflow.
+
+## Example Usages
+
+The following example shows how to create a catalog item resource from a vRO Workflow:
+
+```hcl
+resource "vra_catalog_item_vro_workflow" "catalog_item_vro_workflow" {
+  name        = "terraform-vro-workflow"
+  description = "Catalog Item [terraform-vro-workflow] created by Terraform"
+  project_id  = var.project_id
+
+  workflow_id = var.workflow_id
+}
+```
+
+## Argument Reference
+
+Create your resource with the following arguments:
+
+* `description` - (Optional) A human-friendly description for the catalog item.
+
+* `global` - (Optional) Whether to allow this catalog to be shared with multiple projects or to restrict it to the specified project.
+
+* `icon_id` - (Optional) ID of the icon to associate with this catalog item.
+
+* `name` - (Required) The name of the catalog item.
+
+* `project_id` - (Required) ID of the project to share this catalog item with.
+
+* `workflow_id` - (Required) ID of the vRO workflow to publish.
+
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `created_at` - Date when the entity was created. The date is in ISO 8601 and UTC.
+
+* `created_by` - The user the entity was created by.
+
+* `last_updated_at` - Date when the entity was last updated. The date is ISO 8601 and UTC.
+
+* `last_updated_by` - The user the entity was last updated by.
+
+## Import
+
+To import an existing Catalog Item, use the `id` as in the following example:
+
+`$ terraform import vra_catalog_item_vro_workflow.catalog_item_vro_workflow "a090b0c2-5b49-4fb5-9e69-c1b84b01c908"`

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/hashicorp/terraform-plugin-testing v1.12.0
-	github.com/vmware/vra-sdk-go v0.6.3
+	github.com/vmware/vra-sdk-go v0.6.4
 )
 
 require (
@@ -74,7 +74,7 @@ require (
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/tools v0.25.0 // indirect

go.sum

@@ -283,8 +283,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/vmware/vra-sdk-go v0.6.3 h1:Ppzt8jNEoGJbrSyK4NfY5fzi23xDSNM1ybRXgoOWHJQ=
-github.com/vmware/vra-sdk-go v0.6.3/go.mod h1:gUj5Z/+qvXEDk9+0NvW0ynDrMkTk3P5Bdt2JfN+AAC8=
+github.com/vmware/vra-sdk-go v0.6.4 h1:uXXQA+dvDvP/WH3rEFoc5rpiWNuTw9IECu7w07qiHsc=
+github.com/vmware/vra-sdk-go v0.6.4/go.mod h1:gUj5Z/+qvXEDk9+0NvW0ynDrMkTk3P5Bdt2JfN+AAC8=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
@@ -346,8 +346,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vra/catalog_item_helper.go

@@ -0,0 +1,35 @@
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
+// SPDX-License-Identifier: MPL-2.0
+
+package vra
+
+import "encoding/json"
+
+const (
+	CatalogItemVMImageTypeID     string = "com.vmw.vmimage"
+	CatalogItemVroWorkflowTypeID string = "com.vmw.vro.workflow"
+)
+
+type CatalogItemVMImagePublishSpec struct {
+	CloudConfig *string `json:"cloudConfig,omitempty"`
+	ImageName   string  `json:"imageName"`
+	SelectZone  *bool   `json:"selectZone,omitempty"`
+}
+
+type CatalogItemVroWorkflowPublishSpec struct {
+	WorkflowID string `json:"workflowId"`
+}
+
+func catalogItemSpecConvert(genericSpec any, castedSpec any) error {
+	specJSON, err := json.Marshal(genericSpec)
+	if err != nil {
+		return err
+	}
+
+	if err := json.Unmarshal(specJSON, &castedSpec); err != nil {
+		return err
+	}
+
+	return nil
+}

vra/data_source_catalog_item.go

@@ -18,20 +18,24 @@ func dataSourceCatalogItem() *schema.Resource {
 		Read: dataSourceCatalogItemRead,
 
 		Schema: map[string]*schema.Schema{
-			"created_at": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "Date-time when the entity was created.",
+			"id": {
+				Type:          schema.TypeString,
+				Computed:      true,
+				ConflictsWith: []string{"name"},
+				Description:   "The id of catalog item.",
+				Optional:      true,
 			},
-			"created_by": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "The user the entity was created by.",
+			"name": {
+				Type:          schema.TypeString,
+				Computed:      true,
+				ConflictsWith: []string{"id"},
+				Description:   "The name of the catalog item.",
+				Optional:      true,
 			},
-			"description": {
+			"project_id": {
 				Type:        schema.TypeString,
-				Computed:    true,
-				Description: "Catalog item description.",
+				Optional:    true,
+				Description: "The id of the project to narrow the search while looking for catalog items.",
 			},
 			"expand_projects": {
 				Type:        schema.TypeBool,
@@ -43,42 +47,46 @@ func dataSourceCatalogItem() *schema.Resource {
 				Optional:    true,
 				Description: "Flag to indicate whether to expand detailed versions of the catalog item.",
 			},
-			"form_id": {
+
+			"created_at": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "Form ID.",
+				Description: "Date when the entity was created. The date is in ISO 8601 and UTC.",
 			},
-			"icon_id": {
+			"created_by": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "Icon ID.",
+				Description: "The user the entity was created by.",
 			},
-			"id": {
+			"description": {
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
-				Description: "The id of catalog item. One of `id` or `name` must be provided.",
+				Description: "A human-friendly description for the catalog item.",
 			},
-			"last_updated_at": {
+			"form_id": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "Date-time when the entity was last updated.",
+				Description: "ID of the form associated with this catalog item.",
 			},
-			"last_updated_by": {
+			"global": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Whether to allow this catalog to be shared with multiple projects or to restrict it to the specified project.",
+			},
+			"icon_id": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "The user the entity was last updated by.",
+				Description: "ID of the icon associated with this catalog item.",
 			},
-			"name": {
+			"last_updated_at": {
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
-				Description: "The name of the catalog item. One of `id` or `name` must be provided.",
+				Description: "Date when the entity was last updated. The date is ISO 8601 and UTC.",
 			},
-			"project_id": {
+			"last_updated_by": {
 				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "The id of the project to narrow the search while looking for catalog items.",
+				Computed:    true,
+				Description: "The user the entity was last updated by.",
 			},
 			"project_ids": {
 				Type:        schema.TypeSet,
@@ -104,6 +112,11 @@ func dataSourceCatalogItem() *schema.Resource {
 				Computed:    true,
 				Description: "LibraryItem source name.",
 			},
+			"source_project_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Project ID with which the catalog item was associated when created.",
+			},
 			"type":     resourceReferenceSchema(),
 			"versions": catalogItemVersionSchema(),
 		},
@@ -118,7 +131,7 @@ func dataSourceCatalogItemRead(d *schema.ResourceData, meta interface{}) error {
 	expandProjects := d.Get("expand_projects").(bool)
 
 	if !idOk && !nameOk {
-		return fmt.Errorf("one of id or name is required")
+		return fmt.Errorf("one of `id` or `name` is required")
 	}
 
 	if !idOk {
@@ -148,7 +161,7 @@ func dataSourceCatalogItemRead(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		switch err.(type) {
 		case *catalog_items.GetCatalogItemUsingGET5NotFound:
-			return fmt.Errorf("catalog item '%s' not found", id)
+			return fmt.Errorf("catalog item `%s` not found", id)
 		default:
 			// nop
 		}
@@ -158,12 +171,13 @@ func dataSourceCatalogItemRead(d *schema.ResourceData, meta interface{}) error {
 	catalogItem := getResp.GetPayload()
 
 	d.SetId(catalogItem.ID.String())
-	d.Set("created_at", catalogItem.CreatedAt)
+	d.Set("created_at", catalogItem.CreatedAt.String())
 	d.Set("created_by", catalogItem.CreatedBy)
 	d.Set("description", catalogItem.Description)
 	d.Set("form_id", catalogItem.FormID)
+	d.Set("global", catalogItem.Global)
 	d.Set("icon_id", catalogItem.IconID)
-	d.Set("last_updated_at", catalogItem.LastUpdatedAt)
+	d.Set("last_updated_at", catalogItem.LastUpdatedAt.String())
 	d.Set("last_updated_by", catalogItem.LastUpdatedBy)
 	d.Set("name", catalogItem.Name)
 	d.Set("project_ids", catalogItem.ProjectIds)
@@ -172,6 +186,7 @@ func dataSourceCatalogItemRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("schema", string(schemaJSON))
 	d.Set("source_id", catalogItem.SourceID.String())
 	d.Set("source_name", catalogItem.SourceName)
+	d.Set("source_project_id", catalogItem.SourceProjectID)
 	d.Set("type", flattenResourceReference(catalogItem.Type))
 
 	if d.Get("expand_versions").(bool) {

vra/provider.go

@@ -141,6 +141,8 @@ func Provider() *schema.Provider {
 			"vra_blueprint":                  resourceBlueprint(),
 			"vra_blueprint_version":          resourceBlueprintVersion(),
 			"vra_catalog_item_entitlement":   resourceCatalogItemEntitlement(),
+			"vra_catalog_item_vm_image":      resourceCatalogItemVMImage(),
+			"vra_catalog_item_vro_workflow":  resourceCatalogItemVroWorkflow(),
 			"vra_catalog_source_blueprint":   resourceCatalogSourceBlueprint(),
 			"vra_catalog_source_entitlement": resourceCatalogSourceEntitlement(),
 			"vra_cloud_account_aws":          resourceCloudAccountAWS(),