Merge branch 'main' into cloud-ui-remove-file-api

cli/cmd/upgrade/upgrade.go

@@ -45,6 +45,8 @@ func UpgradeCmd(cfg *config.Config) *cobra.Command {
 				args = append(args, "--nightly")
 			}
 			cmd := exec.Command("/bin/bash", args...)
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
 			return cmd.Run()
 		},
 	}

proto/gen/rill/runtime/v1/runtime.swagger.yaml

@@ -2266,6 +2266,13 @@ paths:
       tags:
         - ConnectorService
 definitions:
+  BucketExtractPolicyStrategy:
+    type: string
+    enum:
+      - STRATEGY_UNSPECIFIED
+      - STRATEGY_HEAD
+      - STRATEGY_TAIL
+    default: STRATEGY_UNSPECIFIED
   ColumnTimeSeriesRequestBasicMeasure:
     type: object
     properties:
@@ -2487,33 +2494,6 @@ definitions:
         items:
           type: string
     title: Dimension/measure level access condition
-  SourceExtractPolicy:
-    type: object
-    properties:
-      rowsStrategy:
-        $ref: '#/definitions/SourceExtractPolicyStrategy'
-        title: strategy for selecting rows in a file
-      rowsLimitBytes:
-        type: string
-        format: uint64
-        title: |-
-          could in future add: uint64 rows_limit = n;
-          limit on data fetched in bytes
-      filesStrategy:
-        $ref: '#/definitions/SourceExtractPolicyStrategy'
-        title: strategy for selecting files
-      filesLimit:
-        type: string
-        format: uint64
-        title: limit on number of files
-    title: Extract policy for glob connectors
-  SourceExtractPolicyStrategy:
-    type: string
-    enum:
-      - STRATEGY_UNSPECIFIED
-      - STRATEGY_HEAD
-      - STRATEGY_TAIL
-    default: STRATEGY_UNSPECIFIED
   StructTypeField:
     type: object
     properties:
@@ -2618,22 +2598,15 @@ definitions:
     type: object
     properties:
       rowsStrategy:
-        $ref: '#/definitions/v1BucketExtractPolicyStrategy'
+        $ref: '#/definitions/BucketExtractPolicyStrategy'
       rowsLimitBytes:
         type: string
         format: uint64
       filesStrategy:
-        $ref: '#/definitions/v1BucketExtractPolicyStrategy'
+        $ref: '#/definitions/BucketExtractPolicyStrategy'
       filesLimit:
         type: string
         format: uint64
-  v1BucketExtractPolicyStrategy:
-    type: string
-    enum:
-      - STRATEGY_UNSPECIFIED
-      - STRATEGY_HEAD
-      - STRATEGY_TAIL
-    default: STRATEGY_UNSPECIFIED
   v1BucketPlanner:
     type: object
     properties:
@@ -4526,9 +4499,6 @@ definitions:
       schema:
         $ref: '#/definitions/v1StructType'
         title: Detected schema of the source
-      policy:
-        $ref: '#/definitions/SourceExtractPolicy'
-        title: extraction policy for the source
       timeoutSeconds:
         type: integer
         format: int32

proto/rill/runtime/v1/catalog.proto

@@ -37,25 +37,6 @@ message Source {
   google.protobuf.Struct properties = 3;
   // Detected schema of the source
   StructType schema = 5;
-  // Extract policy for glob connectors
-  message ExtractPolicy {
-    enum Strategy {
-      STRATEGY_UNSPECIFIED = 0;
-      STRATEGY_HEAD = 1;
-      STRATEGY_TAIL = 2;
-    }
-    // strategy for selecting rows in a file
-    Strategy rows_strategy = 1;
-    // could in future add: uint64 rows_limit = n;
-    // limit on data fetched in bytes
-    uint64 rows_limit_bytes = 2;
-    // strategy for selecting files
-    Strategy files_strategy = 3;
-    // limit on number of files
-    uint64 files_limit = 4;
-  }
-  // extraction policy for the source
-  ExtractPolicy policy = 6;
   // timeout for source ingestion in seconds
   int32 timeout_seconds = 7;
 }

runtime/catalog.go

@@ -30,9 +30,6 @@ func (r *Runtime) GetCatalogEntry(ctx context.Context, instanceID, name string)
 
 	e, err := cat.FindEntry(ctx, name)
 	if err != nil {
-		if errors.Is(err, drivers.ErrNotFound) {
-			return nil, fmt.Errorf("entry not found")
-		}
 		return nil, err
 	}
 

runtime/compilers/rillv1/connectors.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	runtimev1 "github.com/rilldata/rill/proto/gen/rill/runtime/v1"
 	"github.com/rilldata/rill/runtime/drivers"
 	"go.uber.org/zap"
 	"golang.org/x/exp/slices"
@@ -64,7 +63,7 @@ func (p *Parser) AnalyzeConnectors(ctx context.Context) ([]*Connector, error) {
 				break
 			}
 			// Poll for anon access
-			res, _ := connector.HasAnonymousSourceAccess(ctx, driverSourceForAnonAccessCheck(driver, r.SourceSpec), zap.NewNop())
+			res, _ := connector.HasAnonymousSourceAccess(ctx, r.SourceSpec.Properties.AsMap(), zap.NewNop())
 			if !res {
 				anonAccess = false
 				break
@@ -106,29 +105,3 @@ func (p *Parser) connectorForName(name string) (string, drivers.Driver, error) {
 	}
 	return driver, connector, nil
 }
-
-func driverSourceForAnonAccessCheck(connector string, src *runtimev1.SourceSpec) drivers.Source {
-	props := src.Properties.AsMap()
-	switch connector {
-	case "s3":
-		return &drivers.BucketSource{
-			Properties: props,
-		}
-	case "gcs":
-		return &drivers.BucketSource{
-			Properties: props,
-		}
-	case "https":
-		return &drivers.FileSource{
-			Properties: props,
-		}
-	case "local_file":
-		return &drivers.FileSource{
-			Properties: props,
-		}
-	case "motherduck":
-		return &drivers.DatabaseSource{}
-	default:
-		return nil
-	}
-}

runtime/compilers/rillv1beta/connector.go

@@ -71,7 +71,7 @@ func ExtractConnectors(ctx context.Context, projectPath string) ([]*Connector, e
 		}
 		// ignoring error since failure to resolve this should not break the deployment flow
 		// this can fail under cases such as full or host/bucket of URI is a variable
-		access, _ := connector.HasAnonymousSourceAccess(ctx, source(src.Connector, src), zap.NewNop())
+		access, _ := connector.HasAnonymousSourceAccess(ctx, src.Properties.AsMap(), zap.NewNop())
 		c := key{Name: src.Connector, Type: src.Connector, AnonymousAccess: access}
 		srcs, ok := connectorMap[c]
 		if !ok {
@@ -158,33 +158,3 @@ type key struct {
 	Type            string
 	AnonymousAccess bool
 }
-
-func source(connector string, src *runtimev1.Source) drivers.Source {
-	props := src.Properties.AsMap()
-	switch connector {
-	case "s3":
-		return &drivers.BucketSource{
-			Properties: props,
-		}
-	case "gcs":
-		return &drivers.BucketSource{
-			Properties: props,
-		}
-	case "https":
-		return &drivers.FileSource{
-			Properties: props,
-		}
-	case "local_file":
-		return &drivers.FileSource{
-			Properties: props,
-		}
-	case "motherduck":
-		return &drivers.DatabaseSource{}
-	case "bigquery":
-		return &drivers.DatabaseSource{
-			Props: props,
-		}
-	default:
-		return nil
-	}
-}

runtime/connection_cache_test.go

@@ -276,7 +276,7 @@ func (*mockDriver) Drop(config map[string]any, logger *zap.Logger) error {
 }
 
 // HasAnonymousSourceAccess implements drivers.Driver.
-func (*mockDriver) HasAnonymousSourceAccess(ctx context.Context, src drivers.Source, logger *zap.Logger) (bool, error) {
+func (*mockDriver) HasAnonymousSourceAccess(ctx context.Context, src map[string]any, logger *zap.Logger) (bool, error) {
 	panic("unimplemented")
 }