Ins 12957 update api structure (#75)

* Made changes to struct and imports to support new API

Makefile

@@ -1,8 +1,11 @@
 
 BIN_NAME="terraform-provider-instaclustr"
-VERSION=v1.9.1
 
-.PHONY: install clean all build test testacc testtarget
+VERSION=v1.9.2
+
+.PHONY: install clean all build test testacc testtarget release_version
+release_version:
+	@echo $(VERSION)
 
 all: build
 

README.md

@@ -171,3 +171,5 @@ Please see https://www.instaclustr.com/support/documentation/announcements/insta
 # License
 
 Apache2 - See the included LICENSE file for more details.
+
+Test

instaclustr/resource_cluster.go

@@ -630,7 +630,7 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error{
 	d.Set("cluster_name", cluster.ClusterName)
 
 	clusterProvider := make(map[string]interface{}, 0)
-	mapstructure.Decode(cluster.Provider, &clusterProvider)
+	mapstructure.Decode(cluster.Provider[0], &clusterProvider)
 	processedClusterProvider := processProvider(d, clusterProvider)
 	d.Set("cluster_provider", processedClusterProvider)
 
@@ -727,7 +727,9 @@ func getBundlesFromCluster(cluster *Cluster) ([]map[string]interface{}, error) {
 	bundles := make([]map[string]interface{}, 0)
 	bundles = append(bundles, baseBundle)
 	if cluster.AddonBundles != nil {
-		bundles = append(bundles, cluster.AddonBundles)
+		for _, addonBundle := range cluster.AddonBundles{
+			bundles = append(bundles, addonBundle)	
+		}
 	}
 
 	return bundles, nil

instaclustr/structs.go

@@ -95,15 +95,15 @@ type Cluster struct {
 	ClusterStatus              string        	`json:"clusterStatus"`
 	BundleType                 string        	`json:"bundleType"`
 	BundleVersion              string        	`json:"bundleVersion"`
-	AddonBundles			   map[string]interface{}	 `json:"addonBundles"`
+	AddonBundles			   []map[string]interface{}	 `json:"addonBundles"`
 	Username                   string        	`json:"username"`
 	InstaclustrUserPassword    string        	`json:"instaclustrUserPassword"`
 	SlaTier                    string        	`json:"slaTier"`
 	ClusterCertificateDownload string        	`json:"clusterCertificateDownload"`
 	PciCompliance              string        	`json:"pciCompliance"`
 	BundleOption               *BundleOptions 	`json:"bundleOptions"`
 	DataCentres                []DataCentre  	`json:"dataCentres"`
-	Provider				   ClusterProvider	`json:"clusterProvider"`
+	Provider				   []ClusterProvider	`json:"clusterProvider"`
 }
 
 type DataCentre struct {

test/data/valid_kafka.tf

@@ -36,5 +36,9 @@ resource "instaclustr_cluster" "valid" {
         bundle = "KAFKA_SCHEMA_REGISTRY"
         version = "kafka-schema-registry:5.0.0"
     }
+    bundle {
+        bundle = "KAFKA_REST_PROXY"
+        version = "kafka-rest-proxy:5.0.0"
+    }
 
 }