Skip to content

Commit

Permalink
Add implementation for functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfc-gh-asawicki
sfc-gh-asawicki committed Dec 12, 2024
1 parent af4fb22 commit ced1cef
Show file tree
Hide file tree
Showing 6 changed files with 495 additions and 132 deletions.
102 changes: 102 additions & 0 deletions pkg/resources/function_commons.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"errors"
"fmt"
"log"
"reflect"
"slices"

"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/schemas"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
Expand Down Expand Up @@ -405,6 +407,106 @@ func DeleteFunction(ctx context.Context, d *schema.ResourceData, meta any) diag.
return nil
}

func UpdateFunction(language string, readFunc func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics) func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
return func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*provider.Context).Client
id, err := sdk.ParseSchemaObjectIdentifierWithArguments(d.Id())
if err != nil {
return diag.FromErr(err)
}

if d.HasChange("name") {
newId := sdk.NewSchemaObjectIdentifierWithArgumentsInSchema(id.SchemaId(), d.Get("name").(string), id.ArgumentDataTypes()...)

err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithRenameTo(newId.SchemaObjectId()))
if err != nil {
return diag.FromErr(fmt.Errorf("error renaming function %v err = %w", d.Id(), err))
}

d.SetId(helpers.EncodeResourceIdentifier(newId))
id = newId
}

// Batch SET operations and UNSET operations
setRequest := sdk.NewFunctionSetRequest()
unsetRequest := sdk.NewFunctionUnsetRequest()

_ = stringAttributeUpdate(d, "comment", &setRequest.Comment, &unsetRequest.Comment)

switch language {
case "JAVA", "SCALA", "PYTHON":
err = errors.Join(
func() error {
if d.HasChange("secrets") {
return setSecretsInBuilder(d, func(references []sdk.SecretReference) *sdk.FunctionSetRequest {
return setRequest.WithSecretsList(sdk.SecretsListRequest{SecretsList: references})
})
}
return nil
}(),
func() error {
if d.HasChange("external_access_integrations") {
return setExternalAccessIntegrationsInBuilder(d, func(references []sdk.AccountObjectIdentifier) any {
if len(references) == 0 {
return unsetRequest.WithExternalAccessIntegrations(true)
} else {
return setRequest.WithExternalAccessIntegrations(references)
}
})
}
return nil
}(),
)
if err != nil {
return diag.FromErr(err)
}
}

if updateParamDiags := handleFunctionParametersUpdate(d, setRequest, unsetRequest); len(updateParamDiags) > 0 {
return updateParamDiags
}

// Apply SET and UNSET changes
if !reflect.DeepEqual(*setRequest, *sdk.NewFunctionSetRequest()) {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithSet(*setRequest))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}
if !reflect.DeepEqual(*unsetRequest, *sdk.NewFunctionUnsetRequest()) {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithUnset(*unsetRequest))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}

// has to be handled separately
if d.HasChange("is_secure") {
if v := d.Get("is_secure").(string); v != BooleanDefault {
parsed, err := booleanStringToBool(v)
if err != nil {
return diag.FromErr(err)
}
err = client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithSetSecure(parsed))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
} else {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithUnsetSecure(true))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}
}

return readFunc(ctx, d, meta)
}
}

// TODO [SNOW-1850370]: Make the rest of the functions in this file generic (for reuse with procedures)
func parseFunctionArgumentsCommon(d *schema.ResourceData) ([]sdk.FunctionArgumentRequest, error) {
args := make([]sdk.FunctionArgumentRequest, 0)
Expand Down
97 changes: 1 addition & 96 deletions pkg/resources/function_java.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package resources
import (
"context"
"errors"
"fmt"
"reflect"
"strings"

Expand All @@ -23,7 +22,7 @@ func FunctionJava() *schema.Resource {
return &schema.Resource{
CreateContext: TrackingCreateWrapper(resources.FunctionJava, CreateContextFunctionJava),
ReadContext: TrackingReadWrapper(resources.FunctionJava, ReadContextFunctionJava),
UpdateContext: TrackingUpdateWrapper(resources.FunctionJava, UpdateContextFunctionJava),
UpdateContext: TrackingUpdateWrapper(resources.FunctionJava, UpdateFunction("JAVA", ReadContextFunctionJava)),
DeleteContext: TrackingDeleteWrapper(resources.FunctionJava, DeleteFunction),
Description: "Resource used to manage java function objects. For more information, check [function documentation](https://docs.snowflake.com/en/sql-reference/sql/create-function).",

Expand Down Expand Up @@ -147,97 +146,3 @@ func ReadContextFunctionJava(ctx context.Context, d *schema.ResourceData, meta a

return nil
}

func UpdateContextFunctionJava(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*provider.Context).Client
id, err := sdk.ParseSchemaObjectIdentifierWithArguments(d.Id())
if err != nil {
return diag.FromErr(err)
}

if d.HasChange("name") {
newId := sdk.NewSchemaObjectIdentifierWithArgumentsInSchema(id.SchemaId(), d.Get("name").(string), id.ArgumentDataTypes()...)

err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithRenameTo(newId.SchemaObjectId()))
if err != nil {
return diag.FromErr(fmt.Errorf("error renaming function %v err = %w", d.Id(), err))
}

d.SetId(helpers.EncodeResourceIdentifier(newId))
id = newId
}

// Batch SET operations and UNSET operations
setRequest := sdk.NewFunctionSetRequest()
unsetRequest := sdk.NewFunctionUnsetRequest()

err = errors.Join(
stringAttributeUpdate(d, "comment", &setRequest.Comment, &unsetRequest.Comment),
func() error {
if d.HasChange("secrets") {
return setSecretsInBuilder(d, func(references []sdk.SecretReference) *sdk.FunctionSetRequest {
return setRequest.WithSecretsList(sdk.SecretsListRequest{SecretsList: references})
})
}
return nil
}(),
func() error {
if d.HasChange("external_access_integrations") {
return setExternalAccessIntegrationsInBuilder(d, func(references []sdk.AccountObjectIdentifier) any {
if len(references) == 0 {
return unsetRequest.WithExternalAccessIntegrations(true)
} else {
return setRequest.WithExternalAccessIntegrations(references)
}
})
}
return nil
}(),
)
if err != nil {
return diag.FromErr(err)
}

if updateParamDiags := handleFunctionParametersUpdate(d, setRequest, unsetRequest); len(updateParamDiags) > 0 {
return updateParamDiags
}

// Apply SET and UNSET changes
if !reflect.DeepEqual(*setRequest, *sdk.NewFunctionSetRequest()) {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithSet(*setRequest))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}
if !reflect.DeepEqual(*unsetRequest, *sdk.NewFunctionUnsetRequest()) {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithUnset(*unsetRequest))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}

// has to be handled separately
if d.HasChange("is_secure") {
if v := d.Get("is_secure").(string); v != BooleanDefault {
parsed, err := booleanStringToBool(v)
if err != nil {
return diag.FromErr(err)
}
err = client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithSetSecure(parsed))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
} else {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithUnsetSecure(true))
if err != nil {
d.Partial(true)
return diag.FromErr(err)
}
}
}

return ReadContextFunctionJava(ctx, d, meta)
}
101 changes: 92 additions & 9 deletions pkg/resources/function_javascript.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ package resources

import (
"context"
"errors"
"reflect"
"strings"

"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/schemas"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand All @@ -16,7 +22,7 @@ func FunctionJavascript() *schema.Resource {
return &schema.Resource{
CreateContext: TrackingCreateWrapper(resources.FunctionJavascript, CreateContextFunctionJavascript),
ReadContext: TrackingReadWrapper(resources.FunctionJavascript, ReadContextFunctionJavascript),
UpdateContext: TrackingUpdateWrapper(resources.FunctionJavascript, UpdateContextFunctionJavascript),
UpdateContext: TrackingUpdateWrapper(resources.FunctionJavascript, UpdateFunction("JAVASCRIPT", ReadContextFunctionJavascript)),
DeleteContext: TrackingDeleteWrapper(resources.FunctionJavascript, DeleteFunction),
Description: "Resource used to manage javascript function objects. For more information, check [function documentation](https://docs.snowflake.com/en/sql-reference/sql/create-function).",

Expand All @@ -25,7 +31,11 @@ func FunctionJavascript() *schema.Resource {
ComputedIfAnyAttributeChanged(javascriptFunctionSchema, FullyQualifiedNameAttributeName, "name"),
ComputedIfAnyAttributeChanged(functionParametersSchema, ParametersAttributeName, collections.Map(sdk.AsStringList(sdk.AllFunctionParameters), strings.ToLower)...),
functionParametersCustomDiff,
// TODO[SNOW-1348103]: recreate when type changed externally
// The language check is more for the future.
// Currently, almost all attributes are marked as forceNew.
// When language changes, these attributes also change, causing the object to recreate either way.
// The only potential option is java staged <-> scala staged (however scala need runtime_version which may interfere).
RecreateWhenResourceStringFieldChangedExternally("function_language", "JAVASCRIPT"),
)),

Schema: collections.MergeMaps(javascriptFunctionSchema, functionParametersSchema),
Expand All @@ -36,17 +46,90 @@ func FunctionJavascript() *schema.Resource {
}

func CreateContextFunctionJavascript(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
return nil
client := meta.(*provider.Context).Client
database := d.Get("database").(string)
sc := d.Get("schema").(string)
name := d.Get("name").(string)

argumentRequests, err := parseFunctionArgumentsCommon(d)
if err != nil {
return diag.FromErr(err)
}
returns, err := parseFunctionReturnsCommon(d)
if err != nil {
return diag.FromErr(err)
}
handler := d.Get("handler").(string)

argumentDataTypes := collections.Map(argumentRequests, func(r sdk.FunctionArgumentRequest) datatypes.DataType { return r.ArgDataType })
id := sdk.NewSchemaObjectIdentifierWithArgumentsNormalized(database, sc, name, argumentDataTypes...)
request := sdk.NewCreateForJavascriptFunctionRequestDefinitionWrapped(id.SchemaObjectId(), *returns, handler).
WithArguments(argumentRequests)

errs := errors.Join(
booleanStringAttributeCreateBuilder(d, "is_secure", request.WithSecure),
attributeMappedValueCreateBuilder[string](d, "null_input_behavior", request.WithNullInputBehavior, sdk.ToNullInputBehavior),
attributeMappedValueCreateBuilder[string](d, "return_results_behavior", request.WithReturnResultsBehavior, sdk.ToReturnResultsBehavior),
stringAttributeCreateBuilder(d, "comment", request.WithComment),
)
if errs != nil {
return diag.FromErr(errs)
}

if err := client.Functions.CreateForJavascript(ctx, request); err != nil {
return diag.FromErr(err)
}
d.SetId(helpers.EncodeResourceIdentifier(id))

// parameters do not work in create function (query does not fail but parameters stay unchanged)
setRequest := sdk.NewFunctionSetRequest()
if parametersCreateDiags := handleFunctionParametersCreate(d, setRequest); len(parametersCreateDiags) > 0 {
return parametersCreateDiags
}
if !reflect.DeepEqual(*setRequest, *sdk.NewFunctionSetRequest()) {
err := client.Functions.Alter(ctx, sdk.NewAlterFunctionRequest(id).WithSet(*setRequest))
if err != nil {
return diag.FromErr(err)
}
}

return ReadContextFunctionJavascript(ctx, d, meta)
}

func ReadContextFunctionJavascript(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
return nil
}
client := meta.(*provider.Context).Client
id, err := sdk.ParseSchemaObjectIdentifierWithArguments(d.Id())
if err != nil {
return diag.FromErr(err)
}

func UpdateContextFunctionJavascript(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
return nil
}
allFunctionDetails, diags := queryAllFunctionDetailsCommon(ctx, d, client, id)
if diags != nil {
return diags
}

// TODO [SNOW-1348103]: handle external changes marking
// TODO [SNOW-1348103]: handle setting state to value from config

errs := errors.Join(
// not reading is_secure on purpose (handled as external change to show output)
readFunctionOrProcedureArguments(d, allFunctionDetails.functionDetails.NormalizedArguments),
d.Set("return_type", allFunctionDetails.functionDetails.ReturnDataType.ToSql()),
// not reading null_input_behavior on purpose (handled as external change to show output)
// not reading return_results_behavior on purpose (handled as external change to show output)
d.Set("comment", allFunctionDetails.function.Description),
setRequiredFromStringPtr(d, "handler", allFunctionDetails.functionDetails.Handler),
setOptionalFromStringPtr(d, "function_definition", allFunctionDetails.functionDetails.Body),
d.Set("function_language", allFunctionDetails.functionDetails.Language),

handleFunctionParameterRead(d, allFunctionDetails.functionParameters),
d.Set(FullyQualifiedNameAttributeName, id.FullyQualifiedName()),
d.Set(ShowOutputAttributeName, []map[string]any{schemas.FunctionToSchema(allFunctionDetails.function)}),
d.Set(ParametersAttributeName, []map[string]any{schemas.FunctionParametersToSchema(allFunctionDetails.functionParameters)}),
)
if errs != nil {
return diag.FromErr(err)
}

func DeleteContextFunctionJavascript(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
return nil
}
Loading

0 comments on commit ced1cef

Please sign in to comment.