feat: Updating GO SDK version to 0.61.0 (#968)

- Updated Stream and Stream Alert Rule Schemas based on new SDK (0.61.0)

Author: srushti-patl

docs/resources/fabric_stream.md

@@ -34,11 +34,11 @@ output "stream_state" {
 
 - `description` (String) Customer-provided description of the stream resource
 - `name` (String) Customer-provided name of the stream resource
+- `project` (Attributes) Equinix Project attribute object (see [below for nested schema](#nestedatt--project))
 - `type` (String) Equinix defined Streaming Type
 
 ### Optional
 
-- `project` (Attributes) Equinix Project attribute object (see [below for nested schema](#nestedatt--project))
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
 
 ### Read-Only

docs/resources/fabric_stream_alert_rule.md

@@ -20,11 +20,15 @@ resource "equinix_fabric_stream_alert_rule" "new_stream_alert_rule" {
   type               = "METRIC_ALERT"
   description        = "<description>"
   enabled            = true
-  operand            = "ABOVE"
-  window_size        = "<window_size>"
-  warning_threshold  = "<warning_threshold>"
-  critical_threshold = "<critical_threshold>"
-  metric_name        = "equinix.fabric.connection.bandwidth_tx.usage"
+  metric_selector = {
+    include = ["equinix.fabric.connection.bandwidth_tx.usage"]
+  }
+  detection_method = {
+    operand            = "ABOVE"
+    window_size        = "<window_size>"
+    warning_threshold  = "<warning_threshold>"
+    critical_threshold = "<critical_threshold>"
+  }
   resource_selector = {
     include = ["*/connections/<connection_id>"]
   }
@@ -53,16 +57,16 @@ output "stream_alert_rule_state" {
 ### Required
 
 - `description` (String) Customer-provided stream alert rule description
+- `detection_method` (Attributes) Detection method for stream alert rule (see [below for nested schema](#nestedatt--detection_method))
+- `metric_selector` (Attributes) Metric selector for the stream alert rule (see [below for nested schema](#nestedatt--metric_selector))
 - `name` (String) Customer-provided stream alert rule name
+- `resource_selector` (Attributes) Resource selector for the stream alert rule (see [below for nested schema](#nestedatt--resource_selector))
 - `stream_id` (String) The stream UUID that contains this alert rule
 - `type` (String) Type of the stream alert rule
 
 ### Optional
 
-- `detection_method` (Attributes) Detection method for stream alert rule (see [below for nested schema](#nestedatt--detection_method))
 - `enabled` (Boolean) Stream alert rule enabled status
-- `metric_selector` (Attributes) Metric selector for the stream alert rule (see [below for nested schema](#nestedatt--metric_selector))
-- `resource_selector` (Attributes) Resource selector for the stream alert rule (see [below for nested schema](#nestedatt--resource_selector))
 - `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
 
 ### Read-Only

examples/resources/equinix_fabric_stream_alert_rule/resource.tf

@@ -4,11 +4,15 @@ resource "equinix_fabric_stream_alert_rule" "new_stream_alert_rule" {
   type               = "METRIC_ALERT"
   description        = "<description>"
   enabled            = true
-  operand            = "ABOVE"
-  window_size        = "<window_size>"
-  warning_threshold  = "<warning_threshold>"
-  critical_threshold = "<critical_threshold>"
-  metric_name        = "equinix.fabric.connection.bandwidth_tx.usage"
+  metric_selector = {
+    include = ["equinix.fabric.connection.bandwidth_tx.usage"]
+  }
+  detection_method = {
+    operand            = "ABOVE"
+    window_size        = "<window_size>"
+    warning_threshold  = "<warning_threshold>"
+    critical_threshold = "<critical_threshold>"
+  }
   resource_selector = {
     include = ["*/connections/<connection_id>"]
   }

go.mod

@@ -3,7 +3,7 @@ module github.com/equinix/terraform-provider-equinix
 go 1.23.0
 
 require (
-	github.com/equinix/equinix-sdk-go v0.59.0
+	github.com/equinix/equinix-sdk-go v0.61.0
 	github.com/equinix/ne-go v1.21.0
 	github.com/equinix/rest-go v1.3.0
 	github.com/google/uuid v1.6.0

go.sum

@@ -38,8 +38,8 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/equinix/equinix-sdk-go v0.59.0 h1:MwRXjNzmcsbNOJz6VvjS1NLiivLnsVAr3z2H4EW2cu4=
-github.com/equinix/equinix-sdk-go v0.59.0/go.mod h1:QokAmUtlYlD4gJ1s5UL1nZ4e6XALV0ftl5ZCwdPYp5M=
+github.com/equinix/equinix-sdk-go v0.61.0 h1:7pSLMfcrpH9Gkj9qYs1Ul7Lg/EYKiC+ImbXpmKwvmCE=
+github.com/equinix/equinix-sdk-go v0.61.0/go.mod h1:QokAmUtlYlD4gJ1s5UL1nZ4e6XALV0ftl5ZCwdPYp5M=
 github.com/equinix/ne-go v1.21.0 h1:+OxxK7YcfmBTBsSPYgHnHUF9JqQ34YBFzMboXr094wI=
 github.com/equinix/ne-go v1.21.0/go.mod h1:eHkkxM4nbTB7DZ9X9zGnwfYnxIJWIsU3aHA+FAoZ1EI=
 github.com/equinix/rest-go v1.3.0 h1:m38scYTOfV6N+gcrwchgVDutDffYd+QoYCMm9Jn6jyk=

internal/resources/fabric/stream/datasource_all_streams.go

@@ -1,3 +1,4 @@
+// Package stream for Fabric Stream resource and data sources
 package stream
 
 import (
@@ -10,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 )
 
+// NewDataSourceAllStreams retrieves all streams
 func NewDataSourceAllStreams() datasource.DataSource {
 	return &DataSourceAllStreams{
 		BaseDataSource: framework.NewBaseDataSource(
@@ -20,10 +22,12 @@ func NewDataSourceAllStreams() datasource.DataSource {
 	}
 }
 
+// DataSourceAllStreams represents all streams data source
 type DataSourceAllStreams struct {
 	framework.BaseDataSource
 }
 
+// Schema returns the data source schema
 func (r *DataSourceAllStreams) Schema(
 	ctx context.Context,
 	_ datasource.SchemaRequest,
@@ -32,6 +36,7 @@ func (r *DataSourceAllStreams) Schema(
 	resp.Schema = dataSourceAllStreamsSchema(ctx)
 }
 
+// Read retrieves stream
 func (r *DataSourceAllStreams) Read(ctx context.Context, request datasource.ReadRequest, response *datasource.ReadResponse) {
 	client := r.Meta.NewFabricClientForFramework(ctx, request.ProviderMeta)
 

internal/resources/fabric/stream/datasource_by_streamid.go

@@ -1,3 +1,4 @@
+// Package stream for Fabric Stream resource and data sources
 package stream
 
 import (
@@ -9,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 )
 
+// NewDataSourceByStreamID stream by id
 func NewDataSourceByStreamID() datasource.DataSource {
 	return &DataSourceByStreamID{
 		BaseDataSource: framework.NewBaseDataSource(
@@ -19,10 +21,12 @@ func NewDataSourceByStreamID() datasource.DataSource {
 	}
 }
 
+// DataSourceByStreamID represents stream data source by id
 type DataSourceByStreamID struct {
 	framework.BaseDataSource
 }
 
+// Schema returns the data source schema
 func (r *DataSourceByStreamID) Schema(
 	ctx context.Context,
 	_ datasource.SchemaRequest,

internal/resources/fabric/stream/datasources_schema.go

@@ -1,3 +1,4 @@
+// Package stream for Fabric Stream resource and data sources
 package stream
 
 import (

internal/resources/fabric/stream/models.go

@@ -1,3 +1,4 @@
+// Package stream for Fabric Stream resource and data sources
 package stream
 
 import (
@@ -14,18 +15,21 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 )
 
+// DataSourceByIDModel stream datasource model
 type DataSourceByIDModel struct {
 	StreamID types.String `tfsdk:"stream_id"`
 	ID       types.String `tfsdk:"id"`
 	BaseStreamModel
 }
 
+// DataSourceAllStreamsModel streams datasource model
 type DataSourceAllStreamsModel struct {
 	ID         types.String                                     `tfsdk:"id"`
 	Pagination fwtypes.ObjectValueOf[PaginationModel]           `tfsdk:"pagination"`
 	Data       fwtypes.ListNestedObjectValueOf[BaseStreamModel] `tfsdk:"data"`
 }
 
+// PaginationModel stream pagination model
 type PaginationModel struct {
 	Offset   types.Int32  `tfsdk:"offset"`
 	Limit    types.Int32  `tfsdk:"limit"`
@@ -34,12 +38,14 @@ type PaginationModel struct {
 	Previous types.String `tfsdk:"previous"`
 }
 
+// ResourceModel stream resource model
 type ResourceModel struct {
 	ID       types.String   `tfsdk:"id"`
 	Timeouts timeouts.Value `tfsdk:"timeouts"`
 	BaseStreamModel
 }
 
+// BaseStreamModel stream base model
 type BaseStreamModel struct {
 	Type                     types.String                          `tfsdk:"type"`
 	Name                     types.String                          `tfsdk:"name"`
@@ -53,10 +59,12 @@ type BaseStreamModel struct {
 	ChangeLog                fwtypes.ObjectValueOf[ChangeLogModel] `tfsdk:"change_log"` // Object of ChangeLogModel
 }
 
+// ProjectModel stream project model
 type ProjectModel struct {
 	ProjectID types.String `tfsdk:"project_id"`
 }
 
+// ChangeLogModel stream changeLog model
 type ChangeLogModel struct {
 	CreatedBy         types.String `tfsdk:"created_by"`
 	CreatedByFullName types.String `tfsdk:"created_by_full_name"`
@@ -183,7 +191,7 @@ func parseStream(ctx context.Context, stream *fabricv4.Stream,
 	*description = types.StringValue(stream.GetDescription())
 	*href = types.StringValue(stream.GetHref())
 	*uuid = types.StringValue(stream.GetUuid())
-	*state = types.StringValue(stream.GetState())
+	*state = types.StringValue(string(stream.GetState()))
 	*assetsCount = types.Int32Value(stream.GetAssetsCount())
 	*streamSubscriptionCount = types.Int32Value(stream.GetStreamSubscriptionsCount())
 

internal/resources/fabric/stream/resource.go

@@ -1,3 +1,4 @@
+// Package stream for Fabric Stream resource and data sources
 package stream
 
 import (
@@ -18,6 +19,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 )
 
+// NewResource creates new stream resource
 func NewResource() resource.Resource {
 	return &Resource{
 		BaseResource: framework.NewBaseResource(
@@ -28,10 +30,12 @@ func NewResource() resource.Resource {
 	}
 }
 
+// Resource represents stream resource
 type Resource struct {
 	framework.BaseResource
 }
 
+// Schema returns the resource schema
 func (r *Resource) Schema(
 	ctx context.Context,
 	_ resource.SchemaRequest,
@@ -40,6 +44,7 @@ func (r *Resource) Schema(
 	resp.Schema = resourceSchema(ctx)
 }
 
+// Create provisions a new stream
 func (r *Resource) Create(
 	ctx context.Context,
 	req resource.CreateRequest,
@@ -130,6 +135,7 @@ func (r *Resource) Read(
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }
 
+// Update modifies an existing stream
 func (r *Resource) Update(
 	ctx context.Context,
 	req resource.UpdateRequest,
@@ -192,6 +198,7 @@ func (r *Resource) Update(
 	resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)
 }
 
+// Delete removes the stream
 func (r *Resource) Delete(
 	ctx context.Context,
 	req resource.DeleteRequest,
@@ -267,7 +274,7 @@ func getCreateUpdateWaiter(ctx context.Context, client *fabricv4.APIClient, id s
 			if err != nil {
 				return 0, "", err
 			}
-			return stream, stream.GetState(), nil
+			return stream, string(stream.GetState()), nil
 		},
 		Timeout:    timeout,
 		Delay:      10 * time.Second,
@@ -296,7 +303,7 @@ func getDeleteWaiter(ctx context.Context, client *fabricv4.APIClient, id string,
 				}
 				return 0, "", err
 			}
-			return stream, stream.GetState(), nil
+			return stream, string(stream.GetState()), nil
 		},
 		Timeout:    timeout,
 		Delay:      10 * time.Second,