finish most TODOs and clean up commented lines

Author: Mia-Cross

internal/services/instance/server_type_data_source.go

@@ -2,6 +2,7 @@ package instance
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
@@ -17,7 +18,6 @@ func DataSourceServerType() *schema.Resource {
 				Type:        schema.TypeString,
 				Required:    true,
 				Description: "The name of the server type",
-				// TODO: add alt names ??
 			},
 			"arch": {
 				Type:        schema.TypeString,
@@ -92,28 +92,10 @@ func DataSourceServerType() *schema.Resource {
 								Type: schema.TypeString,
 							},
 						},
-						// "placement_groups": {
-						//  TODO: Field not in sdk, but equals 'true' for every server type
-						// 	Type:        schema.TypeBool,
-						// 	Computed:    true,
-						// 	Description: "Whether placement groups are allowed on the server type",
-						// },
-						// "hot_snapshots_local_volume": {
-						//  TODO: Field not in sdk so how do we get this information ??
-						// 	Type:        schema.TypeBool,
-						// 	Computed:    true,
-						// 	Description: "Whether hot_snapshots_local_volume is allowed on the server type", //TODO: rewrite this
-						// },
-						// "private_networks": {
-						//  TODO: Field not in sdk, but equals '8' for every server type
-						// 	Type:        schema.TypeInt,
-						// 	Computed:    true,
-						// 	Description: "The number of private networks allowed on the server type",
-						// },
 						"max_file_systems": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "The maximum number of files systems that can be attached to the server type",
+							Description: "The maximum number of file systems that can be attached to the server type",
 						},
 					},
 				},
@@ -139,12 +121,6 @@ func DataSourceServerType() *schema.Resource {
 							Computed:    true,
 							Description: "The block bandwidth of the server type",
 						},
-						//  TODO: Equals 'true' for every server type, add it anyway ?
-						// "ipv6_support": {
-						// 	Type:        schema.TypeBool,
-						// 	Computed:    true,
-						// 	Description: "Whether IPv6 is supported on the server type",
-						// },
 					},
 				},
 			},
@@ -153,6 +129,11 @@ func DataSourceServerType() *schema.Resource {
 				Computed:    true,
 				Description: "The hourly price of the server type in euro",
 			},
+			"monthly_price": {
+				Type:        schema.TypeFloat,
+				Computed:    true,
+				Description: "The monthly price of the server type in euro",
+			},
 			"end_of_service": {
 				Type:        schema.TypeBool,
 				Computed:    true,
@@ -169,7 +150,7 @@ func DataSourceServerType() *schema.Resource {
 }
 
 func DataSourceInstanceServerTypeRead(ctx context.Context, d *schema.ResourceData, i any) diag.Diagnostics {
-	instanceAPI, zone, err := newAPIWithZone(d, i) // TODO: document zone field
+	instanceAPI, zone, err := newAPIWithZone(d, i)
 	if err != nil {
 		return diag.FromErr(err)
 	}

internal/services/instance/server_type_data_source_test.go

@@ -44,7 +44,6 @@ func TestAccDataSourceServerType_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.dev", "network.0.internal_bandwidth", "500000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.dev", "network.0.public_bandwidth", "500000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.dev", "network.0.block_bandwidth", "262144000"),
-					// resource.TestCheckResourceAttr("data.scaleway_instance_server_type.dev", "network.0.ipv6_support", "true"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.dev", "end_of_service", "false"),
 					resource.TestCheckResourceAttrSet("data.scaleway_instance_server_type.dev", "availability"),
 				),
@@ -73,7 +72,6 @@ func TestAccDataSourceServerType_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.gpu", "network.0.internal_bandwidth", "2000000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.gpu", "network.0.public_bandwidth", "2000000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.gpu", "network.0.block_bandwidth", "2147483648"),
-					// resource.TestCheckResourceAttr("data.scaleway_instance_server_type.gpu", "network.0.ipv6_support", "true"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.gpu", "end_of_service", "false"),
 					resource.TestCheckResourceAttrSet("data.scaleway_instance_server_type.gpu", "availability"),
 				),
@@ -102,7 +100,6 @@ func TestAccDataSourceServerType_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.pro", "network.0.internal_bandwidth", "350000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.pro", "network.0.public_bandwidth", "350000000"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.pro", "network.0.block_bandwidth", "131072000"),
-					// resource.TestCheckResourceAttr("data.scaleway_instance_server_type.pro", "network.0.ipv6_support", "true"),
 					resource.TestCheckResourceAttr("data.scaleway_instance_server_type.pro", "end_of_service", "false"),
 					resource.TestCheckResourceAttrSet("data.scaleway_instance_server_type.pro", "availability"),
 				),
@@ -178,8 +175,6 @@ func TestAccDataSourceServerType_CompareWithPCU(t *testing.T) {
 				product_catalog.ListPublicCatalogProductsRequestProductTypeInstance,
 			},
 			Zone: &zone,
-			// TODO: Global does not work
-			// Global: scw.BoolPtr(true),
 		}, scw.WithAllPages(), scw.WithContext(t.Context()))
 		if err != nil {
 			t.Fatal(err)