Merge pull request #25209 from antiguru/fix_internal_unmanaged_cluster

MaterializeInc · Feb 13, 2024 · fea49e1 · fea49e1
2 parents fd5f358 + 22f65e6
commit fea49e1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/src/adapter/src/coord/sequencer/cluster.rs b/src/adapter/src/coord/sequencer/cluster.rs
@@ -291,6 +291,15 @@ impl Coordinator {
                     internal,
                     size,
                 } => {
+                    // Only internal users have access to INTERNAL and BILLED AS
+                    if !session.user().is_internal() && (internal || billed_as.is_some()) {
+                        coord_bail!("cannot specify INTERNAL or BILLED AS as non-internal user")
+                    }
+                    // BILLED AS implies the INTERNAL flag.
+                    if billed_as.is_some() && !internal {
+                        coord_bail!("must specify INTERNAL when specifying BILLED AS");
+                    }
+
                     let location = mz_catalog::durable::ReplicaLocation::Managed {
                         availability_zone,
                         billed_as,

diff --git a/test/sqllogictest/cluster.slt b/test/sqllogictest/cluster.slt
@@ -805,4 +805,33 @@ DROP CLUSTER REPLICA t1.r1;
 statement ok
 DROP CLUSTER t1
 
+# Test unmanaged clusters with internal/billed as.
+
+statement error db error: ERROR: cannot specify INTERNAL or BILLED AS as non\-internal user
+CREATE CLUSTER t1 (REPLICAS (r1 (SIZE '1', INTERNAL, BILLED AS 'free')));
+
+statement error db error: ERROR: cannot specify INTERNAL or BILLED AS as non\-internal user
+CREATE CLUSTER t1 (REPLICAS (internal_r1 (SIZE '1', INTERNAL, BILLED AS 'free')));
+
+statement error db error: ERROR: cannot specify INTERNAL or BILLED AS as non\-internal user
+CREATE CLUSTER t1 (REPLICAS (internal_r1 (SIZE '1', BILLED AS 'free')));
+
+statement error db error: ERROR: cannot specify INTERNAL or BILLED AS as non\-internal user
+CREATE CLUSTER t1 (REPLICAS (internal_r1 (SIZE '1', INTERNAL)));
+
+simple conn=mz_system,user=mz_system
+CREATE CLUSTER t1 (REPLICAS (internal_r1 (SIZE '1', BILLED AS 'free')));
+----
+db error: ERROR: must specify INTERNAL when specifying BILLED AS
+
+simple conn=mz_system,user=mz_system
+CREATE CLUSTER t1 (REPLICAS (internal_r1 (SIZE '1', INTERNAL, BILLED AS 'free')));
+----
+COMPLETE 0
+
+simple conn=mz_system,user=mz_system
+DROP CLUSTER t1
+----
+COMPLETE 0
+
 reset-server