Fixes

Author: ezilber-akamai

docs/data-sources/consumer_image_share_group_image_shares.md

@@ -6,8 +6,8 @@ description: |-
 
 # Data Source: linode\_consumer\_image\_share\_group\_image\_shares
 
-Provides information about a list of Images that match a set of filters that have been 
-.shared in the Image Share Group that the provided Token has been accepted into 
+Provides information about a list of Images that match a set of filters that have been
+.shared in the Image Share Group that the provided Token has been accepted into
 For more information, see the [Linode APIv4 docs](TODO).
 
 ## Example Usage
@@ -69,14 +69,14 @@ Each Image Share will be stored in the `images_shares` attribute and will export
 * `is_public` - True if the Image is public.
 
 * `image_sharing` - Details about image sharing, including who the image is shared with and by.
-    * `shared_with` - Details about who the image is shared with.
-        * `sharegroup_count` - The number of sharegroups the private image is present in.
-        * `sharegroup_list_url` - The GET api url to view the sharegroups in which the image is shared.
-    * `shared_by` - Details about who the image is shared by.
-        * `sharegroup_id` - The sharegroup_id from the im_ImageShare row.
-        * `sharegroup_uuid` - The sharegroup_uuid from the im_ImageShare row.
-        * `sharegroup_label` - The label from the associated im_ImageShareGroup row.
-        * `source_image_id` - The image id of the base image (will only be shown to producers, will be null for consumers).
+  * `shared_with` - Details about who the image is shared with.
+    * `sharegroup_count` - The number of sharegroups the private image is present in.
+    * `sharegroup_list_url` - The GET api url to view the sharegroups in which the image is shared.
+  * `shared_by` - Details about who the image is shared by.
+    * `sharegroup_id` - The sharegroup_id from the im_ImageShare row.
+    * `sharegroup_uuid` - The sharegroup_uuid from the im_ImageShare row.
+    * `sharegroup_label` - The label from the associated im_ImageShareGroup row.
+    * `source_image_id` - The image id of the base image (will only be shown to producers, will be null for consumers).
 
 * `size` - The minimum size this Image needs to deploy. Size is in MB. example: 2500
 

docs/data-sources/producer_image_share_group.md

@@ -9,7 +9,6 @@ description: |-
 `linode_producer_image_share_group` provides details about an Image Share Group.
 For more information, see the [Linode APIv4 docs](TODO).
 
-
 ## Example Usage
 
 The following example shows how the datasource might be used to obtain additional information about an Image Share Group.

docs/data-sources/producer_image_share_group_image_shares.md

@@ -70,14 +70,14 @@ Each Image Share will be stored in the `images_shares` attribute and will export
 * `is_public` - True if the Image is public.
 
 * `image_sharing` - Details about image sharing, including who the image is shared with and by.
-    * `shared_with` - Details about who the image is shared with.
-        * `sharegroup_count` - The number of sharegroups the private image is present in.
-        * `sharegroup_list_url` - The GET api url to view the sharegroups in which the image is shared.
-    * `shared_by` - Details about who the image is shared by.
-        * `sharegroup_id` - The sharegroup_id from the im_ImageShare row.
-        * `sharegroup_uuid` - The sharegroup_uuid from the im_ImageShare row.
-        * `sharegroup_label` - The label from the associated im_ImageShareGroup row.
-        * `source_image_id` - The image id of the base image (will only be shown to producers, will be null for consumers).
+  * `shared_with` - Details about who the image is shared with.
+    * `sharegroup_count` - The number of sharegroups the private image is present in.
+    * `sharegroup_list_url` - The GET api url to view the sharegroups in which the image is shared.
+  * `shared_by` - Details about who the image is shared by.
+    * `sharegroup_id` - The sharegroup_id from the im_ImageShare row.
+    * `sharegroup_uuid` - The sharegroup_uuid from the im_ImageShare row.
+    * `sharegroup_label` - The label from the associated im_ImageShareGroup row.
+    * `source_image_id` - The image id of the base image (will only be shown to producers, will be null for consumers).
 
 * `size` - The minimum size this Image needs to deploy. Size is in MB. example: 2500
 

linode/framework_provider.go

@@ -264,6 +264,9 @@ func (p *FrameworkProvider) Resources(ctx context.Context) []func() resource.Res
 		networkingipassignment.NewResource,
 		obj.NewResource,
 		databasemysqlv2.NewResource,
+		producerimagesharegroup.NewResource,
+		producerimagesharegroupmember.NewResource,
+		consumerimagesharegrouptoken.NewResource,
 	}
 }
 

linode/producerimagesharegroup/framework_models.go

@@ -2,7 +2,6 @@ package producerimagesharegroup
 
 import (
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
-	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/linode/linodego"
@@ -52,12 +51,9 @@ func (data *ResourceModel) FlattenImageShareGroup(
 		data.Expiry, timetypes.NewRFC3339TimePointerValue(imageShareGroup.Expiry), preserveKnown,
 	)
 
-	// Images must persist in state across CRUD operations but is not returned by the API. It will be maintained
-	// manually as a part of Create, Update, and Read, so we only need to set it here if it is null or unknown
-	// so that it is properly typed.
-	if data.Images.IsNull() || data.Images.IsUnknown() {
-		data.Images = types.ListValueMust(imageShareGroupImage.Type(), []attr.Value{})
-	}
+	// Images will persist in state across CRUD operations even though it is not returned by the API. It is maintained
+	// manually as a part of Create, Update, and Read. We do not need to set it here because it defaults to a
+	// properly typed empty list when omitted from the config.
 }
 
 type DataSourceModel struct {

linode/producerimagesharegroup/framework_resource.go

@@ -197,16 +197,6 @@ func (r *Resource) Update(
 		return
 	}
 
-	// Refresh remote state to ensure accuracy
-	sg, err := client.GetImageShareGroup(ctx, imageShareGroupID)
-	if err != nil {
-		resp.Diagnostics.AddError(
-			"Failed to read Image Share Group.",
-			err.Error(),
-		)
-		return
-	}
-
 	imagesResp, err := client.ImageShareGroupListImageShareEntries(ctx, imageShareGroupID, nil)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -339,7 +329,7 @@ func (r *Resource) Update(
 	}
 
 	// Refresh and persist final state
-	sg, err = client.GetImageShareGroup(ctx, imageShareGroupID)
+	sg, err := client.GetImageShareGroup(ctx, imageShareGroupID)
 	if err != nil {
 		resp.Diagnostics.AddError("Failed to re-fetch share group", err.Error())
 		return

linode/producerimagesharegroup/framework_schema_resource.go

@@ -2,11 +2,14 @@ package producerimagesharegroup
 
 import (
 	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
+	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listdefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 var imageShareGroupImage = schema.NestedAttributeObject{
@@ -85,6 +88,9 @@ var frameworkResourceSchema = schema.Schema{
 			PlanModifiers: []planmodifier.List{
 				listplanmodifier.UseStateForUnknown(),
 			},
+			// Default to an empty list to ensure proper typing in state when not specified in config. This makes
+			// it so that the user specifying an empty list and not specifying the attribute at all is equivalent.
+			Default: listdefault.StaticValue(types.ListValueMust(imageShareGroupImage.Type(), []attr.Value{})),
 		},
 	},
 }

linode/producerimagesharegroup/tmpl/updates.gotf

@@ -35,6 +35,11 @@ resource "linode_producer_image_share_group" "foobar" {
   label       = "{{ .ImageShareGroupLabel }}"
   description = "{{ .ImageShareGroupDescription }}"
 
+  depends_on = [
+    linode_image.foobar,
+    linode_image.barfoo,
+  ]
+
   {{- if .Images }}
   images = [
     {{- range .Images }}