Fix S3 Region not recognised (rilldata#1583)

* changing aws.region to region * fixing ci
developgo · Jan 10, 2023 · c30a094 · c30a094
1 parent 7c9de8c
commit c30a094
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/runtime/compilers/rillv1beta/project.go b/runtime/compilers/rillv1beta/project.go
@@ -79,7 +79,7 @@ func (c *Codec) PutSource(ctx context.Context, repo drivers.RepoStore, instanceI
 		out.Path = val
 	}
 
-	if val, ok := props["aws.region"].(string); ok {
+	if val, ok := props["region"].(string); ok {
 		out.Region = val
 	}
 

diff --git a/runtime/connectors/s3/s3.go b/runtime/connectors/s3/s3.go
@@ -33,7 +33,7 @@ var spec = connectors.Spec{
 			Hint:        "Note that glob patterns aren't yet supported",
 		},
 		{
-			Key:         "aws.region",
+			Key:         "region",
 			DisplayName: "AWS region",
 			Description: "AWS Region for the bucket.",
 			Placeholder: "us-east-1",
@@ -54,7 +54,7 @@ var spec = connectors.Spec{
 
 type Config struct {
 	Path      string `mapstructure:"path"`
-	AWSRegion string `mapstructure:"aws.region"`
+	AWSRegion string `mapstructure:"region"`
 }
 
 func ParseConfig(props map[string]any) (*Config, error) {

diff --git a/runtime/services/catalog/artifacts/artifacts_test.go b/runtime/services/catalog/artifacts/artifacts_test.go
@@ -57,8 +57,8 @@ csv.delimiter: '|'
 					Name:      "S3Source",
 					Connector: "s3",
 					Properties: toProtoStruct(map[string]any{
-						"path":       "s3://bucket/path/file.csv",
-						"aws.region": "us-east-2",
+						"path":   "s3://bucket/path/file.csv",
+						"region": "us-east-2",
 					}),
 				},
 			},

diff --git a/runtime/services/catalog/artifacts/yaml/objects.go b/runtime/services/catalog/artifacts/yaml/objects.go
@@ -20,7 +20,7 @@ type Source struct {
 	Path         string `yaml:"path,omitempty"`
 	CsvDelimiter string `yaml:"csv.delimiter,omitempty" mapstructure:"csv.delimiter,omitempty"`
 	URI          string `yaml:"uri,omitempty"`
-	Region       string `yaml:"region,omitempty" mapstructure:"aws.region,omitempty"`
+	Region       string `yaml:"region,omitempty" mapstructure:"region,omitempty"`
 }
 
 type MetricsView struct {
@@ -87,7 +87,7 @@ func fromSourceArtifact(source *Source, path string) (*drivers.CatalogEntry, err
 		props["path"] = source.URI
 	}
 	if source.Region != "" {
-		props["aws.region"] = source.Region
+		props["region"] = source.Region
 	}
 	if source.CsvDelimiter != "" {
 		props["csv.delimiter"] = source.CsvDelimiter