feat(legacy_vendor_images): fixed review comments

Author: shreyasms07

common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go

@@ -4925,9 +4925,11 @@ func (vpc *VpcV1) ListImagesWithContext(ctx context.Context, listImagesOptions *
 		builder.AddHeader(headerName, headerValue)
 	}
 	builder.AddHeader("Accept", "application/json")
+	builder.AddQuery("future_version", fmt.Sprint("true"))
+	builder.AddQuery("version", fmt.Sprint("2025-06-30"))
 
-	builder.AddQuery("version", fmt.Sprint(*vpc.Version))
 	builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
+	builder.AddQuery("maturity", fmt.Sprint("development"))
 	if listImagesOptions.Start != nil {
 		builder.AddQuery("start", fmt.Sprint(*listImagesOptions.Start))
 	}
@@ -78033,7 +78035,7 @@ type LoadBalancerPool struct {
 	//
 	// For more information, see [Private Path network load balancer frequently asked
 	// questions](https://cloud.ibm.com/docs/vpc?topic=vpc-nlb-faqs#ppnlb-faqs).
-	HealthMonitor LoadBalancerPoolHealthMonitor `json:"health_monitor" validate:"required"`
+	HealthMonitor LoadBalancerPoolHealthMonitorIntf `json:"health_monitor" validate:"required"`
 
 	// The URL for this load balancer pool.
 	Href *string `json:"href" validate:"required"`

ibm/service/vpc/data_source_ibm_is_image.go

@@ -437,14 +437,23 @@ func imageGetById(d *schema.ResourceData, meta interface{}, identifier string) e
 		fmt.Printf("[WARN] Given image %s is deprecated and soon will be obsolete.", name)
 	}
 
-	if image.Remote != nil {
-		imageRemoteMap, err := dataSourceImageRemote(*image)
-		if err != nil {
-			return err
+	if image.Remote != nil && image.Remote.Account != nil {
+		accountMap := map[string]interface{}{}
+
+		if image.Remote.Account.ID != nil {
+			accountMap["id"] = *image.Remote.Account.ID
+		}
+		if image.Remote.Account.ResourceType != nil {
+			accountMap["resource_type"] = *image.Remote.Account.ResourceType
+		}
+
+		remoteMap := map[string]interface{}{
+			"account": []interface{}{accountMap},
 		}
-		if len(imageRemoteMap) > 0 {
-			imageRemoteList := []map[string]interface{}{imageRemoteMap}
-			d.Set(isImageRemote, imageRemoteList)
+		remoteList := []interface{}{remoteMap}
+
+		if err := d.Set(isImageRemote, remoteList); err != nil {
+			return fmt.Errorf("error setting image remote: %s", err)
 		}
 	}
 
@@ -550,24 +559,24 @@ func dataSourceImageCollectionCatalogOfferingToMap(imageCatalogOfferingItem vpcv
 }
 
 func dataSourceImageRemote(imageRemote vpcv1.Image) (map[string]interface{}, error) {
-	result := map[string]interface{}{}
+	if imageRemote.Remote == nil || imageRemote.Remote.Account == nil {
+		return nil, nil
+	}
 
-	if imageRemote.Remote != nil && imageRemote.Remote.Account != nil {
-		accountMap := map[string]interface{}{}
+	accountMap := map[string]interface{}{}
 
-		if imageRemote.Remote.Account.ID != nil {
-			accountMap["id"] = *imageRemote.Remote.Account.ID
-		}
-		if imageRemote.Remote.Account.ResourceType != nil {
-			accountMap["resource_type"] = *imageRemote.Remote.Account.ResourceType
-		}
+	if imageRemote.Remote.Account.ID != nil {
+		accountMap["id"] = *imageRemote.Remote.Account.ID
+	}
+	if imageRemote.Remote.Account.ResourceType != nil {
+		accountMap["resource_type"] = *imageRemote.Remote.Account.ResourceType
+	}
 
-		result["remote"] = map[string]interface{}{
-			"account": accountMap,
-		}
+	remoteMap := map[string]interface{}{
+		"account": []interface{}{accountMap},
 	}
 
-	return result, nil
+	return remoteMap, nil
 }
 
 func dataSourceIBMIsImageFlattenStatusReasons(result []vpcv1.ImageStatusReason) (statusReasons []map[string]interface{}) {

ibm/service/vpc/data_source_ibm_is_images.go

@@ -18,6 +18,7 @@ const (
 	isImages                = "images"
 	isImagesResourceGroupID = "resource_group"
 	isImageCatalogManaged   = "catalog_managed"
+	isImageRemoteAccountId  = "remote_account_id"
 )
 
 func DataSourceIBMISImages() *schema.Resource {
@@ -53,8 +54,9 @@ func DataSourceIBMISImages() *schema.Resource {
 				Description: "Whether the image is publicly visible or private to the account",
 			},
 			isImageRemoteAccountId: {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Filters the collection to images with a remote.account.id property matching the specified account identifier.",
 			},
 			isImageUserDataFormat: {
 				Type:        schema.TypeSet,
@@ -370,7 +372,6 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 	if v, ok := d.GetOk(isImageRemoteAccountId); ok {
 		remoteAccountId = v.(string)
 	}
-
 	var status string
 	if v, ok := d.GetOk(isImageStatus); ok {
 		status = v.(string)
@@ -389,7 +390,11 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	if remoteAccountId != "" {
-		if remoteAccountId == "null" || remoteAccountId == "not:null" {
+		if remoteAccountId == "user" {
+			remoteAccountId = "null"
+			listImagesOptions.SetRemoteAccountID(remoteAccountId)
+		} else if remoteAccountId == "provider" {
+			remoteAccountId = "not:null"
 			listImagesOptions.SetRemoteAccountID(remoteAccountId)
 		} else {
 			listImagesOptions.SetRemoteAccountID(remoteAccountId)
@@ -501,8 +506,7 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 				return err
 			}
 			if len(imageRemoteMap) > 0 {
-				imageRemoteList := []map[string]interface{}{imageRemoteMap}
-				l["remote"] = imageRemoteList
+				l["remote"] = []interface{}{imageRemoteMap}
 			}
 		}
 

ibm/service/vpc/resource_ibm_is_image.go

@@ -29,7 +29,6 @@ const (
 	isImageFile                   = "file"
 	isImageVolume                 = "source_volume"
 	isImageMinimumProvisionedSize = "size"
-	isImageRemoteAccountId        = "remote_account_id"
 
 	isImageResourceGroup    = "resource_group"
 	isImageEncryptedDataKey = "encrypted_data_key"

website/docs/d/is_image.html.markdown

@@ -34,16 +34,6 @@ data "ibm_is_image" "example" {
 }
 ```
 
-```terraform
-data "ibm_is_image" "example" {
-  remote{
-    account{
-      id = "addgdfdfd"
-    }
-  }
-}
-```
-
 ## Argument reference
 Review the argument references that you can specify for your data source.
 
@@ -57,7 +47,6 @@ Review the argument references that you can specify for your data source.
 
 - `visibility` - (Optional, String) The visibility of the image. Accepted values are `public` or `private`.
 
-- `remote-account-id` - (Optional, String) Accepted values are `provider` or `user` or valid account_id.
 
 ## Attribute reference
 In addition to all argument reference list, you can access the following attribute references after your data source is created.
@@ -115,6 +104,12 @@ In addition to all argument reference list, you can access the following attribu
 
 - `source_volume` - The source volume id of the image.
 - `user_data_format` - (String) The user data format for this image.
+- `remote` - (Optional, List) If present, this property indicates that the resource associated with this referenceis remote and therefore may not be directly retrievable.
+	            Nested schema for **remote**:			
+      - `account` - (Optional, List) If present, this property indicates that the referenced resource is remote to thisaccount, and identifies the owning account.
+				Nested schema for **account**:			
+           - `id` - (Computed, String) The unique identifier for this account.
+           - `resource_type` - (Computed, String) The resource type.
 
   ~> **Note:** </br> Supported values are : </br>
   **&#x2022;** `cloud_init`: user_data will be interpreted according to the cloud-init standard.</br>

website/docs/d/is_images.html.markdown

@@ -31,6 +31,12 @@ data "ibm_is_images" "ds_images" {
   visibility = "public"
 }
 
+```terraform
+data "ibm_is_image" "example" {
+  remote_account_id = "provider"
+}
+```
+
 ```
 ## Argument reference
 
@@ -41,7 +47,9 @@ Review the argument references that you can specify for your data source.
 - `name` - (Optional, string) The name of the image.
 - `visibility` - (Optional, string) Visibility of the image. Accepted values : **private**, **public**
 - `status` - (Optional, string) Status of the image. Accepted value : **available**, **deleting**, **deprecated**, **failed**, **obsolete**, **pending**, **unusable**
-- `user_data_format` - (String) The user data format for this image.  
+- `user_data_format` - (String) The user data format for this image.   
+- `remote-account-id` - (Optional, String) Accepted values are `provider` or `user` or valid account_id.
+
    
     ~> **Note:** </br> Allowed values are : </br>
     **&#x2022;** `cloud_init`: user_data will be interpreted according to the cloud-init standard.</br>
@@ -103,4 +111,11 @@ You can access the following attribute references after your data source is crea
       - `more_info` - (String) Link to documentation about this status reason
   - `visibility` - (String) The visibility of the image public or private.
   - `source_volume` - The source volume id of the image.
+  - `remote` - (Optional, List) If present, this property indicates that the resource associated with this referenceis remote and therefore may not be directly retrievable.
+	            Nested schema for **remote**:
+      - `account` - (Optional, List) If present, this property indicates that the referenced resource is remote to thisaccount, and identifies the owning account.
+				Nested schema for **account**:
+           - `id` - (Computed, String) The unique identifier for this account.
+           - `resource_type` - (Computed, String) The resource type.
+