Fix warehouse validation

Snowflake-Labs · Oct 30, 2023 · 9949ff6 · 9949ff6
1 parent 526596a
commit 9949ff6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/pkg/sdk/masking_policy_test.go b/pkg/sdk/masking_policy_test.go
@@ -89,7 +89,7 @@ func TestMaskingPolicyAlter(t *testing.T) {
 			name: id,
 		}
 
-		assertOptsInvalid(t, opts, errExactlyOneOf("Set", "Unset", "NewName"))
+		assertOptsInvalid(t, opts, errExactlyOneOf("Set", "Unset", "SetTag", "UnsetTag", "NewName"))
 	})
 
 	t.Run("with set", func(t *testing.T) {

diff --git a/pkg/sdk/warehouses.go b/pkg/sdk/warehouses.go
@@ -246,16 +246,15 @@ func (v *WarehouseSet) validate() error {
 			return fmt.Errorf("QueryAccelerationMaxScaleFactor must be between 0 and 100")
 		}
 	}
-	if everyValueNil(v.AutoResume, v.EnableQueryAcceleration, v.MaxClusterCount, v.MinClusterCount, v.AutoSuspend, v.QueryAccelerationMaxScaleFactor) {
-		return errAtLeastOneOf("AutoResume", "EnableQueryAcceleration", "MaxClusterCount", "MinClusterCount", "AutoSuspend", "QueryAccelerationMaxScaleFactor")
+	if everyValueNil(v.WarehouseType, v.WarehouseSize, v.WaitForCompletion, v.MaxClusterCount, v.MinClusterCount, v.ScalingPolicy, v.AutoSuspend, v.AutoResume, v.ResourceMonitor, v.Comment, v.EnableQueryAcceleration, v.QueryAccelerationMaxScaleFactor, v.MaxConcurrencyLevel, v.StatementQueuedTimeoutInSeconds, v.StatementTimeoutInSeconds) {
+		return errAtLeastOneOf("WarehouseType", "WarehouseSize", "WaitForCompletion", "MaxClusterCount", "MinClusterCount", "ScalingPolicy", "AutoSuspend", "AutoResume", "ResourceMonitor", "Comment", "EnableQueryAcceleration", "QueryAccelerationMaxScaleFactor", "MaxConcurrencyLevel", "StatementQueuedTimeoutInSeconds", "StatementTimeoutInSeconds")
 	}
 	return nil
 }
 
 type WarehouseUnset struct {
 	// Object properties
 	WarehouseType                   *bool `ddl:"keyword" sql:"WAREHOUSE_TYPE"`
-	WarehouseSize                   *bool `ddl:"keyword" sql:"WAREHOUSE_SIZE"`
 	WaitForCompletion               *bool `ddl:"keyword" sql:"WAIT_FOR_COMPLETION"`
 	MaxClusterCount                 *bool `ddl:"keyword" sql:"MAX_CLUSTER_COUNT"`
 	MinClusterCount                 *bool `ddl:"keyword" sql:"MIN_CLUSTER_COUNT"`
@@ -274,8 +273,8 @@ type WarehouseUnset struct {
 }
 
 func (v *WarehouseUnset) validate() error {
-	if everyValueNil(v.AutoResume, v.EnableQueryAcceleration, v.MaxClusterCount, v.MinClusterCount, v.AutoSuspend, v.QueryAccelerationMaxScaleFactor) {
-		return errAtLeastOneOf("AutoResume", "EnableQueryAcceleration", "MaxClusterCount", "MinClusterCount", "AutoSuspend", "QueryAccelerationMaxScaleFactor")
+	if everyValueNil(v.WarehouseType, v.WaitForCompletion, v.MaxClusterCount, v.MinClusterCount, v.ScalingPolicy, v.AutoSuspend, v.AutoResume, v.ResourceMonitor, v.Comment, v.EnableQueryAcceleration, v.QueryAccelerationMaxScaleFactor, v.MaxConcurrencyLevel, v.StatementQueuedTimeoutInSeconds, v.StatementTimeoutInSeconds) {
+		return errAtLeastOneOf("WarehouseType", "WaitForCompletion", "MaxClusterCount", "MinClusterCount", "ScalingPolicy", "AutoSuspend", "AutoResume", "ResourceMonitor", "Comment", "EnableQueryAcceleration", "QueryAccelerationMaxScaleFactor", "MaxConcurrencyLevel", "StatementQueuedTimeoutInSeconds", "StatementTimeoutInSeconds")
 	}
 	return nil
 }

diff --git a/pkg/sdk/warehouses_test.go b/pkg/sdk/warehouses_test.go
@@ -142,12 +142,11 @@ func TestWarehouseAlter(t *testing.T) {
 		opts := &AlterWarehouseOptions{
 			name: NewAccountObjectIdentifier("mywarehouse"),
 			Unset: &WarehouseUnset{
-				WarehouseSize:   Bool(true),
 				MaxClusterCount: Bool(true),
 				AutoResume:      Bool(true),
 			},
 		}
-		assertOptsValidAndSQLEquals(t, opts, `ALTER WAREHOUSE "mywarehouse" UNSET WAREHOUSE_SIZE, MAX_CLUSTER_COUNT, AUTO_RESUME`)
+		assertOptsValidAndSQLEquals(t, opts, `ALTER WAREHOUSE "mywarehouse" UNSET MAX_CLUSTER_COUNT, AUTO_RESUME`)
 	})
 
 	t.Run("rename", func(t *testing.T) {