From 5a7a30abe6ef70d3d0480f9f64890e536279cc54 Mon Sep 17 00:00:00 2001 From: Artur Sawicki Date: Fri, 20 Dec 2024 17:22:31 +0100 Subject: [PATCH] Simplify functions and procedures multiline --- .../bettertestspoc/config/model/function_java_model_ext.go | 3 +-- .../config/model/function_javascript_model_ext.go | 4 +--- .../bettertestspoc/config/model/function_python_model_ext.go | 3 +-- .../bettertestspoc/config/model/function_scala_model_ext.go | 3 +-- .../bettertestspoc/config/model/function_sql_model_ext.go | 4 +--- .../bettertestspoc/config/model/procedure_java_model_ext.go | 3 +-- .../config/model/procedure_javascript_model_ext.go | 4 +--- .../bettertestspoc/config/model/procedure_python_model_ext.go | 3 +-- .../bettertestspoc/config/model/procedure_scala_model_ext.go | 3 +-- .../bettertestspoc/config/model/procedure_sql_model_ext.go | 4 +--- 10 files changed, 10 insertions(+), 24 deletions(-) diff --git a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go index 3b2acbc841..b9bd0b37e8 100644 --- a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go @@ -5,7 +5,6 @@ import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" @@ -18,7 +17,7 @@ func FunctionJavaBasicInline( handler string, functionDefinition string, ) *FunctionJavaModel { - return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition)) + return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinition(functionDefinition) } func FunctionJavaBasicStaged( diff --git a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go index 3c25076aab..4f799a2574 100644 --- a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go @@ -3,14 +3,12 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" ) func FunctionJavascriptInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionJavascriptModel { - return FunctionJavascript(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()). - WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition)) + return FunctionJavascript(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()) } func (f *FunctionJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionJavascriptModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go index ad420f07ef..d22f52da29 100644 --- a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go @@ -3,14 +3,13 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" ) func FunctionPythonBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, runtimeVersion string, returnType datatypes.DataType, handler string, functionDefinition string) *FunctionPythonModel { - return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition)) + return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition) } func (f *FunctionPythonModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionPythonModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go index bf81948f58..a0d8fa7829 100644 --- a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go @@ -5,7 +5,6 @@ import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" @@ -19,7 +18,7 @@ func FunctionScalaBasicInline( handler string, functionDefinition string, ) *FunctionScalaModel { - return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition)) + return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition) } func (f *FunctionScalaModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionScalaModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go index 32c1cc7325..65638e4daf 100644 --- a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go @@ -3,14 +3,12 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" ) func FunctionSqlBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionSqlModel { - return FunctionSql(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()). - WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition)) + return FunctionSql(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()) } func (f *FunctionSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionSqlModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go index 3440012ee5..ce9dd69bc2 100644 --- a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go @@ -3,7 +3,6 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" @@ -17,7 +16,7 @@ func ProcedureJavaBasicInline( procedureDefinition string, ) *ProcedureJavaModel { return ProcedureJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "11", id.SchemaName(), "1.14.0"). - WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition)) + WithProcedureDefinition(procedureDefinition) } func ProcedureJavaBasicStaged( diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go index 5e1af42056..35b693c003 100644 --- a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go @@ -3,7 +3,6 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" ) @@ -14,8 +13,7 @@ func ProcedureJavascriptBasicInline( returnType datatypes.DataType, procedureDefinition string, ) *ProcedureJavascriptModel { - return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()). - WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition)) + return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()) } func (f *ProcedureJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureJavascriptModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go index fa65b15d42..6e48b14fed 100644 --- a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go @@ -3,7 +3,6 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" @@ -17,7 +16,7 @@ func ProcedurePythonBasicInline( procedureDefinition string, ) *ProcedurePythonModel { return ProcedurePython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "3.8", id.SchemaName(), "1.14.0"). - WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition)) + WithProcedureDefinition(procedureDefinition) } func (f *ProcedurePythonModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedurePythonModel { diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go index a307f5b198..69ddb67485 100644 --- a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go @@ -3,7 +3,6 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" @@ -17,7 +16,7 @@ func ProcedureScalaBasicInline( procedureDefinition string, ) *ProcedureScalaModel { return ProcedureScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "2.12", id.SchemaName(), "1.14.0"). - WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition)) + WithProcedureDefinition(procedureDefinition) } func ProcedureScalaBasicStaged( diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go index a266504b2f..d41791dfaa 100644 --- a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go +++ b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go @@ -3,7 +3,6 @@ package model import ( tfconfig "github.com/hashicorp/terraform-plugin-testing/config" - "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes" ) @@ -14,8 +13,7 @@ func ProcedureSqlBasicInline( returnType datatypes.DataType, procedureDefinition string, ) *ProcedureSqlModel { - return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()). - WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition)) + return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()) } func (f *ProcedureSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureSqlModel {