update repo to reflect v.2.9.0 of the api

Author: simplyluke

internal/provider/environments/data_source.go

@@ -108,7 +108,7 @@ func (d *environmentsDataSource) Schema(_ context.Context, _ datasource.SchemaRe
 func (d *environmentsDataSource) Read(ctx context.Context, _ datasource.ReadRequest, resp *datasource.ReadResponse) {
 	var state environmentsDataSourceModel
 
-	environments, _, err := d.client.EnvironmentAPI.EnvironmentsGet(ctx).Execute()
+	environments, _, err := d.client.EnvironmentsAPI.EnvironmentsGet(ctx).Execute()
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Unable to Read Retool Environments",

internal/provider/folder/resource.go

@@ -250,18 +250,18 @@ func (r *folderResource) Update(ctx context.Context, req resource.UpdateRequest,
 	// Generate API request body.
 	patchReq := api.FoldersFolderIdPatchRequest{}
 	if !plan.Name.Equal(state.Name) {
-		op := api.NewUsersUserIdPatchRequestOperationsInnerAnyOf("replace", "/name")
+		op := api.NewReplaceOperation("replace", "/name")
 		op.Value = plan.Name.ValueString()
-		patchReq.Operations = append(patchReq.Operations, api.FoldersFolderIdPatchRequestOperationsInner{UsersUserIdPatchRequestOperationsInnerAnyOf: op})
+		patchReq.Operations = append(patchReq.Operations, api.FoldersFolderIdPatchRequestOperationsInner{ReplaceOperation: op})
 	}
 	if !plan.ParentFolderID.Equal(state.ParentFolderID) {
 		parentFolderID := r.getTrueParentFolderID(ctx, plan.FolderType.ValueString(), plan.ParentFolderID.ValueString(), &resp.Diagnostics)
 		if resp.Diagnostics.HasError() {
 			return
 		}
-		op := api.NewUsersUserIdPatchRequestOperationsInnerAnyOf("replace", "/parent_folder_id")
+		op := api.NewReplaceOperation("replace", "/parent_folder_id")
 		op.Value = parentFolderID
-		patchReq.Operations = append(patchReq.Operations, api.FoldersFolderIdPatchRequestOperationsInner{UsersUserIdPatchRequestOperationsInnerAnyOf: op})
+		patchReq.Operations = append(patchReq.Operations, api.FoldersFolderIdPatchRequestOperationsInner{ReplaceOperation: op})
 	}
 	_, httpResponse, err := r.client.FoldersAPI.FoldersFolderIdPatch(ctx, state.ID.ValueString()).FoldersFolderIdPatchRequest(patchReq).Execute()
 	if err != nil {
@@ -291,11 +291,7 @@ func (r *folderResource) Delete(ctx context.Context, req resource.DeleteRequest,
 	}
 
 	// Delete existing order.
-	recursive := true
-	deleteRequest := api.FoldersFolderIdDeleteRequest{}
-	deleteRequest.Recursive = &recursive
-
-	httpResponse, err := r.client.FoldersAPI.FoldersFolderIdDelete(ctx, state.ID.ValueString()).FoldersFolderIdDeleteRequest(deleteRequest).Execute()
+	httpResponse, err := r.client.FoldersAPI.FoldersFolderIdDelete(ctx, state.ID.ValueString()).Execute()
 	if err != nil && !(httpResponse != nil && httpResponse.StatusCode == 404) { // It's ok to not find the resource being deleted.
 		resp.Diagnostics.AddError(
 			"Error Deleting Folder",

internal/provider/folder/resource_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 
 	"github.com/tryretool/terraform-provider-retool/internal/acctest"
-	"github.com/tryretool/terraform-provider-retool/internal/sdk/api"
 )
 
 const testFolderConfig = `
@@ -65,10 +64,7 @@ func sweepFolders(region string) error {
 		if strings.HasPrefix(folder.Name, "tf-acc") {
 			log.Printf("Deleting folder %s", folder.Name)
 			tflog.Info(context.Background(), "Deleting folder", map[string]interface{}{"folder": folder.Name})
-			recursive := true
-			deleteRequest := api.FoldersFolderIdDeleteRequest{}
-			deleteRequest.Recursive = &recursive
-			_, err := client.FoldersAPI.FoldersFolderIdDelete(context.Background(), folder.Id).FoldersFolderIdDeleteRequest(deleteRequest).Execute()
+			_, err := client.FoldersAPI.FoldersFolderIdDelete(context.Background(), folder.Id).Recursive(true).Execute()
 			if err != nil {
 				return fmt.Errorf("Error deleting folder %s: %s", folder.Name, err.Error())
 			}

internal/provider/permissions/resource.go

@@ -158,18 +158,37 @@ func createNewAPIPermissionsSubject(subjectModel permissionSubjectModel) api.Per
 			return api.PermissionsListObjectsPostRequestSubject{}
 		}
 		floatGroupID := float32(groupID) // Our client uses float32 to represent "number" ids.
-		subject.PermissionsListObjectsPostRequestSubjectOneOf = api.NewPermissionsListObjectsPostRequestSubjectOneOf("group", *api.NewNullableFloat32(&floatGroupID))
+		groupSubject := api.NewGroup("group", *api.NewNullableFloat32(&floatGroupID))
+		subject = api.GroupAsPermissionsListObjectsPostRequestSubject(groupSubject)
 	} else if subjectModel.Type.ValueString() == "user" {
-		subject.PermissionsListObjectsPostRequestSubjectOneOf1 = api.NewPermissionsListObjectsPostRequestSubjectOneOf1("user", subjectModel.ID.ValueString())
+		userSubject := api.NewUser("user", subjectModel.ID.ValueString())
+		subject = api.UserAsPermissionsListObjectsPostRequestSubject(userSubject)
 	}
 	return subject
 }
 
 func createNewAPIPermissionsObject(objectModel permissionObjectModel) api.PermissionsGrantPostRequestObject {
-	object := api.PermissionsGrantPostRequestObject{
-		PermissionsGrantPostRequestObjectOneOf: api.NewPermissionsGrantPostRequestObjectOneOf(objectModel.Type.ValueString(), objectModel.ID.ValueString()),
+	objType := objectModel.Type.ValueString()
+	objID := objectModel.ID.ValueString()
+	
+	// Use the appropriate constructor and wrapper function based on object type
+	switch objType {
+	case "app":
+		app := api.NewApp(objType, objID)
+		return api.AppAsPermissionsGrantPostRequestObject(app)
+	case "folder":
+		folder := api.NewFolder(objType, objID)
+		return api.FolderAsPermissionsGrantPostRequestObject(folder)
+	case "resource":
+		resource := api.NewResource(objType, objID)
+		return api.ResourceAsPermissionsGrantPostRequestObject(resource)
+	case "resource_configuration":
+		resourceConfig := api.NewResourceConfiguration(objType, objID)
+		return api.ResourceConfigurationAsPermissionsGrantPostRequestObject(resourceConfig)
+	default:
+		// Fallback: return empty object if type is unknown
+		return api.PermissionsGrantPostRequestObject{}
 	}
-	return object
 }
 
 func getPermissionID(subject permissionSubjectModel, object permissionObjectModel) string {