Add vra_content_sharing_policy data source and resource

* Add vra_content_sharing_policy data source and resource
* Deprecate vra_catalog_item_entitlement datasource and resource
* Deprecate vra_catalog_source_entitlement datasource and resource

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

Author: frodenas

.golangci.yml

@@ -25,8 +25,7 @@ linters:
     - typecheck
     - unconvert
     - unused
-    - vet
-    - vetshadow
+    - govet
 
 linters-settings:
   errcheck:

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/go-openapi/runtime v0.25.0
 	github.com/go-openapi/strfmt v0.21.3
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.25.0
-	github.com/vmware/vra-sdk-go v0.6.0
+	github.com/vmware/vra-sdk-go v0.6.1
 )
 
 require (

go.sum

@@ -302,8 +302,8 @@ github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
 github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/vmware/vra-sdk-go v0.6.0 h1:yQfF67UrFFWyHYcdLGK9Up710kGM57QXGLAM2j/tmtw=
-github.com/vmware/vra-sdk-go v0.6.0/go.mod h1:gUj5Z/+qvXEDk9+0NvW0ynDrMkTk3P5Bdt2JfN+AAC8=
+github.com/vmware/vra-sdk-go v0.6.1 h1:2DscXG18be7MknOX1zIZFekB/NQV3eJyH1dEkX1E0+4=
+github.com/vmware/vra-sdk-go v0.6.1/go.mod h1:gUj5Z/+qvXEDk9+0NvW0ynDrMkTk3P5Bdt2JfN+AAC8=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=

vra/data_source_catalog_item_entitlement.go

@@ -9,7 +9,8 @@ import (
 
 func dataSourceCatalogItemEntitlement() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceCatalogItemEntitlementRead,
+		DeprecationMessage: "'vra_catalog_item_entitlement' is deprecated. Use 'vra_content_sharing_policy' instead.",
+		Read:               dataSourceCatalogItemEntitlementRead,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},

vra/data_source_catalog_source_entitlement.go

@@ -11,7 +11,8 @@ import (
 
 func dataSourceCatalogSourceEntitlement() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceCatalogSourceEntitlementRead,
+		DeprecationMessage: "'vra_catalog_source_entitlement' is deprecated. Use 'vra_content_sharing_policy' instead.",
+		Read:               dataSourceCatalogSourceEntitlementRead,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},

vra/data_source_content_sharing_policy.go

@@ -0,0 +1,158 @@
+package vra
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/vmware/vra-sdk-go/pkg/client/policies"
+)
+
+func dataSourceContentSharingPolicy() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: dataSourceContentSharingPolicyRead,
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+		Schema: map[string]*schema.Schema{
+			// Input attributes
+			"id": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				Description:   "The policy ID.",
+				ConflictsWith: []string{"name"},
+			},
+			"name": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				Computed:      true,
+				Description:   "The policy name.",
+				ConflictsWith: []string{"id"},
+			},
+
+			// Computed attributes
+			"catalog_item_ids": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: "List of catalog item ids to share.",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"catalog_source_ids": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: "List of catalog source ids to share.",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"created_at": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Policy creation timestamp.",
+			},
+			"created_by": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Policy author.",
+			},
+			"description": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The policy description.",
+			},
+			"last_updated_at": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Most recent policy update timestamp.",
+			},
+			"last_updated_by": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Most recent policy editor.",
+			},
+			"org_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The ID of the organization to which the policy belongs.",
+			},
+			"project_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The ID of the project to which the policy belongs.",
+			},
+		},
+	}
+}
+
+func dataSourceContentSharingPolicyRead(_ context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	apiClient := m.(*Client).apiClient
+
+	id, idOk := d.GetOk("id")
+	name, nameOk := d.GetOk("name")
+
+	if !idOk && !nameOk {
+		return diag.Errorf("one of id or name must be provided")
+	}
+
+	if nameOk {
+		resp, err := apiClient.Policies.GetPoliciesUsingGET5(policies.NewGetPoliciesUsingGET5Params())
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		for _, policy := range resp.GetPayload().Content {
+			if policy.Name == name {
+				id = policy.ID.String()
+				break
+			}
+		}
+		if id == "" {
+			return diag.Errorf("content sharing policy with name '%s' not found", name)
+		}
+	}
+
+	resp, err := apiClient.Policies.GetPolicyUsingGET5(policies.NewGetPolicyUsingGET5Params().WithID(strfmt.UUID(id.(string))))
+	if err != nil {
+		switch err.(type) {
+		case *policies.GetPolicyUsingGET5NotFound:
+			return diag.Errorf("content sharing policy with id '%s' not found", id)
+		default:
+			// nop
+		}
+		return diag.FromErr(err)
+	}
+
+	policy := resp.GetPayload()
+	d.SetId(string(policy.ID))
+	d.Set("name", policy.Name)
+	d.Set("created_at", policy.CreatedAt.String())
+	d.Set("created_by", policy.CreatedBy)
+	d.Set("description", policy.Description)
+	d.Set("last_updated_at", policy.LastUpdatedAt.String())
+	d.Set("last_updated_by", policy.LastUpdatedBy)
+	d.Set("org_id", policy.OrgID)
+	d.Set("project_id", policy.ProjectID)
+
+	catalogItemIDs, err := extractCatalogItemIDsFromContentSharingPolicy(policy.Definition)
+	if err != nil {
+		return diag.Errorf("error extracting catalog item ids from content sharing policy: %s", err.Error())
+	}
+
+	if err := d.Set("catalog_item_ids", catalogItemIDs); err != nil {
+		return diag.Errorf("error setting catalog_item_ids: %s", err.Error())
+	}
+
+	catalogSourceIDs, err := extractCatalogSourceIDsFromContentSharingPolicy(policy.Definition)
+	if err != nil {
+		return diag.Errorf("error extracting catalog source ids from content sharing policy: %s", err.Error())
+	}
+
+	if err := d.Set("catalog_source_ids", catalogSourceIDs); err != nil {
+		return diag.Errorf("error setting catalog_source_ids: %s", err.Error())
+	}
+
+	return nil
+}

vra/data_source_content_sharing_policy_test.go

@@ -0,0 +1,91 @@
+package vra
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	"testing"
+)
+
+func TestAccDataSourceVRAContentSharingPolicy(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "vra_content_sharing_policy.test"
+	dataSourceName := "data.vra_content_sharing_policy.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheckContentSharingPolicy(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceVRAContentSharingPolicyByID(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(
+						resourceName, "name", dataSourceName, "name"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "description", dataSourceName, "description"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "project_id", dataSourceName, "project_id"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "catalog_item_ids.#", dataSourceName, "catalog_item_ids.#"),
+					resource.TestCheckTypeSetElemAttrPair(
+						resourceName, "catalog_item_ids.0", dataSourceName, "catalog_item_ids.0"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "catalog_source_ids.#", dataSourceName, "catalog_source_ids.#"),
+					resource.TestCheckTypeSetElemAttrPair(
+						resourceName, "catalog_source_ids.0", dataSourceName, "catalog_source_ids.0"),
+				),
+			},
+			{
+				Config: testAccDataSourceVRAContentSharingPolicyByName(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(
+						resourceName, "name", dataSourceName, "name"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "description", dataSourceName, "description"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "project_id", dataSourceName, "project_id"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "catalog_item_ids.#", dataSourceName, "catalog_item_ids.#"),
+					resource.TestCheckTypeSetElemAttrPair(
+						resourceName, "catalog_item_ids.0", dataSourceName, "catalog_item_ids.0"),
+					resource.TestCheckResourceAttrPair(
+						resourceName, "catalog_source_ids.#", dataSourceName, "catalog_source_ids.#"),
+					resource.TestCheckTypeSetElemAttrPair(
+						resourceName, "catalog_source_ids.0", dataSourceName, "catalog_source_ids.0"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceVRAContentSharingPolicy(rInt int) string {
+	projectID := os.Getenv("VRA_PROJECT_ID")
+	catalogItemID := os.Getenv("VRA_CATALOG_ITEM_ID")
+	catalogSourceID := os.Getenv("VRA_CATALOG_SOURCE_ID")
+	return fmt.Sprintf(`
+	resource "vra_content_sharing_policy" "test" {
+		name = "content-sharing-policy-%d"
+		description = "Content Sharing Policy %d"
+		project_id = "%s"
+		catalog_item_ids = ["%s"]
+		catalog_source_ids = ["%s"]
+	}
+	`, rInt, rInt, projectID, catalogItemID, catalogSourceID)
+}
+
+func testAccDataSourceVRAContentSharingPolicyByID(rInt int) string {
+	return testAccDataSourceVRAContentSharingPolicy(rInt) + `
+	data "vra_content_sharing_policy" "test" {
+		id = vra_content_sharing_policy.test.id
+	}`
+}
+
+func testAccDataSourceVRAContentSharingPolicyByName(rInt int) string {
+	return testAccDataSourceVRAContentSharingPolicy(rInt) + `
+	data "vra_content_sharing_policy" "test" {
+		name = vra_content_sharing_policy.test.name
+	}`
+}