feat(Legacy_Vendor_Images):UI-42316:Terraform Development for Legacy Vendor Images

Author: shreyasms07

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

@@ -194,6 +194,37 @@ func DataSourceIBMISImage() *schema.Resource {
 				Computed:    true,
 				Description: "The type of encryption used on the image",
 			},
+			"remote": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Computed:    true,
+				Description: "If present, this property indicates that the resource associated with this reference is remote and therefore may not be directly retrievable.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"account": {
+							Type:        schema.TypeList,
+							Optional:    true,
+							Computed:    true,
+							Description: "If present, this property indicates that the referenced resource is remote to this account, and identifies the owning account.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"id": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										Computed:    true,
+										Description: "The unique identifier for this resource group.",
+									},
+									"resource_type": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The resource type.",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 			"source_volume": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -341,6 +372,17 @@ func imageGetByName(d *schema.ResourceData, meta interface{}, name, visibility s
 		resourceGroupList = append(resourceGroupList, resourceGroupMap)
 		d.Set("resource_group", resourceGroupList)
 	}
+
+	if image.Remote != nil {
+		imageRemoteList := []map[string]interface{}{}
+		imageRemoteMap, err := dataSourceImageRemote(image)
+		if err != nil {
+			return err
+		}
+		imageRemoteList = append(imageRemoteList, imageRemoteMap)
+		d.Set(isImageRemote, imageRemoteList)
+	}
+
 	d.Set("os", *image.OperatingSystem.Name)
 	d.Set("architecture", *image.OperatingSystem.Architecture)
 	d.Set("crn", *image.CRN)
@@ -394,6 +436,18 @@ func imageGetById(d *schema.ResourceData, meta interface{}, identifier string) e
 	if *image.Status == "deprecated" {
 		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 len(imageRemoteMap) > 0 {
+			imageRemoteList := []map[string]interface{}{imageRemoteMap}
+			d.Set(isImageRemote, imageRemoteList)
+		}
+	}
+
 	if len(image.StatusReasons) > 0 {
 		d.Set("status_reasons", dataSourceIBMIsImageFlattenStatusReasons(image.StatusReasons))
 	}
@@ -495,6 +549,27 @@ func dataSourceImageCollectionCatalogOfferingToMap(imageCatalogOfferingItem vpcv
 	return imageCatalogOfferingMap
 }
 
+func dataSourceImageRemote(imageRemote vpcv1.Image) (map[string]interface{}, error) {
+	result := map[string]interface{}{}
+
+	if imageRemote.Remote != nil && imageRemote.Remote.Account != nil {
+		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
+		}
+
+		result["remote"] = map[string]interface{}{
+			"account": accountMap,
+		}
+	}
+
+	return result, nil
+}
+
 func dataSourceIBMIsImageFlattenStatusReasons(result []vpcv1.ImageStatusReason) (statusReasons []map[string]interface{}) {
 	for _, statusReasonsItem := range result {
 		statusReasons = append(statusReasons, dataSourceIBMIsImageStatusReasonToMap(&statusReasonsItem))

ibm/service/vpc/data_source_ibm_is_image.go

@@ -174,6 +174,23 @@ func TestAccIBMISImageDataSource_With_VisibiltyPrivate(t *testing.T) {
 	})
 }
 
+func TestAccIBMISImageDataSourceRemoteAccountId(t *testing.T) {
+	resName := "data.ibm_is_image.test1"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acc.TestAccPreCheck(t) },
+		Providers: acc.TestAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMISCatalogImageDataSourceRemoteAccountId(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resName, "remote"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckIBMISImageDataSourceConfig(imageName string) string {
 	return fmt.Sprintf(`
 	resource "ibm_is_image" "isExampleImage" {
@@ -248,3 +265,10 @@ func testAccCheckIBMISImageDataSourceWithVisibilityPrivate(imageName, visibility
 		visibility = "%s"
 	}`, acc.Image_cos_url, imageName, acc.Image_operating_system, visibility)
 }
+
+func testAccCheckIBMISCatalogImageDataSourceRemoteAccountId() string {
+	return fmt.Sprintf(`
+	data "ibm_is_images" "test1" {
+		catalog_managed = true
+	}`)
+}

ibm/service/vpc/data_source_ibm_is_image_test.go

@@ -52,6 +52,10 @@ func DataSourceIBMISImages() *schema.Resource {
 				Optional:    true,
 				Description: "Whether the image is publicly visible or private to the account",
 			},
+			isImageRemoteAccountId: {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			isImageUserDataFormat: {
 				Type:        schema.TypeSet,
 				Elem:        &schema.Schema{Type: schema.TypeString},
@@ -178,6 +182,34 @@ func DataSourceIBMISImages() *schema.Resource {
 							Computed:    true,
 							Description: "The operating system architecture",
 						},
+						"remote": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "If present, this property indicates that the resource associated with this reference is remote and therefore may not be directly retrievable.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"account": {
+										Type:        schema.TypeList,
+										Computed:    true,
+										Description: "If present, this property indicates that the referenced resource is remote to this account, and identifies the owning account.",
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"id": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "The unique identifier for this resource group.",
+												},
+												"resource_type": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "The resource type.",
+												},
+											},
+										},
+									},
+								},
+							},
+						},
 						"resource_group": {
 							Type:        schema.TypeList,
 							Computed:    true,
@@ -334,6 +366,11 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 		visibility = v.(string)
 	}
 
+	var remoteAccountId string
+	if v, ok := d.GetOk(isImageRemoteAccountId); ok {
+		remoteAccountId = v.(string)
+	}
+
 	var status string
 	if v, ok := d.GetOk(isImageStatus); ok {
 		status = v.(string)
@@ -350,6 +387,15 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 	if imageName != "" {
 		listImagesOptions.SetName(imageName)
 	}
+
+	if remoteAccountId != "" {
+		if remoteAccountId == "null" || remoteAccountId == "not:null" {
+			listImagesOptions.SetRemoteAccountID(remoteAccountId)
+		} else {
+			listImagesOptions.SetRemoteAccountID(remoteAccountId)
+		}
+	}
+
 	if visibility != "" {
 		listImagesOptions.SetVisibility(visibility)
 	}
@@ -448,6 +494,18 @@ func imageList(d *schema.ResourceData, meta interface{}) error {
 			catalogOfferingList = append(catalogOfferingList, catalogOfferingMap)
 			l[isImageCatalogOffering] = catalogOfferingList
 		}
+
+		if image.Remote != nil {
+			imageRemoteMap, err := dataSourceImageRemote(image)
+			if err != nil {
+				return err
+			}
+			if len(imageRemoteMap) > 0 {
+				imageRemoteList := []map[string]interface{}{imageRemoteMap}
+				l["remote"] = imageRemoteList
+			}
+		}
+
 		accesstags, err := flex.GetGlobalTagsUsingCRN(meta, *image.CRN, "", isImageAccessTagType)
 		if err != nil {
 			log.Printf(

ibm/service/vpc/data_source_ibm_is_images.go

@@ -96,6 +96,22 @@ func TestAccIBMISImageDataSource_With_FilterVisibilty(t *testing.T) {
 	})
 }
 
+func TestAccIBMISImageDataSource_With_FilterRemoteAccountId(t *testing.T) {
+	resName := "data.ibm_is_images.test1"
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acc.TestAccPreCheck(t) },
+		Providers: acc.TestAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMISImagesDataSourceWithRemoteAccountId("user"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resName, "remote"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccIBMISImageDataSource_With_FilterStatus(t *testing.T) {
 	resName := "data.ibm_is_images.test1"
 	resource.Test(t, resource.TestCase{
@@ -149,3 +165,11 @@ func testAccCheckIBMISImagesDataSourceWithStatusPublic(status string) string {
 	}
 	`, status)
 }
+
+func testAccCheckIBMISImagesDataSourceWithRemoteAccountId(remoteAccountId string) string {
+	return fmt.Sprintf(`
+	data "ibm_is_images" "test1" {
+		remote_account_id = "%s"
+	}
+	`, remoteAccountId)
+}

ibm/service/vpc/data_source_ibm_is_images_test.go

@@ -29,6 +29,7 @@ const (
 	isImageFile                   = "file"
 	isImageVolume                 = "source_volume"
 	isImageMinimumProvisionedSize = "size"
+	isImageRemoteAccountId        = "remote_account_id"
 
 	isImageResourceGroup    = "resource_group"
 	isImageEncryptedDataKey = "encrypted_data_key"
@@ -49,6 +50,8 @@ const (
 	isImageDeprecate      = "deprecate"
 	isImageObsolete       = "obsolete"
 	isImageUserDataFormat = "user_data_format"
+
+	isImageRemote = "remote"
 )
 
 func ResourceIBMISImage() *schema.Resource {

ibm/service/vpc/resource_ibm_is_image.go

@@ -34,6 +34,16 @@ 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.
 
@@ -47,6 +57,8 @@ 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.