Billing and Metring for images- BM3PI (IBM-Cloud#5419)

* Update build.sh * feat(billing-metering): Billing and Metering to support plan crn in catalog offering * docs * review comments * make development as maturity for related APIs * docs corrections * add crn from api-spec * remove version for APIs * acceptance tests * sdk changes * Update resource_ibm_is_snapshot_consistency_group.go * vpn 113 changes * Update resource_ibm_is_vpn_gateway_connections.go * some changes * updated sdk * Added deprecation * made changes to sdk * Update resource_ibm_is_vpn_gateway_connections.go * Update resource_ibm_is_vpn_gateway_connections.go * Update resource_ibm_is_vpn_gateway_connections.go * Update is_vpn_gateway_connection.html.markdown * sdk update * sdk changes * set version to todays date in sdk * update maturity to beta * temporary fix for routing protocol in sdk. * error resolved * go mod changes reverted * removed sdk * Update go.sum * Update data_source_ibm_is_vpn_gateway_connection.go * fixed datasource errors * gateway fix * Update resource_ibm_is_vpn_gateway_connections.go * Update resource_ibm_is_vpn_gateway_connections.go * Update resource_ibm_is_vpn_gateway_connections.go * Update provider.go * Update resource_ibm_is_vpn_gateway_connections.go * fixed error on setting * fixed cidrs issue * Update resource_ibm_is_vpn_gateway_connections.go * Update resource_ibm_is_vpn_gateway_connection_test.go * Update resource_ibm_is_vpn_gateway_connection_test.go * update maturity to GA * added support for vpn advance config deprecation of local_cidrs, peer_cidrs, peer_address which are moved to local and peer block. * remove changes in scripts --------- Co-authored-by: Ujjwal Kumar <Ujjwal.Kumar1@ibm.com> Co-authored-by: Deepak Selvakumar <77007253+deepaksibm@users.noreply.github.com>
benbuchanan · Jun 18, 2024 · aa73217 · aa73217
1 parent 3ec2b0e
commit aa73217
Show file tree

Hide file tree

Showing 39 changed files with 1,209 additions and 321 deletions.
diff --git a/examples/ibm-is-ng/main.tf b/examples/ibm-is-ng/main.tf
@@ -767,6 +767,7 @@ resource "ibm_is_instance" "instance8" {
   }
   catalog_offering {
     version_crn = data.ibm_is_images.imageslist.images.0.catalog_offering.0.version.0.crn
+    plan_crn = "crn:v1:bluemix:public:globalcatalog-collection:global:a/123456:51c9e0db-2911-45a6-adb0-ac5332d27cf2:plan:sw.51c9e0db-2911-45a6-adb0-ac5332d27cf2.772c0dbe-aa62-482e-adbe-a3fc20101e0e"
   }
   vpc  = ibm_is_vpc.vpc2.id
   zone = "us-south-2"
@@ -777,6 +778,7 @@ resource "ibm_is_instance_template" "instancetemplate3" {
   name = "instancetemplate-3"
   catalog_offering {
     version_crn = data.ibm_is_images.imageslist.images.0.catalog_offering.0.version.0.crn
+    plan_crn = "crn:v1:bluemix:public:globalcatalog-collection:global:a/123456:51c9e0db-2911-45a6-adb0-ac5332d27cf2:plan:sw.51c9e0db-2911-45a6-adb0-ac5332d27cf2.772c0dbe-aa62-482e-adbe-a3fc20101e0e"
   }
   profile = var.profile
 

diff --git a/go.mod b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/IBM/schematics-go-sdk v0.2.3
 	github.com/IBM/secrets-manager-go-sdk/v2 v2.0.4
 	github.com/IBM/vpc-beta-go-sdk v0.6.0
-	github.com/IBM/vpc-go-sdk v0.51.0
+	github.com/IBM/vpc-go-sdk v0.52.0
 	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
 	github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
 	github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0

diff --git a/go.sum b/go.sum
diff --git a/ibm/service/vpc/data_source_ibm_is_instance.go b/ibm/service/vpc/data_source_ibm_is_instance.go
@@ -272,6 +272,25 @@ func DataSourceIBMISInstance() *schema.Resource {
 							Computed:    true,
 							Description: "Identifies a version of a catalog offering by a unique CRN property",
 						},
+						isInstanceCatalogOfferingPlanCrn: {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The CRN for this catalog offering version's billing plan",
+						},
+						"deleted": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "If present, this property indicates the referenced resource has been deleted and provides some supplementary information.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"more_info": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Link to documentation about deleted resources.",
+									},
+								},
+							},
+						},
 					},
 				},
 			},
@@ -1097,6 +1116,14 @@ func DataSourceIBMISInstance() *schema.Resource {
 	}
 }
 
+func resourceIbmIsInstanceCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.CatalogOfferingVersionPlanReferenceDeleted) map[string]interface{} {
+	catalogOfferingVersionPlanReferenceDeletedMap := map[string]interface{}{}
+
+	catalogOfferingVersionPlanReferenceDeletedMap["more_info"] = catalogOfferingVersionPlanReferenceDeleted.MoreInfo
+
+	return catalogOfferingVersionPlanReferenceDeletedMap
+}
+
 func dataSourceIBMISInstanceRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 
 	name := d.Get(isInstanceName).(string)
@@ -1136,6 +1163,15 @@ func instanceGetByName(d *schema.ResourceData, meta interface{}, name string) er
 		catalogList := make([]map[string]interface{}, 0)
 		catalogMap := map[string]interface{}{}
 		catalogMap[isInstanceCatalogOfferingVersionCrn] = versionCrn
+		if instance.CatalogOffering.Plan != nil {
+			if instance.CatalogOffering.Plan.CRN != nil && *instance.CatalogOffering.Plan.CRN != "" {
+				catalogMap[isInstanceCatalogOfferingPlanCrn] = *instance.CatalogOffering.Plan.CRN
+			}
+			if instance.CatalogOffering.Plan.Deleted != nil {
+				deletedMap := resourceIbmIsInstanceCatalogOfferingVersionPlanReferenceDeletedToMap(*instance.CatalogOffering.Plan.Deleted)
+				catalogMap["deleted"] = []map[string]interface{}{deletedMap}
+			}
+		}
 		catalogList = append(catalogList, catalogMap)
 		d.Set(isInstanceCatalogOffering, catalogList)
 	}

diff --git a/ibm/service/vpc/data_source_ibm_is_instance_template.go b/ibm/service/vpc/data_source_ibm_is_instance_template.go
@@ -222,6 +222,11 @@ func DataSourceIBMISInstanceTemplate() *schema.Resource {
 							Computed:    true,
 							Description: "Identifies a version of a catalog offering by a unique CRN property",
 						},
+						isInstanceTemplateCatalogOfferingPlanCrn: {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The CRN for this catalog offering version's billing plan",
+						},
 					},
 				},
 			},
@@ -878,6 +883,12 @@ func dataSourceIBMISInstanceTemplateRead(context context.Context, d *schema.Reso
 				version := insTempCatalogOffering.Version.(*vpcv1.CatalogOfferingVersionIdentity)
 				currentOffering[isInstanceTemplateCatalogOfferingVersionCrn] = *version.CRN
 			}
+			if insTempCatalogOffering.Plan != nil {
+				plan := insTempCatalogOffering.Plan.(*vpcv1.CatalogOfferingVersionPlanIdentity)
+				if plan.CRN != nil && *plan.CRN != "" {
+					currentOffering[isInstanceTemplateCatalogOfferingPlanCrn] = *plan.CRN
+				}
+			}
 			catOfferingList = append(catOfferingList, currentOffering)
 			d.Set(isInstanceTemplateCatalogOffering, catOfferingList)
 		}
@@ -1177,6 +1188,12 @@ func dataSourceIBMISInstanceTemplateRead(context context.Context, d *schema.Reso
 						version := insTempCatalogOffering.Version.(*vpcv1.CatalogOfferingVersionIdentity)
 						currentOffering[isInstanceTemplateCatalogOfferingVersionCrn] = *version.CRN
 					}
+					if insTempCatalogOffering.Plan != nil {
+						plan := insTempCatalogOffering.Plan.(*vpcv1.CatalogOfferingVersionPlanIdentity)
+						if plan.CRN != nil && *plan.CRN != "" {
+							currentOffering[isInstanceTemplateCatalogOfferingPlanCrn] = *plan.CRN
+						}
+					}
 					catOfferingList = append(catOfferingList, currentOffering)
 					d.Set(isInstanceTemplateCatalogOffering, catOfferingList)
 				}

diff --git a/ibm/service/vpc/data_source_ibm_is_instance_template_test.go b/ibm/service/vpc/data_source_ibm_is_instance_template_test.go
@@ -119,6 +119,8 @@ func TestAccIBMISInstanceTemplate_data_catalog(t *testing.T) {
 						"data.ibm_is_instance_template.instance_template_data", "catalog_offering.#"),
 					resource.TestCheckResourceAttrSet(
 						"data.ibm_is_instance_template.instance_template_data", "catalog_offering.0.version_crn"),
+					resource.TestCheckResourceAttrSet(
+						"data.ibm_is_instance_template.instance_template_data", "catalog_offering.0.plan_crn"),
 					resource.TestCheckNoResourceAttr(
 						"data.ibm_is_instance_template.instance_template_data", "image"),
 				),

diff --git a/ibm/service/vpc/data_source_ibm_is_instance_templates.go b/ibm/service/vpc/data_source_ibm_is_instance_templates.go
@@ -251,6 +251,11 @@ func DataSourceIBMISInstanceTemplates() *schema.Resource {
 										Computed:    true,
 										Description: "Identifies a version of a catalog offering by a unique CRN property",
 									},
+									isInstanceTemplateCatalogOfferingPlanCrn: {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The CRN for this catalog offering version's billing plan",
+									},
 								},
 							},
 						},
@@ -889,6 +894,12 @@ func dataSourceIBMISInstanceTemplatesRead(d *schema.ResourceData, meta interface
 				version := insTempCatalogOffering.Version.(*vpcv1.CatalogOfferingVersionIdentity)
 				currentOffering[isInstanceTemplateCatalogOfferingVersionCrn] = *version.CRN
 			}
+			if insTempCatalogOffering.Plan != nil {
+				plan := insTempCatalogOffering.Plan.(*vpcv1.CatalogOfferingVersionPlanIdentity)
+				if plan.CRN != nil && *plan.CRN != "" {
+					currentOffering[isInstanceTemplateCatalogOfferingPlanCrn] = *plan.CRN
+				}
+			}
 			catOfferingList = append(catOfferingList, currentOffering)
 			template[isInstanceTemplateCatalogOffering] = catOfferingList
 		}

diff --git a/ibm/service/vpc/data_source_ibm_is_instance_templates_test.go b/ibm/service/vpc/data_source_ibm_is_instance_templates_test.go
@@ -91,6 +91,8 @@ func TestAccIBMISInstanceTemplates_dataCatalog(t *testing.T) {
 						"data.ibm_is_instance_templates.instance_templates_data", "templates.0.catalog_offering.#"),
 					resource.TestCheckResourceAttrSet(
 						"data.ibm_is_instance_templates.instance_templates_data", "templates.0.catalog_offering.0.version_crn"),
+					resource.TestCheckResourceAttrSet(
+						"data.ibm_is_instance_templates.instance_templates_data", "templates.0.catalog_offering.0.plan_crn"),
 					resource.TestCheckResourceAttr(
 						"data.ibm_is_instance_templates.instance_templates_data", "templates.0.image", ""),
 				),

diff --git a/ibm/service/vpc/data_source_ibm_is_instance_test.go b/ibm/service/vpc/data_source_ibm_is_instance_test.go
@@ -50,6 +50,35 @@ func TestAccIBMISInstanceDataSource_basic(t *testing.T) {
 		},
 	})
 }
+
+func TestAccIBMISInstanceDataSourceWithCatalogOffering(t *testing.T) {
+
+	vpcname := fmt.Sprintf("tfins-vpc-%d", acctest.RandIntRange(10, 100))
+	subnetname := fmt.Sprintf("tfins-subnet-%d", acctest.RandIntRange(10, 100))
+	sshname := fmt.Sprintf("tfins-ssh-%d", acctest.RandIntRange(10, 100))
+	instanceName := fmt.Sprintf("tfins-name-%d", acctest.RandIntRange(10, 100))
+	resName := "data.ibm_is_instance.ds_instance"
+	planCrn := "crn:v1:staging:public:globalcatalog-collection:global::1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc:plan:sw.1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.279a3cee-ba7d-42d5-ae88-6a0ebc56fa4a-global"
+	versionCrn := "crn:v1:staging:public:globalcatalog-collection:global::1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc:version:4f8466eb-2218-42e3-a755-bf352b559c69-global/6a73aa69-5dd9-4243-a908-3b62f467cbf8-global"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acc.TestAccPreCheck(t) },
+		Providers: acc.TestAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMISInstanceDataSourceConfigWithCatalogOffering(vpcname, subnetname, sshname, instanceName, planCrn, versionCrn),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						resName, "catalog_offering.#"),
+					resource.TestCheckResourceAttrSet(
+						resName, "catalog_offering.0.plan_crn"),
+					resource.TestCheckResourceAttrSet(
+						resName, "catalog_offering.0.version_crn"),
+				),
+			},
+		},
+	})
+}
 func TestAccIBMISInstanceDataSource_vni(t *testing.T) {
 
 	vpcname := fmt.Sprintf("tfins-vpc-%d", acctest.RandIntRange(10, 100))
@@ -210,6 +239,46 @@ data "ibm_is_instance" "ds_instance" {
   passphrase  = ""
 }`, vpcname, subnetname, acc.ISZoneName, acc.ISCIDR, sshname, instanceName, acc.IsWinImage, acc.InstanceProfileName, acc.ISZoneName)
 }
+
+func testAccCheckIBMISInstanceDataSourceConfigWithCatalogOffering(vpcname, subnetname, sshname, instanceName, planCrn, versionCrn string) string {
+	return fmt.Sprintf(`
+	resource "ibm_is_vpc" "testacc_vpc" {
+		name = "%s"
+	  }
+	  
+	  resource "ibm_is_subnet" "testacc_subnet" {
+		name           				= "%s"
+		vpc             			= ibm_is_vpc.testacc_vpc.id
+		zone            			= "%s"
+		total_ipv4_address_count 	= 16
+	  }
+	  
+	  resource "ibm_is_ssh_key" "testacc_sshkey" {
+		name       = "%s"
+		public_key = file("./test-fixtures/.ssh/id_rsa.pub")
+	  }
+	  
+	  resource "ibm_is_instance" "testacc_instance" {
+		name    = "%s"
+		profile = "%s"
+		primary_network_interface {
+		  subnet     = ibm_is_subnet.testacc_subnet.id
+		}
+		vpc  = ibm_is_vpc.testacc_vpc.id
+		zone = "%s"
+		keys = [ibm_is_ssh_key.testacc_sshkey.id]
+		boot_volume {
+		  auto_delete_volume = false  
+		}
+		catalog_offering {
+		  version_crn = "%s"
+		  plan_crn    = "%s"
+		}
+	  }
+data "ibm_is_instance" "ds_instance" {
+  name        = ibm_is_instance.testacc_instance.name
+}`, vpcname, subnetname, acc.ISZoneName, sshname, instanceName, acc.InstanceProfileName, acc.ISZoneName, versionCrn, planCrn)
+}
 func testAccCheckIBMISInstanceVniDataSourceConfig(vpcname, subnetname, sshname, vniname, instanceName string) string {
 	return fmt.Sprintf(`
 resource "ibm_is_vpc" "testacc_vpc" {

diff --git a/ibm/service/vpc/data_source_ibm_is_instances.go b/ibm/service/vpc/data_source_ibm_is_instances.go
@@ -249,6 +249,25 @@ func DataSourceIBMISInstances() *schema.Resource {
 										Computed:    true,
 										Description: "Identifies a version of a catalog offering by a unique CRN property",
 									},
+									isInstanceCatalogOfferingPlanCrn: {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The CRN for this catalog offering version's billing plan",
+									},
+									"deleted": {
+										Type:        schema.TypeList,
+										Computed:    true,
+										Description: "If present, this property indicates the referenced resource has been deleted and provides some supplementary information.",
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"more_info": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "Link to documentation about deleted resources.",
+												},
+											},
+										},
+									},
 								},
 							},
 						},
@@ -1276,6 +1295,15 @@ func instancesList(d *schema.ResourceData, meta interface{}) error {
 			catalogList := make([]map[string]interface{}, 0)
 			catalogMap := map[string]interface{}{}
 			catalogMap[isInstanceCatalogOfferingVersionCrn] = versionCrn
+			if instance.CatalogOffering.Plan != nil {
+				if instance.CatalogOffering.Plan.CRN != nil && *instance.CatalogOffering.Plan.CRN != "" {
+					catalogMap[isInstanceCatalogOfferingPlanCrn] = *instance.CatalogOffering.Plan.CRN
+				}
+				if instance.CatalogOffering.Plan.Deleted != nil {
+					deletedMap := resourceIbmIsInstanceCatalogOfferingVersionPlanReferenceDeletedToMap(*instance.CatalogOffering.Plan.Deleted)
+					catalogMap["deleted"] = []map[string]interface{}{deletedMap}
+				}
+			}
 			catalogList = append(catalogList, catalogMap)
 			l[isInstanceCatalogOffering] = catalogList
 		}

diff --git a/ibm/service/vpc/data_source_ibm_is_instances_test.go b/ibm/service/vpc/data_source_ibm_is_instances_test.go
@@ -63,6 +63,31 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
 		},
 	})
 }
+
+func TestAccIBMISInstancesDataSourceWithCatalogOffering(t *testing.T) {
+	vpcname := fmt.Sprintf("tfins-vpc-%d", acctest.RandIntRange(10, 100))
+	subnetname := fmt.Sprintf("tfins-subnet-%d", acctest.RandIntRange(10, 100))
+
+	sshname := fmt.Sprintf("tfins-ssh-%d", acctest.RandIntRange(10, 100))
+	instanceName := fmt.Sprintf("tfins-name-%d", acctest.RandIntRange(10, 100))
+	resName := "data.ibm_is_instances.ds_instances"
+	planCrn := "crn:v1:staging:public:globalcatalog-collection:global::1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc:plan:sw.1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.279a3cee-ba7d-42d5-ae88-6a0ebc56fa4a-global"
+	versionCrn := "crn:v1:staging:public:globalcatalog-collection:global::1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc:version:4f8466eb-2218-42e3-a755-bf352b559c69-global/6a73aa69-5dd9-4243-a908-3b62f467cbf8-global"
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acc.TestAccPreCheck(t) },
+		Providers: acc.TestAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMISInstancesDataSourceConfigWithCatalogOffering(vpcname, subnetname, sshname, instanceName, planCrn, versionCrn),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resName, "instances.0.catalog_offering.#"),
+					resource.TestCheckResourceAttrSet(resName, "instances.0.catalog_offering.0.plan_crn"),
+					resource.TestCheckResourceAttrSet(resName, "instances.0.catalog_offering.0.version_crn"),
+				),
+			},
+		},
+	})
+}
 func TestAccIBMISInstancesDataSource_vni(t *testing.T) {
 	vpcname := fmt.Sprintf("tf-vpc-%d", acctest.RandIntRange(10, 100))
 	name := fmt.Sprintf("tf-instnace-%d", acctest.RandIntRange(10, 100))
@@ -257,3 +282,42 @@ func testAccCheckIBMISInstancesDataSourceConfigInstanceGroup(insGrpName string)
 		instance_group_name = "%s"
 	}`, insGrpName)
 }
+
+func testAccCheckIBMISInstancesDataSourceConfigWithCatalogOffering(vpcname, subnetname, sshname, instanceName, planCrn, versionCrn string) string {
+	return fmt.Sprintf(`
+	resource "ibm_is_vpc" "testacc_vpc" {
+		name = "%s"
+	  }
+	  
+	  resource "ibm_is_subnet" "testacc_subnet" {
+		name           				= "%s"
+		vpc             			= ibm_is_vpc.testacc_vpc.id
+		zone            			= "%s"
+		total_ipv4_address_count 	= 16
+	  }
+	  
+	  resource "ibm_is_ssh_key" "testacc_sshkey" {
+		name       = "%s"
+		public_key = file("./test-fixtures/.ssh/id_rsa.pub")
+	  }
+	  
+	  resource "ibm_is_instance" "testacc_instance" {
+		name    = "%s"
+		profile = "%s"
+		primary_network_interface {
+		  subnet     = ibm_is_subnet.testacc_subnet.id
+		}
+		vpc  = ibm_is_vpc.testacc_vpc.id
+		zone = "%s"
+		keys = [ibm_is_ssh_key.testacc_sshkey.id]
+		boot_volume {
+		  auto_delete_volume = false  
+		}
+		catalog_offering {
+		  version_crn = "%s"
+		  plan_crn    = "%s"
+		}
+	  }
+data "ibm_is_instances" "ds_instances" {
+}`, vpcname, subnetname, acc.ISZoneName, sshname, instanceName, acc.InstanceProfileName, acc.ISZoneName, versionCrn, planCrn)
+}