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 'read_only_shared_with_other_orgs' sharing property #1020

Merged
merged 55 commits into from
Nov 14, 2023
Merged

Add 'read_only_shared_with_other_orgs' sharing property #1020

merged 55 commits into from
Nov 14, 2023

Conversation

dataclouder
Copy link
Contributor

@dataclouder dataclouder commented Mar 17, 2023 •
edited
Loading

Update vcd_catalog_access_control with property read_only_shared_with_other_orgs, to address Issue #987

Testing

There is a curious failure that happens in some resources. It has been addressed with a not entirely satisfying retry mechanism.

To see the failure, run

VCD_SKIP_RETRY=1 go test  -tags catalog -v -timeout 0 -run 'TestAccVcdCatalogAccessControl2'

To see where the retry acts, and the failure would have occurred without it, run

VCD_RETRY_VERBOSE=1 go test  -tags catalog -v -timeout 0 -run 'TestAccVcdCatalogAccessControl2'

Each occurrence of attempts=1 (or =2) shows an averted failure.

Giuseppe Maxia added 2 commits March 17, 2023 12:17
@dataclouder dataclouder self-assigned this Mar 17, 2023
Giuseppe Maxia added 27 commits March 21, 2023 18:03
Add check in resource_vcd_catalog_test
ab6bdd9 
* Some VCD versions (< 10.4.1) fail on slow network connections and need
  a retry to complete a catalog deletion

Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
de5542f 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
22b4a79 
Signed-off-by: Giuseppe Maxia <[email protected]>
Update go.mod
9ffec97 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add catalog and VDC info to vcd_org
391d504 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add provisional test for Catalog Access Control
ce36c52 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
251e9f5 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add function testAccCheckOrgDestroy
b82af01 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add function importStateCatalogId
718a3a7 
Signed-off-by: Giuseppe Maxia <[email protected]>
Fix Elem definition
628e563 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add removal of Org users
cb86855 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add details to vcd_catalog error messages
b0cce63 
Signed-off-by: Giuseppe Maxia <[email protected]>
Add retry function and error message details
11bd2be 
Signed-off-by: Giuseppe Maxia <[email protected]>
Improve naming in TestAccVcdCatalogAccessControl2
ecb8d9e 
Signed-off-by: Giuseppe Maxia <[email protected]>
Fix handling of catalog/VDC lists in vcd_org
cd8ab4a 
Signed-off-by: Giuseppe Maxia <[email protected]>
Replace function testAccCheckVcdOrgExists
1f547d8 
Signed-off-by: Giuseppe Maxia <[email protected]>
Use 'retry' for user data setting
2667af1 
Signed-off-by: Giuseppe Maxia <[email protected]>
Update govcd
72935ed 
Signed-off-by: Giuseppe Maxia <[email protected]>
Fix tag dependency in tests
7625e07 
Signed-off-by: Giuseppe Maxia <[email protected]>
Remove redundant waitForMetadataReadiness
626afac 
Signed-off-by: Giuseppe Maxia <[email protected]>
Remove incorrect resource from test
cd2444a 
Signed-off-by: Giuseppe Maxia <[email protected]>
Update govcd
79f635b 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
48a40bc 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
cd6a25f 
Signed-off-by: Giuseppe Maxia <[email protected]>
Fix tag verify
a720f44 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
8d9e3a6 
Signed-off-by: Giuseppe Maxia <[email protected]>
Merge branch 'main' into catalog-RO-access-control
210768b 
Signed-off-by: Giuseppe Maxia <[email protected]>
Giuseppe Maxia added 3 commits October 4, 2023 17:39
lvirbalas
lvirbalas requested changes Oct 24, 2023
View reviewed changes
website/docs/r/catalog_access_control.html.markdown Outdated Show resolved Hide resolved
vcd/resource_vcd_catalog_access_control.go Show resolved Hide resolved
vcd/resource_vcd_org_user.go Show resolved Hide resolved
lvirbalas
lvirbalas approved these changes Oct 24, 2023
View reviewed changes
vcd/resource_vcd_org_user.go Show resolved Hide resolved
Giuseppe Maxia added 6 commits October 26, 2023 20:26
Didainius
Didainius approved these changes Nov 13, 2023
View reviewed changes
Copy link
Collaborator

@Didainius Didainius left a comment

Choose a reason for hiding this comment

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

I have tested it manually - setting and resetting it worked.

vcd/resource_vcd_catalog_access_control.go Outdated Show resolved Hide resolved
vcd/resource_vcd_catalog_access_control2_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_catalog_access_control.go Show resolved Hide resolved
vcd/resource_vcd_catalog_access_control2_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_org.go Show resolved Hide resolved
Giuseppe Maxia added 7 commits November 13, 2023 16:42
adambarreiro
adambarreiro approved these changes Nov 14, 2023
View reviewed changes
Copy link
Collaborator

@adambarreiro adambarreiro left a comment

Choose a reason for hiding this comment

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

LGTM!
I tried with and without retry and got the expected results.

adezxc
adezxc approved these changes Nov 14, 2023
View reviewed changes
Copy link

@adezxc adezxc left a comment

Choose a reason for hiding this comment

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

Tested with and without env variables and got the expected errors

Giuseppe Maxia added 2 commits November 14, 2023 15:43
Remove VCD_SKIP_RETRY check
c85dcea 
Signed-off-by: Giuseppe Maxia <[email protected]>
Update govcd
9fb1fb2 
Signed-off-by: Giuseppe Maxia <[email protected]>
@dataclouder dataclouder mentioned this pull request Nov 14, 2023
Closed
@dataclouder dataclouder merged commit cf5bf14 into vmware:main Nov 14, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adezxc adezxc adezxc approved these changes

@Didainius Didainius Didainius approved these changes

@lvirbalas lvirbalas lvirbalas approved these changes

@adambarreiro adambarreiro adambarreiro approved these changes

Assignees

@dataclouder dataclouder

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dataclouder @adambarreiro @lvirbalas @Didainius @adezxc