Fix streaming client for streaming_sink resource (#420)

datastax · Jan 24, 2025 · f528dc0 · f528dc0
1 parent c3bfecf
commit f528dc0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/internal/provider/resource_streaming_sink.go b/internal/provider/resource_streaming_sink.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -129,7 +130,7 @@ func resourceStreamingSinkDelete(ctx context.Context, resourceData *schema.Resou
 	}
 
 	astraClient := meta.(astraClients).astraClient.(*astra.ClientWithResponses)
-	streamingClientv3 := meta.(astraClients).astraStreamingClientv3
+	streamingClientv3 := meta.(astraClients).astraStreamingClient.(*astrastreaming.ClientWithResponses)
 
 	tenantName := resourceData.Get("tenant_name").(string)
 	sinkName := resourceData.Get("sink_name").(string)
@@ -202,7 +203,7 @@ type SinkResponse struct {
 
 func resourceStreamingSinkRead(ctx context.Context, resourceData *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	astraClient := meta.(astraClients).astraClient.(*astra.ClientWithResponses)
-	streamingClientv3 := meta.(astraClients).astraStreamingClientv3
+	streamingClientv3 := meta.(astraClients).astraStreamingClient.(*astrastreaming.ClientWithResponses)
 
 	tenantName := resourceData.Get("tenant_name").(string)
 	sinkName := resourceData.Get("sink_name").(string)
@@ -249,7 +250,7 @@ func resourceStreamingSinkRead(ctx context.Context, resourceData *schema.Resourc
 
 func resourceStreamingSinkCreate(ctx context.Context, resourceData *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	astraClient := meta.(astraClients).astraClient.(*astra.ClientWithResponses)
-	streamingClientv3 := meta.(astraClients).astraStreamingClientv3
+	streamingClientv3 := meta.(astraClients).astraStreamingClient.(*astrastreaming.ClientWithResponses)
 
 	rawRegion := resourceData.Get("region").(string)
 	region := strings.ReplaceAll(rawRegion, "-", "")
@@ -285,9 +286,8 @@ func resourceStreamingSinkCreate(ctx context.Context, resourceData *schema.Resou
 		return diag.FromErr(fmt.Errorf("failed to request pulsar clusters: %w", err))
 	}
 
-	var streamingClusters StreamingClusters
-	if err = json.Unmarshal(streamingClustersResponse.Body, &streamingClusters); err != nil {
-		return diag.FromErr(fmt.Errorf("failed to read pulsar clusters: %w", err))
+	if streamingClustersResponse.StatusCode() != http.StatusOK {
+		return diag.FromErr(fmt.Errorf("failed to read pulsar clusters. Status code: %s, msg:\n%s", streamingClustersResponse.Status(), string(streamingClustersResponse.Body)))
 	}
 
 	pulsarCluster := getPulsarCluster("", cloudProvider, region, "")

diff --git a/internal/provider/resource_streaming_tenant.go b/internal/provider/resource_streaming_tenant.go
@@ -132,6 +132,11 @@ type StreamingClusters []struct {
 	JvmVersion             string `json:"jvmVersion"`
 	PulsarVersion          string `json:"pulsarVersion"`
 	Email                  string `json:"Email"`
+	UserMetricsUrl         string `json:"userMetricsUrl"`
+	PulsarInstance         string `json:"pulsarInstance"`
+	PulsarClusterDNS       string `json:"pulsarClusterDNS"`
+	ClusterType            string `json:"clusterType"`
+	AzType                 string `json:"azType"`
 }
 
 func resourceStreamingTenantUpdate(ctx context.Context, resourceData *schema.ResourceData, meta interface{}) diag.Diagnostics {