Fix schema elements and data models

equinix · Feb 25, 2025 · 44c4ad0 · 44c4ad0
1 parent 355ccd7
commit 44c4ad0
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 146 deletions.
diff --git a/internal/resources/fabric/stream_subscription/datasource_all.go b/internal/resources/fabric/stream_subscription/datasource_all.go
@@ -36,13 +36,13 @@ func (r *DataSourceAllStreams) Read(ctx context.Context, request datasource.Read
 	client := r.Meta.NewFabricClientForFramework(ctx, request.ProviderMeta)
 
 	// Retrieve values from plan
-	var data DataSourceAll
+	var data dataSourceAll
 	response.Diagnostics.Append(request.Config.Get(ctx, &data)...)
 	if response.Diagnostics.HasError() {
 		return
 	}
 
-	var pagination PaginationModel
+	var pagination paginationModel
 	diags := data.Pagination.As(ctx, &pagination, basetypes.ObjectAsOptions{})
 	if diags.HasError() {
 		return

diff --git a/internal/resources/fabric/stream_subscription/datasource_by_ids.go b/internal/resources/fabric/stream_subscription/datasource_by_ids.go
@@ -35,7 +35,7 @@ func (r *DataSourceByStreamID) Read(ctx context.Context, request datasource.Read
 	client := r.Meta.NewFabricClientForFramework(ctx, request.ProviderMeta)
 
 	// Retrieve values from plan
-	var data DataSourceByIDsModel
+	var data dataSourceByIDsModel
 	response.Diagnostics.Append(request.Config.Get(ctx, &data)...)
 	if response.Diagnostics.HasError() {
 		return

diff --git a/internal/resources/fabric/stream_subscription/datasources_schema.go b/internal/resources/fabric/stream_subscription/datasources_schema.go
@@ -26,7 +26,7 @@ Additional Documentation:
 			"pagination": schema.SingleNestedAttribute{
 				Description: "Pagination details for the returned streams list",
 				Required:    true,
-				CustomType:  fwtypes.NewObjectTypeOf[PaginationModel](ctx),
+				CustomType:  fwtypes.NewObjectTypeOf[paginationModel](ctx),
 				Attributes: map[string]schema.Attribute{
 					"offset": schema.Int32Attribute{
 						Description: "Index of the first item returned in the response. The default is 0",
@@ -55,7 +55,7 @@ Additional Documentation:
 			"data": schema.ListNestedAttribute{
 				Description: "Returned list of stream objects",
 				Computed:    true,
-				CustomType:  fwtypes.NewListNestedObjectTypeOf[BaseStreamSubscriptionModel](ctx),
+				CustomType:  fwtypes.NewListNestedObjectTypeOf[baseStreamSubscriptionModel](ctx),
 				NestedObject: schema.NestedAttributeObject{
 					Attributes: getStreamSubscriptionSchema(ctx),
 				},
@@ -107,7 +107,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 		"filters": schema.ListNestedAttribute{
 			Description: "List of filters to apply to the stream subscription selectors. Maximum of 8. All will be AND'd together with 1 of the 8 being a possible OR group of 3",
 			Computed:    true,
-			CustomType:  fwtypes.NewListNestedObjectTypeOf[FilterModel](ctx),
+			CustomType:  fwtypes.NewListNestedObjectTypeOf[filterModel](ctx),
 			NestedObject: schema.NestedAttributeObject{
 				Attributes: map[string]schema.Attribute{
 					"property": schema.StringAttribute{
@@ -133,7 +133,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 		"metric_selector": schema.SingleNestedAttribute{
 			Description: "Lists of metrics to be included/excluded on the stream subscription",
 			Computed:    true,
-			CustomType:  fwtypes.NewObjectTypeOf[SelectorModel](ctx),
+			CustomType:  fwtypes.NewObjectTypeOf[selectorModel](ctx),
 			Attributes: map[string]schema.Attribute{
 				"include": schema.ListAttribute{
 					Description: "List of metrics to include",
@@ -150,7 +150,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 		"event_selector": schema.SingleNestedAttribute{
 			Description: "Lists of events to be included/excluded on the stream subscription",
 			Computed:    true,
-			CustomType:  fwtypes.NewObjectTypeOf[SelectorModel](ctx),
+			CustomType:  fwtypes.NewObjectTypeOf[selectorModel](ctx),
 			Attributes: map[string]schema.Attribute{
 				"include": schema.ListAttribute{
 					Description: "List of events to include",
@@ -167,7 +167,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 		"sink": schema.SingleNestedAttribute{
 			Description: "The details of the subscriber to the Equinix Stream",
 			Computed:    true,
-			CustomType:  fwtypes.NewObjectTypeOf[SinkModel](ctx),
+			CustomType:  fwtypes.NewObjectTypeOf[sinkModel](ctx),
 			Attributes: map[string]schema.Attribute{
 				"uri": schema.StringAttribute{
 					Description: "Publicly reachable http endpoint destination for data stream",
@@ -196,7 +196,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 				"credential": schema.SingleNestedAttribute{
 					Description: "Access details for the specified sink type",
 					Computed:    true,
-					CustomType:  fwtypes.NewObjectTypeOf[SinkCredentialModel](ctx),
+					CustomType:  fwtypes.NewObjectTypeOf[sinkCredentialModel](ctx),
 					Attributes: map[string]schema.Attribute{
 						"type": schema.StringAttribute{
 							Description: "Type of the credential being passed",
@@ -227,7 +227,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 				"settings": schema.SingleNestedAttribute{
 					Description: "Stream subscription sink settings",
 					Computed:    true,
-					CustomType:  fwtypes.NewObjectTypeOf[SinkCredentialModel](ctx),
+					CustomType:  fwtypes.NewObjectTypeOf[sinkCredentialModel](ctx),
 					Attributes: map[string]schema.Attribute{
 						"event_index": schema.StringAttribute{
 							Computed: true,
@@ -247,9 +247,6 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 						"metric_uri": schema.StringAttribute{
 							Computed: true,
 						},
-						"transform_alerts": schema.BoolAttribute{
-							Computed: true,
-						},
 					},
 				},
 			},
@@ -269,7 +266,7 @@ func getStreamSubscriptionSchema(ctx context.Context) map[string]schema.Attribut
 		"change_log": schema.SingleNestedAttribute{
 			Description: "Details of the last change on the stream resource",
 			Computed:    true,
-			CustomType:  fwtypes.NewObjectTypeOf[ChangeLogModel](ctx),
+			CustomType:  fwtypes.NewObjectTypeOf[changeLogModel](ctx),
 			Attributes: map[string]schema.Attribute{
 				"created_by": schema.StringAttribute{
 					Description: "User name of creator of the stream resource",