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

r/content_library: Subscription and publication support #1197

Merged
merged 1 commit into from
Sep 2, 2020
Merged

r/content_library: Subscription and publication support #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 67 additions & 12 deletions vsphere/internal/helper/contentlibrary/content_library_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ package contentlibrary
import (
"context"
"fmt"
"log"
"path/filepath"
"time"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/datastore"
"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/provider"
"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/structure"
"github.com/vmware/govmomi"
"github.com/vmware/govmomi/vapi/library"
"github.com/vmware/govmomi/vapi/rest"
"github.com/vmware/govmomi/vapi/vcenter"
"log"
"path/filepath"
"time"
)

// FromName accepts a Content Library name and returns a Library object.
Expand Down Expand Up @@ -48,15 +50,37 @@ func FromID(c *rest.Client, id string) (*library.Library, error) {
}

// CreateLibrary creates a Content Library.
func CreateLibrary(c *rest.Client, name string, description string, backings []library.StorageBackings) (string, error) {
func CreateLibrary(d *schema.ResourceData, restclient *rest.Client, backings []library.StorageBackings) (string, error) {
name := d.Get("name").(string)
log.Printf("[DEBUG] contentlibrary.CreateLibrary: Creating content library %s", name)
clm := library.NewManager(c)
clm := library.NewManager(restclient)
ctx := context.TODO()
lib := library.Library{
Description: description,
Description: d.Get("description").(string),
Name: name,
Storage: backings,
Type: "LOCAL", // govmomi only supports LOCAL library creation
Type: "LOCAL",
}
if len(d.Get("publication").([]interface{})) > 0 {
publication := d.Get("publication").([]interface{})[0].(map[string]interface{})
lib.Publication = &library.Publication{
Published: structure.BoolPtr(publication["published"].(bool)),
AuthenticationMethod: publication["authentication_method"].(string),
UserName: publication["username"].(string),
Password: publication["password"].(string),
}
}
if len(d.Get("subscription").([]interface{})) > 0 {
subscription := d.Get("subscription").([]interface{})[0].(map[string]interface{})
lib.Subscription = &library.Subscription{
AutomaticSyncEnabled: structure.BoolPtr(subscription["automatic_sync"].(bool)),
OnDemand: structure.BoolPtr(subscription["on_demand"].(bool)),
AuthenticationMethod: subscription["authentication_method"].(string),
UserName: subscription["username"].(string),
Password: subscription["password"].(string),
SubscriptionURL: subscription["subscription_url"].(string),
}
lib.Type = "SUBSCRIBED"
}
id, err := clm.CreateLibrary(ctx, lib)
if err != nil {
Expand All @@ -66,7 +90,7 @@ func CreateLibrary(c *rest.Client, name string, description string, backings []l
return id, nil
}

func UpdateLibrary(c *rest.Client, ol *library.Library, name string, description string, backings []library.StorageBackings) error {
func updateLibrary(c *rest.Client, ol *library.Library, name string, description string, backings []library.StorageBackings) error {
// Not currently supported in govmomi
return nil
}
Expand Down Expand Up @@ -195,8 +219,8 @@ func DeleteLibraryItem(c *rest.Client, item *library.Item) error {
func ExpandStorageBackings(c *govmomi.Client, d *schema.ResourceData) ([]library.StorageBackings, error) {
log.Printf("[DEBUG] contentlibrary.ExpandStorageBackings: Expanding OVF storage backing.")
sb := []library.StorageBackings{}
for _, dsId := range d.Get("storage_backing").(*schema.Set).List() {
ds, err := datastore.FromID(c, dsId.(string))
for _, dsID := range d.Get("storage_backing").(*schema.Set).List() {
ds, err := datastore.FromID(c, dsID.(string))
if err != nil {
return nil, provider.ProviderError(d.Id(), "ExpandStorageBackings", err)
}
Expand All @@ -209,8 +233,39 @@ func ExpandStorageBackings(c *govmomi.Client, d *schema.ResourceData) ([]library
return sb, nil
}

// FlattenPublication takes a Publication sub resource and sets it in ResourceData.
func FlattenPublication(d *schema.ResourceData, publication *library.Publication) error {
if publication == nil {
return nil
}
log.Printf("[DEBUG] contentlibrary.FlattenPublication: Flattening publication.")
flatPublication := map[string]interface{}{}
flatPublication["authentication_method"] = publication.AuthenticationMethod
flatPublication["username"] = publication.UserName
flatPublication["password"] = d.Get("publication.0.password").(string)
flatPublication["publish_url"] = publication.PublishURL
flatPublication["published"] = publication.Published
return d.Set("publication", []interface{}{flatPublication})
}

// FlattenSubscription takes a Subscription sub resource and sets it in ResourceData.
func FlattenSubscription(d *schema.ResourceData, subscription *library.Subscription) error {
if subscription == nil {
return nil
}
log.Printf("[DEBUG] contentlibrary.FlattenSubscription: Flattening subscription.")
flatSubscription := map[string]interface{}{}
flatSubscription["authentication_method"] = subscription.AuthenticationMethod
flatSubscription["username"] = subscription.UserName
flatSubscription["password"] = d.Get("subscription.0.password").(string)
flatSubscription["subscription_url"] = subscription.SubscriptionURL
flatSubscription["automatic_sync"] = subscription.AutomaticSyncEnabled
flatSubscription["on_demand"] = subscription.OnDemand
return d.Set("subscription", []interface{}{flatSubscription})
}

// FlattenStorageBackings takes a list of StorageBackings, and returns a list of datastore IDs.
func FlattenStorageBackings(sb []library.StorageBackings) []string {
func FlattenStorageBackings(d *schema.ResourceData, sb []library.StorageBackings) error {
log.Printf("[DEBUG] contentlibrary.FlattenStorageBackings: Flattening OVF storage backing.")
sbl := []string{}
for _, backing := range sb {
Expand All @@ -219,7 +274,7 @@ func FlattenStorageBackings(sb []library.StorageBackings) []string {
}
}
log.Printf("[DEBUG] contentlibrary.FlattenStorageBackings: Successfully flattened OVF storage backing.")
return sbl
return d.Set("storage_backing", sbl)
}

// MapStorageDevices maps disks defined in the OVF to datastores.
Expand Down
113 changes: 102 additions & 11 deletions vsphere/resource_vsphere_content_library.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,94 @@ func resourceVSphereContentLibrary() *schema.Resource {
Description: "The name of the content library.",
Elem: &schema.Schema{Type: schema.TypeString},
},
"publication": {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Computed: true,
Description: "Publication configuration for content library.",
ConflictsWith: []string{"subscription"},
MaxItems: 1,
Elem: &schema.Resource{Schema: map[string]*schema.Schema{
"authentication_method": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "NONE",
},
"username": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
Optional: true,
},
"password": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
Optional: true,
},
"published": {
Type: schema.TypeBool,
ForceNew: true,
Optional: true,
Default: false,
},
"publish_url": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
},
},
},
},
"subscription": {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Description: "Publication configuration for content library.",
ConflictsWith: []string{"publication"},
MaxItems: 1,
Elem: &schema.Resource{Schema: map[string]*schema.Schema{
"authentication_method": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "NONE",
},
"subscription_url": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "NONE",
},
"username": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
Optional: true,
},
"password": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
Optional: true,
},
"on_demand": {
Type: schema.TypeBool,
ForceNew: true,
Optional: true,
Default: true,
},
"automatic_sync": {
Type: schema.TypeBool,
ForceNew: true,
Optional: true,
Default: false,
},
},
},
},
},
}
}
Expand All @@ -47,31 +135,34 @@ func resourceVSphereContentLibraryRead(d *schema.ResourceData, meta interface{})
if strings.Contains(err.Error(), "404 Not Found") {
d.SetId("")
return nil
} else {
return err
}
return err
}
d.SetId(lib.ID)
sb := contentlibrary.FlattenStorageBackings(lib.Storage)
d.Set("name", lib.Name)
d.Set("description", lib.Description)
err = d.Set("storage_backing", sb)
if err != nil {
if err = contentlibrary.FlattenPublication(d, lib.Publication); err != nil {
return err
}
if err = contentlibrary.FlattenSubscription(d, lib.Subscription); err != nil {
return err
}
if err = contentlibrary.FlattenStorageBackings(d, lib.Storage); err != nil {
return err
}
d.Set("name", lib.Name)
d.Set("description", lib.Description)
log.Printf("[DEBUG] resourceVSphereContentLibraryRead : Content Library (%s) read is complete", d.Id())
return nil
}

func resourceVSphereContentLibraryCreate(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] resourceVSphereContentLibraryCreate : Beginning Content Library (%s) creation", d.Get("name").(string))
vc := meta.(*VSphereClient).vimClient
rc := meta.(*VSphereClient).restClient
backings, err := contentlibrary.ExpandStorageBackings(vc, d)
vimClient := meta.(*VSphereClient).vimClient
restClient := meta.(*VSphereClient).restClient
backings, err := contentlibrary.ExpandStorageBackings(vimClient, d)
if err != nil {
return err
}
id, err := contentlibrary.CreateLibrary(rc, d.Get("name").(string), d.Get("description").(string), backings)
id, err := contentlibrary.CreateLibrary(d, restClient, backings)
if err != nil {
return err
}
Expand Down
Loading