Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add catalog resource and datasource metadata enhancement #780

Merged
merged 17 commits into from
Feb 28, 2022
Merged

Add catalog resource and datasource metadata enhancement #780

merged 17 commits into from
Feb 28, 2022

Conversation

mikeletux
Copy link
Contributor

This PR targets #372 regarding metadata on catalog resource and datasource.

With this enhancement, now when creating a Catalog using vcd_catalog it is possible to include metadata. An example would be:

resource "vcd_catalog" "test-catalog" {
  org = "my_org" 
  
  name               = "my_catalog"
  description        = "This is just a test catalog"

  delete_force      = "true"
  delete_recursive  = "true"

  metadata = {
    catalog  = "catalog Metadata v2"
    catalog2 = "catalog Metadata2 v2"
    catalog3 = "catalog Metadata3"
  }
}

Also, when using vcd_catalog datasource, also metadata regarding a catalog will be retrieved in the compute field metadata.

@mikeletux mikeletux marked this pull request as ready for review February 3, 2022 17:04
vbauzys
vbauzys suggested changes Feb 4, 2022
View reviewed changes
Copy link
Contributor

@vbauzys vbauzys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

first scan :)

vcd/resource_vcd_catalog.go Outdated Show resolved Hide resolved
vcd/resource_vcd_catalog.go Outdated Show resolved Hide resolved
lvirbalas
lvirbalas requested changes Feb 8, 2022
View reviewed changes
website/docs/r/catalog.html.markdown Outdated Show resolved Hide resolved
vcd/resource_vcd_catalog.go Outdated Show resolved Hide resolved
@lvirbalas lvirbalas removed the request for review from dataclouder February 14, 2022 16:02
vbauzys
vbauzys approved these changes Feb 15, 2022
View reviewed changes
Copy link
Contributor

@vbauzys vbauzys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

lvirbalas
lvirbalas requested changes Feb 15, 2022
View reviewed changes
website/docs/d/catalog.html.markdown Outdated
@@ -46,6 +46,7 @@ The following arguments are supported:
* `publish_enabled` - (*v3.6+*) Enable allows to publish a catalog externally to make its vApp templates and media files available for subscription by organizations outside the Cloud Director installation. Default is `false`.
* `cache_enabled` - (*v3.6+*) Enable early catalog export to optimize synchronization. Default is `false`.
* `preserve_identity_information` - (*v3.6+*) Enable include BIOS UUIDs and MAC addresses in the downloaded OVF package. Preserving the identity information limits the portability of the package and you should use it only when necessary. Default is `false`.
* `metadata` - (*v3.6+*) Key value map of metadata.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an extra space after dash.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

vcd/resource_vcd_catalog.go Outdated Show resolved Hide resolved
Miguel Sama added 13 commits February 28, 2022 12:07
Add metadata to resource_vcd_catalog schema
6c86cd3 
Signed-off-by: Miguel Sama <msama@vmware.com>
Add metadata testing to resource_vcd_catalog
379bd36 
Signed-off-by: Miguel Sama <msama@vmware.com>
Change govcd.MetadataStringValue to types.MetadataStringValue to matc…
2ce1f51 
…h go-vcloud-sdk

Signed-off-by: Miguel Sama <msama@vmware.com>
Change metadata testing names to match the testcase
f2e215f 
Signed-off-by: Miguel Sama <msama@vmware.com>
Improve catalog datasource to support metadata
9cc55ba 
Signed-off-by: Miguel Sama <msama@vmware.com>
Change methods name to match go-vcd
1666a97 
  * Change catalog.DeleteMetadata to catalog.DeleteMetadataEntry
  * Change catalog.AddMetadata to catalog.AddMetadataEntry

Signed-off-by: Miguel Sama <msama@vmware.com>
Add website docs related catalog metadata in resource and datasource
f4eacca 
Signed-off-by: Miguel Sama <msama@vmware.com>
Add changelog for metadata in catalog improvement
311d8cb 
Signed-off-by: Miguel Sama <msama@vmware.com>
Fix catalog metadata test sample names
3d04251 
Signed-off-by: Miguel Sama <msama@vmware.com>
Add go sum and mod for testing
1ad69a5 
Signed-off-by: Miguel Sama <msama@vmware.com>
Replace deprecated metadata methods with new ones
4716387 
Signed-off-by: Miguel Sama <msama@vmware.com>
Change wrong error media item to catalog
5134cfa 
Signed-off-by: Miguel Sama <msama@vmware.com>
Add missing dot to docs sentence
df6efb0 
Signed-off-by: Miguel Sama <msama@vmware.com>
Miguel Sama added 4 commits February 28, 2022 12:12
Fix typo in docs
d2df836 
Signed-off-by: Miguel Sama <msama@vmware.com>
Remove non applicable comment
0a5a5c3 
Signed-off-by: Miguel Sama <msama@vmware.com>
Update go.mod and small fixes
3f631b6 
Signed-off-by: Miguel Sama <msama@vmware.com>
Fix go.mod and go.sum
a99e432 
Signed-off-by: Miguel Sama <msama@vmware.com>
@mikeletux mikeletux merged commit 99dc59f into vmware:main Feb 28, 2022
@mikeletux mikeletux deleted the add-catalog-metadata branch February 28, 2022 11:47
@mikeletux mikeletux mentioned this pull request Feb 28, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adambarreiro adambarreiro adambarreiro approved these changes

@lvirbalas lvirbalas lvirbalas approved these changes

@Didainius Didainius Didainius approved these changes

@vbauzys vbauzys vbauzys approved these changes

Assignees

@mikeletux mikeletux

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mikeletux @adambarreiro @lvirbalas @Didainius @vbauzys