fix(template): correctly unmarshal InstanceTemplate response by type (#132)

Signed-off-by: Ujjwal Kumar <[email protected]>

Author: uibm

README.md

@@ -3,11 +3,11 @@
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/IBM/vpc-go-sdk)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Cloud VPC Go SDK Version 0.74.0
+# IBM Cloud VPC Go SDK Version 0.74.1
 Go client library to interact with the various [IBM Cloud VPC Services APIs](https://cloud.ibm.com/apidocs?category=vpc).
 
 **Note:** Given the current version of all VPC SDKs across supported languages and the current VPC API specification, we retracted the vpc-go-sdk version 1.x to version v0.6.0, which had the same features as v1.0.1.
-Consider using v0.74.0 from now on. Refrain from using commands like `go get -u ..` and `go get ..@latest` on go 1.14 and lower as you will not get the latest release.
+Consider using v0.74.1 from now on. Refrain from using commands like `go get -u ..` and `go get ..@latest` on go 1.14 and lower as you will not get the latest release.
 
 This SDK uses [Semantic Versioning](https://semver.org), and as such there may be backward-incompatible changes for any new `0.y.z` version.
 ## Table of Contents
@@ -64,7 +64,7 @@ Use this command to download and install the VPC Go SDK service to allow your Go
 use it:
 
 ```
-go get github.com/IBM/[email protected].0
+go get github.com/IBM/[email protected].1
 ```
 
 
@@ -90,7 +90,7 @@ to your `Gopkg.toml` file.  Here is an example:
 ```
 [[constraint]]
   name = "github.com/IBM/vpc-go-sdk/"
-  version = "0.74.0"
+  version = "0.74.1"
 ```
 
 Then run `dep ensure`.

common/version.go

@@ -1,4 +1,4 @@
 package common
 
 // Version of the SDK
-const Version = "0.74.0"
+const Version = "0.74.1"

vpcv1/vpc_v1.go

@@ -70003,154 +70003,178 @@ type InstanceTemplateIntf interface {
 
 // UnmarshalInstanceTemplate unmarshals an instance of InstanceTemplate from the specified map of raw messages.
 func UnmarshalInstanceTemplate(m map[string]json.RawMessage, result interface{}) (err error) {
-	obj := new(InstanceTemplate)
-	err = core.UnmarshalModel(m, "availability_policy", &obj.AvailabilityPolicy, UnmarshalInstanceAvailabilityPolicyPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "availability_policy-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "cluster_network_attachments", &obj.ClusterNetworkAttachments, UnmarshalInstanceClusterNetworkAttachmentPrototypeInstanceContext)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "cluster_network_attachments-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "confidential_compute_mode", &obj.ConfidentialComputeMode)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "confidential_compute_mode-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "created_at", &obj.CreatedAt)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "created_at-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "crn", &obj.CRN)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "crn-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "default_trusted_profile", &obj.DefaultTrustedProfile, UnmarshalInstanceDefaultTrustedProfilePrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "default_trusted_profile-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "enable_secure_boot", &obj.EnableSecureBoot)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "enable_secure_boot-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "href", &obj.Href)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "href-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "id", &obj.ID)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "id-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "keys", &obj.Keys, UnmarshalKeyIdentity)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "keys-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "metadata_service", &obj.MetadataService, UnmarshalInstanceMetadataServicePrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "metadata_service-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "name", &obj.Name)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "name-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "placement_target", &obj.PlacementTarget, UnmarshalInstancePlacementTargetPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "placement_target-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "profile", &obj.Profile, UnmarshalInstanceProfileIdentity)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "profile-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "reservation_affinity", &obj.ReservationAffinity, UnmarshalInstanceReservationAffinityPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "reservation_affinity-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "resource_group", &obj.ResourceGroup, UnmarshalResourceGroupReference)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "resource_group-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "total_volume_bandwidth", &obj.TotalVolumeBandwidth)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "total_volume_bandwidth-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "user_data", &obj.UserData)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "user_data-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "volume_attachments", &obj.VolumeAttachments, UnmarshalVolumeAttachmentPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "volume_attachments-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalPrimitive(m, "volume_bandwidth_qos_mode", &obj.VolumeBandwidthQosMode)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "volume_bandwidth_qos_mode-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "vpc", &obj.VPC, UnmarshalVPCIdentity)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "vpc-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "boot_volume_attachment", &obj.BootVolumeAttachment, UnmarshalVolumeAttachmentPrototypeInstanceByImageContext)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "boot_volume_attachment-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "image", &obj.Image, UnmarshalImageIdentity)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "image-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "zone", &obj.Zone, UnmarshalZoneIdentity)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "zone-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "network_attachments", &obj.NetworkAttachments, UnmarshalInstanceNetworkAttachmentPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "network_attachments-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "primary_network_attachment", &obj.PrimaryNetworkAttachment, UnmarshalInstanceNetworkAttachmentPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "primary_network_attachment-error", common.GetComponentInfo())
-		return
-	}
-	err = core.UnmarshalModel(m, "network_interfaces", &obj.NetworkInterfaces, UnmarshalNetworkInterfacePrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "network_interfaces-error", common.GetComponentInfo())
-		return
+
+	// Check for source_snapshot presence to determine object type
+	var isSourceSnapshot bool
+	if bootVolumeRaw, exists := m["boot_volume_attachment"]; exists && len(bootVolumeRaw) > 0 && string(bootVolumeRaw) != "null" {
+		var bootVolumeMap map[string]json.RawMessage
+		if err = json.Unmarshal(bootVolumeRaw, &bootVolumeMap); err == nil {
+			if volumeRaw, volumeExists := bootVolumeMap["volume"]; volumeExists && len(volumeRaw) > 0 && string(volumeRaw) != "null" {
+				var volumeMap map[string]json.RawMessage
+				if err = json.Unmarshal(volumeRaw, &volumeMap); err == nil {
+					if _, snapshotExists := volumeMap["source_snapshot"]; snapshotExists {
+						isSourceSnapshot = true
+					}
+				}
+			}
+		}
 	}
-	err = core.UnmarshalModel(m, "primary_network_interface", &obj.PrimaryNetworkInterface, UnmarshalNetworkInterfacePrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "primary_network_interface-error", common.GetComponentInfo())
+	if isSourceSnapshot {
+		err = core.UnmarshalModel(m, "", result, UnmarshalInstanceTemplateInstanceBySourceSnapshotInstanceTemplateContext)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "unmarshal-InstanceTemplateInstanceBySourceSnapshotInstanceTemplateContext-error", common.GetComponentInfo())
+		}
 		return
-	}
-	err = core.UnmarshalModel(m, "catalog_offering", &obj.CatalogOffering, UnmarshalInstanceCatalogOfferingPrototype)
-	if err != nil {
-		err = core.SDKErrorf(err, "", "catalog_offering-error", common.GetComponentInfo())
+	} else {
+		obj := new(InstanceTemplate)
+		err = core.UnmarshalModel(m, "availability_policy", &obj.AvailabilityPolicy, UnmarshalInstanceAvailabilityPolicyPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "availability_policy-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "cluster_network_attachments", &obj.ClusterNetworkAttachments, UnmarshalInstanceClusterNetworkAttachmentPrototypeInstanceContext)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "cluster_network_attachments-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "confidential_compute_mode", &obj.ConfidentialComputeMode)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "confidential_compute_mode-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "created_at", &obj.CreatedAt)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "created_at-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "crn", &obj.CRN)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "crn-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "default_trusted_profile", &obj.DefaultTrustedProfile, UnmarshalInstanceDefaultTrustedProfilePrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "default_trusted_profile-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "enable_secure_boot", &obj.EnableSecureBoot)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "enable_secure_boot-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "href", &obj.Href)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "href-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "id", &obj.ID)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "id-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "keys", &obj.Keys, UnmarshalKeyIdentity)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "keys-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "metadata_service", &obj.MetadataService, UnmarshalInstanceMetadataServicePrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "metadata_service-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "name", &obj.Name)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "name-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "placement_target", &obj.PlacementTarget, UnmarshalInstancePlacementTargetPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "placement_target-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "profile", &obj.Profile, UnmarshalInstanceProfileIdentity)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "profile-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "reservation_affinity", &obj.ReservationAffinity, UnmarshalInstanceReservationAffinityPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "reservation_affinity-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "resource_group", &obj.ResourceGroup, UnmarshalResourceGroupReference)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "resource_group-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "total_volume_bandwidth", &obj.TotalVolumeBandwidth)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "total_volume_bandwidth-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "user_data", &obj.UserData)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "user_data-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "volume_attachments", &obj.VolumeAttachments, UnmarshalVolumeAttachmentPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "volume_attachments-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalPrimitive(m, "volume_bandwidth_qos_mode", &obj.VolumeBandwidthQosMode)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "volume_bandwidth_qos_mode-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "vpc", &obj.VPC, UnmarshalVPCIdentity)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "vpc-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "boot_volume_attachment", &obj.BootVolumeAttachment, UnmarshalVolumeAttachmentPrototypeInstanceByImageContext)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "boot_volume_attachment-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "image", &obj.Image, UnmarshalImageIdentity)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "image-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "zone", &obj.Zone, UnmarshalZoneIdentity)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "zone-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "network_attachments", &obj.NetworkAttachments, UnmarshalInstanceNetworkAttachmentPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "network_attachments-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "primary_network_attachment", &obj.PrimaryNetworkAttachment, UnmarshalInstanceNetworkAttachmentPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "primary_network_attachment-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "network_interfaces", &obj.NetworkInterfaces, UnmarshalNetworkInterfacePrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "network_interfaces-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "primary_network_interface", &obj.PrimaryNetworkInterface, UnmarshalNetworkInterfacePrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "primary_network_interface-error", common.GetComponentInfo())
+			return
+		}
+		err = core.UnmarshalModel(m, "catalog_offering", &obj.CatalogOffering, UnmarshalInstanceCatalogOfferingPrototype)
+		if err != nil {
+			err = core.SDKErrorf(err, "", "catalog_offering-error", common.GetComponentInfo())
+			return
+		}
+		reflect.ValueOf(result).Elem().Set(reflect.ValueOf(obj))
 		return
 	}
-	reflect.ValueOf(result).Elem().Set(reflect.ValueOf(obj))
-	return
 }
 
 // InstanceTemplateCollection : InstanceTemplateCollection struct