wip: updates to use middleware + gqlgen upload files for file objects

Signed-off-by: Sarah Funkhouser <[email protected]>

config/.env.example

@@ -148,18 +148,8 @@ CORE_RATELIMIT_BURST="30"
 CORE_RATELIMIT_EXPIRES="10m"
 CORE_OBJECTSTORAGE_ENABLED="true"
 CORE_OBJECTSTORAGE_PROVIDER=""
-CORE_OBJECTSTORAGE_STORAGE=""
-CORE_OBJECTSTORAGE_DATASET_TYPE=""
-CORE_OBJECTSTORAGE_KIND=""
-CORE_OBJECTSTORAGE_PATH=""
-CORE_OBJECTSTORAGE_CONTAINER=""
 CORE_OBJECTSTORAGE_ACCESSKEY=""
 CORE_OBJECTSTORAGE_REGION=""
 CORE_OBJECTSTORAGE_SECRETKEY=""
-CORE_OBJECTSTORAGE_CREDENTIALS_JSON=""
+CORE_OBJECTSTORAGE_CREDENTIALSJSON=""
 CORE_OBJECTSTORAGE_BUCKET=""
-CORE_OBJECTSTORAGE_ENDPOINT=""
-CORE_OBJECTSTORAGE_DISABLE_SSL=""
-CORE_OBJECTSTORAGE_FORCE_PATH_STYLE=""
-CORE_OBJECTSTORAGE_PATH_STYLE=""
-CORE_OBJECTSTORAGE_ENDPOINT_STYLE=""

config/config.example.yaml

@@ -107,26 +107,13 @@ jobQueue:
         Workers: null
     runMigrations: false
 objectStorage:
-    ConfigurationPath: ""
-    ExecutionTime: "0001-01-01T00:00:00Z"
-    SourcePath: ""
-    accesskey: ""
+    accessKey: ""
     bucket: ""
-    container: ""
-    credentials_json: ""
-    dataset_type: ""
-    disable_ssl: false
+    credentialsJSON: ""
     enabled: true
-    endpoint: ""
-    endpoint_style: false
-    force_path_style: false
-    kind: ""
-    path: ""
-    path_style: false
     provider: ""
     region: ""
-    secretkey: ""
-    storage: null
+    secretKey: ""
 ratelimit:
     burst: 30
     enabled: false

config/config.go

@@ -65,8 +65,9 @@ type Config struct {
 	// TOTP contains the configuration for the TOTP provider
 	TOTP totp.Config `json:"totp" koanf:"totp"`
 	// Ratelimit contains the configuration for the rate limiter
-	Ratelimit     ratelimit.Config `json:"ratelimit" koanf:"ratelimit"`
-	ObjectStorage objects.Config   `json:"objectStorage" koanf:"objectStorage"`
+	Ratelimit ratelimit.Config `json:"ratelimit" koanf:"ratelimit"`
+	// ObjectStorage contains the configuration for the object storage backend
+	ObjectStorage objects.Config `json:"objectStorage" koanf:"objectStorage"`
 }
 
 // Server settings for the echo server

config/configmap.yaml

@@ -160,18 +160,8 @@ data:
   CORE_RATELIMIT_EXPIRES: {{ .Values.core.ratelimit.expires | default "10m" }}
   CORE_OBJECTSTORAGE_ENABLED: {{ .Values.core.objectStorage.enabled | default true }}
   CORE_OBJECTSTORAGE_PROVIDER: {{ .Values.core.objectStorage.provider }}
-  CORE_OBJECTSTORAGE_STORAGE: {{ .Values.core.objectStorage.storage }}
-  CORE_OBJECTSTORAGE_DATASET_TYPE: {{ .Values.core.objectStorage.dataset_type }}
-  CORE_OBJECTSTORAGE_KIND: {{ .Values.core.objectStorage.kind }}
-  CORE_OBJECTSTORAGE_PATH: {{ .Values.core.objectStorage.path }}
-  CORE_OBJECTSTORAGE_CONTAINER: {{ .Values.core.objectStorage.container }}
-  CORE_OBJECTSTORAGE_ACCESSKEY: {{ .Values.core.objectStorage.accesskey }}
+  CORE_OBJECTSTORAGE_ACCESSKEY: {{ .Values.core.objectStorage.accessKey }}
   CORE_OBJECTSTORAGE_REGION: {{ .Values.core.objectStorage.region }}
-  CORE_OBJECTSTORAGE_SECRETKEY: {{ .Values.core.objectStorage.secretkey }}
-  CORE_OBJECTSTORAGE_CREDENTIALS_JSON: {{ .Values.core.objectStorage.credentials_json }}
+  CORE_OBJECTSTORAGE_SECRETKEY: {{ .Values.core.objectStorage.secretKey }}
+  CORE_OBJECTSTORAGE_CREDENTIALSJSON: {{ .Values.core.objectStorage.credentialsJSON }}
   CORE_OBJECTSTORAGE_BUCKET: {{ .Values.core.objectStorage.bucket }}
-  CORE_OBJECTSTORAGE_ENDPOINT: {{ .Values.core.objectStorage.endpoint }}
-  CORE_OBJECTSTORAGE_DISABLE_SSL: {{ .Values.core.objectStorage.disable_ssl }}
-  CORE_OBJECTSTORAGE_FORCE_PATH_STYLE: {{ .Values.core.objectStorage.force_path_style }}
-  CORE_OBJECTSTORAGE_PATH_STYLE: {{ .Values.core.objectStorage.path_style }}
-  CORE_OBJECTSTORAGE_ENDPOINT_STYLE: {{ .Values.core.objectStorage.endpoint_style }}

go.sum

@@ -208,6 +208,8 @@ github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=