chore: update API client generator and API client

Author: laimonasr

.github/workflows/build.yml

@@ -59,5 +59,6 @@ jobs:
           SSO_CLIENT_ID: ${{ secrets.SSO_CLIENT_ID }}
           SSO_CLIENT_SECRET: ${{ secrets.SSO_CLIENT_SECRET }}
           SSO_DOMAIN: ${{ secrets.SSO_DOMAIN }}
+          ACCEPTANCE_TEST_ORGANIZATION_ID: ${{ vars.TF_ACCEPTANCE_TEST_ORGANIZATION_ID }}
         run: make testacc
 

castai/provider_test.go

@@ -50,6 +50,10 @@ func testAccPreCheck(t *testing.T) {
 			t.Fatal("CASTAI_API_TOKEN must be set for acceptance tests")
 		}
 
+		if v := os.Getenv("ACCEPTANCE_TEST_ORGANIZATION_ID"); v == "" {
+			t.Fatal("ACCEPTANCE_TEST_ORGANIZATION_ID must be set for acceptance tests")
+		}
+
 		if err := testAccProvider.Configure(context.Background(), terraform.NewResourceConfigRaw(nil)); err != nil {
 			t.Fatal(err)
 		}

castai/resource_eviction_config.go

@@ -5,13 +5,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/castai/terraform-provider-castai/castai/sdk"
+	"log"
+	"time"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/samber/lo"
-	"log"
-	"time"
+
+	"github.com/castai/terraform-provider-castai/castai/sdk"
 )
 
 const (
@@ -124,18 +126,18 @@ func resourceEvictionConfig() *schema.Resource {
 							},
 						},
 						FieldEvictionOptionDisabled: {
-							Type:     schema.TypeBool,
-							Optional: true,
+							Type:        schema.TypeBool,
+							Optional:    true,
 							Description: "Mark pods as removal disabled",
 						},
 						FieldEvictionOptionAggressive: {
-							Type:     schema.TypeBool,
-							Optional: true,
+							Type:        schema.TypeBool,
+							Optional:    true,
 							Description: "Apply Aggressive mode to Evictor",
 						},
 						FieldEvictionOptionDisposable: {
-							Type:     schema.TypeBool,
-							Optional: true,
+							Type:        schema.TypeBool,
+							Optional:    true,
 							Description: "Mark node as disposable",
 						},
 					},
@@ -424,7 +426,7 @@ func toPodSelector(in interface{}) (*sdk.CastaiEvictorV1PodSelector, error) {
 				return nil, err
 			}
 
-			if mls == nil || len(mls.AdditionalProperties) == 0 {
+			if mls == nil || len(*mls) == 0 {
 				continue
 			}
 
@@ -474,21 +476,21 @@ func toNodeSelector(in interface{}) (*sdk.CastaiEvictorV1NodeSelector, error) {
 	return &out, nil
 }
 
-func toMatchLabels(in interface{}) (*sdk.CastaiEvictorV1LabelSelector_MatchLabels, error) {
+func toMatchLabels(in interface{}) (*map[string]string, error) {
 	mls, ok := in.(map[string]interface{})
 	if !ok {
 		return nil, fmt.Errorf("mapping match_labels expecting map[string]interface, got %T %+v", in, in)
 	}
 	if len(mls) == 0 {
 		return nil, nil
 	}
-	out := sdk.CastaiEvictorV1LabelSelector_MatchLabels{AdditionalProperties: map[string]string{}}
+	out := map[string]string{}
 	for k, v := range mls {
 		value, ok := v.(string)
 		if !ok {
 			return nil, fmt.Errorf("mapping match_labels expecting string, got %T %+v", v, v)
 		}
-		out.AdditionalProperties[k] = value
+		out[k] = value
 	}
 
 	return &out, nil
@@ -507,7 +509,7 @@ func flattenPodSelector(ps *sdk.CastaiEvictorV1PodSelector) []map[string]any {
 	}
 	if ps.LabelSelector != nil {
 		if ps.LabelSelector.MatchLabels != nil {
-			out[FieldMatchLabels] = ps.LabelSelector.MatchLabels.AdditionalProperties
+			out[FieldMatchLabels] = *ps.LabelSelector.MatchLabels
 		}
 		if ps.LabelSelector.MatchExpressions != nil {
 			out[FieldMatchExpressions] = flattenMatchExpressions(*ps.LabelSelector.MatchExpressions)
@@ -522,7 +524,7 @@ func flattenNodeSelector(ns *sdk.CastaiEvictorV1NodeSelector) []map[string]any {
 	}
 	out := map[string]any{}
 	if ns.LabelSelector.MatchLabels != nil {
-		out[FieldMatchLabels] = ns.LabelSelector.MatchLabels.AdditionalProperties
+		out[FieldMatchLabels] = *ns.LabelSelector.MatchLabels
 	}
 	if ns.LabelSelector.MatchExpressions != nil {
 		out[FieldMatchExpressions] = flattenMatchExpressions(*ns.LabelSelector.MatchExpressions)

castai/resource_eviction_config_test.go

@@ -4,18 +4,20 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/castai/terraform-provider-castai/castai/sdk"
-	mock_sdk "github.com/castai/terraform-provider-castai/castai/sdk/mock"
+	"io"
+	"net/http"
+	"testing"
+
 	"github.com/golang/mock/gomock"
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/require"
-	"io"
-	"net/http"
-	"testing"
+
+	"github.com/castai/terraform-provider-castai/castai/sdk"
+	mock_sdk "github.com/castai/terraform-provider-castai/castai/sdk/mock"
 )
 
 func TestEvictionConfig_ReadContext(t *testing.T) {
@@ -299,9 +301,9 @@ func TestEvictionConfig_UpdateContext(t *testing.T) {
 		PodSelector: &sdk.CastaiEvictorV1PodSelector{
 			Kind: lo.ToPtr("Job"),
 			LabelSelector: &sdk.CastaiEvictorV1LabelSelector{
-				MatchLabels: &sdk.CastaiEvictorV1LabelSelector_MatchLabels{AdditionalProperties: map[string]string{
+				MatchLabels: &map[string]string{
 					"key1": "value1",
-				}}}}}
+				}}}}
 
 	newConfig := sdk.CastaiEvictorV1EvictionConfig{
 		Settings: sdk.CastaiEvictorV1EvictionSettings{Disposable: &sdk.CastaiEvictorV1EvictionSettingsSettingEnabled{Enabled: true}},

castai/resource_hibernation_schedule.go

@@ -110,7 +110,7 @@ func resourceHibernationSchedule() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			FieldServiceAccountOrganizationID: {
+			FieldHibernationScheduleOrganizationID: {
 				Type:             schema.TypeString,
 				Optional:         true,
 				Description:      "ID of the organization. If not provided, then will attempt to infer it using CAST AI API client.",
@@ -378,19 +378,24 @@ func resourceHibernationSchedule() *schema.Resource {
 }
 
 func hibernationScheduleStateImporter(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
-	organizationID, err := getHibernationScheduleOrganizationID(ctx, d, meta)
-	if err != nil {
-		return nil, err
+	organizationID, id := parseImportID(d)
+	if organizationID == "" {
+		stateOrganizationID, err := getHibernationScheduleOrganizationID(ctx, d, meta)
+		if err != nil {
+			return nil, err
+		}
+
+		organizationID = stateOrganizationID
 	}
 
 	// if importing by UUID, nothing to do; if importing by name, fetch schedule ID and set that as resource ID
-	if _, err := uuid.Parse(d.Id()); err != nil {
+	if _, err := uuid.Parse(id); err != nil {
 		tflog.Info(ctx, "provided schedule ID is not a UUID, will import by name")
-		schedule, err := getHibernationScheduleByName(ctx, meta, organizationID, d.Id())
+		schedule, err := getHibernationScheduleByName(ctx, meta, organizationID, id)
 		if err != nil {
 			return nil, err
 		} else if schedule == nil {
-			return nil, fmt.Errorf("could not find schedule by name: %s", d.Id())
+			return nil, fmt.Errorf("could not find schedule by name: %s", id)
 		}
 
 		d.SetId(lo.FromPtr(schedule.Id))
@@ -422,7 +427,7 @@ func resourceHibernationScheduleUpdate(ctx context.Context, d *schema.ResourceDa
 
 	resp, err := client.HibernationSchedulesAPIUpdateHibernationScheduleWithResponse(ctx, organizationID, d.Id(), req)
 	if checkErr := sdk.CheckOKResponse(resp, err); checkErr != nil {
-		return diag.FromErr(checkErr)
+		return diag.FromErr(fmt.Errorf("could not update hibernation schedule in organization %s: %v", organizationID, checkErr))
 	}
 
 	return readHibernationScheduleIntoState(ctx, d, meta, organizationID, d.Id())
@@ -448,17 +453,17 @@ func resourceHibernationScheduleCreate(ctx context.Context, d *schema.ResourceDa
 
 	organizationID, err := getHibernationScheduleOrganizationID(ctx, d, meta)
 	if err != nil {
-		return diag.FromErr(err)
+		return diag.FromErr(fmt.Errorf("could not determine organization id: %v", err))
 	}
 
 	schedule, err := stateToHibernationSchedule(d)
 	if err != nil {
-		return diag.FromErr(err)
+		return diag.FromErr(fmt.Errorf("could not map state to hibernation schedule: %v", err))
 	}
 
 	resp, err := client.HibernationSchedulesAPICreateHibernationScheduleWithResponse(ctx, organizationID, *schedule)
 	if checkErr := sdk.CheckOKResponse(resp, err); checkErr != nil {
-		return diag.FromErr(checkErr)
+		return diag.FromErr(fmt.Errorf("could not create hibernation schedule in organization %s: %v", organizationID, checkErr))
 	}
 
 	d.SetId(*resp.JSON200.Id)
@@ -478,7 +483,7 @@ func resourceHibernationScheduleRead(ctx context.Context, d *schema.ResourceData
 func readHibernationScheduleIntoState(ctx context.Context, d *schema.ResourceData, meta any, organizationID, id string) diag.Diagnostics {
 	schedule, err := getHibernationScheduleById(ctx, meta, organizationID, id)
 	if err != nil {
-		return diag.FromErr(err)
+		return diag.FromErr(fmt.Errorf("could not retrieve hibernation schedule by id in organization %s: %v", organizationID, err))
 	}
 	if !d.IsNewResource() && schedule == nil {
 		tflog.Warn(ctx, "Hibernation schedule not found, removing from state", map[string]any{"id": d.Id()})
@@ -840,7 +845,7 @@ func sectionToNodeConfig(section map[string]interface{}) cluster_autoscaler.Node
 		ConfigName:       lo.Ternary(configName != "", &configName, nil),
 		SubnetId:         lo.Ternary(subnetId != "", &subnetId, nil),
 		Zone:             lo.Ternary(zone != "", &zone, nil),
-		KubernetesLabels: lo.Ternary(kubernetesLabels != nil && len(kubernetesLabels) != 0, &kubernetesLabels, nil),
+		KubernetesLabels: lo.Ternary(len(kubernetesLabels) != 0, &kubernetesLabels, nil),
 		GpuConfig:        nodeConfigSectionToGPUConfig(section),
 		NodeAffinity:     nodeConfigSectionToNodeAffinity(section),
 		KubernetesTaints: nodeConfigSectionToKubernetesTaints(section),
@@ -951,3 +956,15 @@ func getHibernationScheduleByName(ctx context.Context, meta interface{}, organiz
 
 	return nil, nil
 }
+
+func parseImportID(d *schema.ResourceData) (string, string) {
+	id := d.Id()
+
+	if strings.Contains(id, "/") {
+		if parts := strings.Split(id, "/"); len(parts) > 1 {
+			return parts[0], parts[1]
+		}
+	}
+
+	return "", id
+}

castai/resource_hibernation_schedule_test.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -227,14 +228,16 @@ func TestHibernationSchedule_CreateContext(t *testing.T) {
 func TestAccResourceHibernationSchedule_basic(t *testing.T) {
 	resourceName := fmt.Sprintf("%v-hibernation-schedule-%v", ResourcePrefix, acctest.RandString(8))
 	renamedResourceName := fmt.Sprintf("%s %s", resourceName, "renamed")
+	organizationID := os.Getenv("ACCEPTANCE_TEST_ORGANIZATION_ID")
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
 
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: makeInitialHibernationScheduleConfig(resourceName),
+				// Test creation
+				Config: makeInitialHibernationScheduleConfig(resourceName, organizationID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "name", resourceName),
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "enabled", "false"),
@@ -246,10 +249,10 @@ func TestAccResourceHibernationSchedule_basic(t *testing.T) {
 				),
 			},
 			{
-				// test edits
-				Config: makeUpdateHibernationScheduleConfig(renamedResourceName),
+				// Test update
+				Config: makeUpdateHibernationScheduleConfig(renamedResourceName, organizationID),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("castai_rebalancing_schedule.test", "name", renamedResourceName),
+					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "name", renamedResourceName),
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "enabled", "true"),
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "pause_config.0.enabled", "false"),
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "pause_config.0.schedule.0.cron_expression", "1 0 * * *"),
@@ -258,30 +261,23 @@ func TestAccResourceHibernationSchedule_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("castai_hibernation_schedule.test_hibernation_schedule", "resume_config.0.job_config.0.node_config.0.instance_type", "e2-standard-8"),
 				),
 			},
-			// We keep the ImportState test cases at the end so they will test any newly added fields.
-			// This way it will also verify that after importing the state the output of `tf plan` is empty.
 			{
-				// Import state by ID
+				// Test import
 				ImportState:       true,
 				ResourceName:      "castai_hibernation_schedule.test_hibernation_schedule",
-				ImportStateVerify: true,
-			},
-			{
-				// Import state by name
-				ImportState:       true,
-				ResourceName:      "castai_hibernation_schedule.test_hibernation_schedule",
-				ImportStateId:     renamedResourceName,
+				ImportStateId:     fmt.Sprintf("%s/%s", organizationID, renamedResourceName),
 				ImportStateVerify: true,
 			},
 		},
 	})
 }
 
-func makeInitialHibernationScheduleConfig(rName string) string {
+func makeInitialHibernationScheduleConfig(rName string, organizationID string) string {
 	template := `
 resource "castai_hibernation_schedule" "test_hibernation_schedule" {
   name    = %q
   enabled = false
+  organization_id = %q
 
   pause_config {
     enabled = true
@@ -308,14 +304,15 @@ resource "castai_hibernation_schedule" "test_hibernation_schedule" {
   cluster_assignments {}
 }
 `
-	return fmt.Sprintf(template, rName)
+	return fmt.Sprintf(template, rName, organizationID)
 }
 
-func makeUpdateHibernationScheduleConfig(rName string) string {
+func makeUpdateHibernationScheduleConfig(rName string, organizationID string) string {
 	template := `
 resource "castai_hibernation_schedule" "test_hibernation_schedule" {
   name    = %q
   enabled = true
+  organization_id = %q
 
   pause_config {
     enabled = false
@@ -342,5 +339,5 @@ resource "castai_hibernation_schedule" "test_hibernation_schedule" {
   cluster_assignments {}
 }
 `
-	return fmt.Sprintf(template, rName)
+	return fmt.Sprintf(template, rName, organizationID)
 }

castai/resource_node_configuration.go

@@ -645,9 +645,7 @@ func resourceNodeConfigurationCreate(ctx context.Context, d *schema.ResourceData
 		req.KubeletConfig = toPtr(m)
 	}
 	if v := d.Get(FieldNodeConfigurationTags).(map[string]interface{}); len(v) > 0 {
-		req.Tags = &sdk.NodeconfigV1NewNodeConfiguration_Tags{
-			AdditionalProperties: toStringMap(v),
-		}
+		req.Tags = lo.ToPtr(toStringMap(v))
 	}
 
 	// Map provider specific configurations.
@@ -720,7 +718,7 @@ func resourceNodeConfigurationRead(ctx context.Context, d *schema.ResourceData,
 	if err := d.Set(FieldNodeConfigurationContainerRuntime, nodeConfig.ContainerRuntime); err != nil {
 		return diag.FromErr(fmt.Errorf("setting container runtime: %w", err))
 	}
-	if err := d.Set(FieldNodeConfigurationTags, nodeConfig.Tags.AdditionalProperties); err != nil {
+	if err := d.Set(FieldNodeConfigurationTags, nodeConfig.Tags); err != nil {
 		return diag.FromErr(fmt.Errorf("setting tags: %w", err))
 	}
 
@@ -819,9 +817,7 @@ func resourceNodeConfigurationUpdate(ctx context.Context, d *schema.ResourceData
 		req.KubeletConfig = toPtr(m)
 	}
 	if v := d.Get(FieldNodeConfigurationTags).(map[string]interface{}); len(v) > 0 {
-		req.Tags = &sdk.NodeconfigV1NodeConfigurationUpdate_Tags{
-			AdditionalProperties: toStringMap(v),
-		}
+		req.Tags = lo.ToPtr(toStringMap(v))
 	}
 
 	// Map provider specific configurations.