chore: tweak resource payload

usememos · May 17, 2024 · b0aad6f · b0aad6f
1 parent 0c251f9
commit b0aad6f
Show file tree

Hide file tree

Showing 11 changed files with 237 additions and 204 deletions.
diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml
@@ -1850,6 +1850,20 @@ definitions:
       expiresAt:
         type: string
         format: date-time
+  WorkspaceStorageSettingS3Config:
+    type: object
+    properties:
+      accessKeyId:
+        type: string
+      accessKeySecret:
+        type: string
+      endpoint:
+        type: string
+      region:
+        type: string
+      bucket:
+        type: string
+    title: 'Reference: https://developers.cloudflare.com/r2/examples/aws/aws-sdk-go/'
   apiHttpBody:
     type: object
     properties:
@@ -2086,22 +2100,8 @@ definitions:
         format: int64
         description: The max upload size in megabytes.
       s3Config:
-        $ref: '#/definitions/apiv1WorkspaceStorageSettingS3Config'
+        $ref: '#/definitions/WorkspaceStorageSettingS3Config'
         description: The S3 config.
-  apiv1WorkspaceStorageSettingS3Config:
-    type: object
-    properties:
-      accessKeyId:
-        type: string
-      accessKeySecret:
-        type: string
-      endpoint:
-        type: string
-      region:
-        type: string
-      bucket:
-        type: string
-    title: 'Reference: https://developers.cloudflare.com/r2/examples/aws/aws-sdk-go/'
   apiv1WorkspaceStorageSettingStorageType:
     type: string
     enum:

diff --git a/plugin/storage/s3/s3.go b/plugin/storage/s3/s3.go
@@ -20,7 +20,7 @@ type Client struct {
 	Bucket *string
 }
 
-func NewClient(ctx context.Context, s3Config *storepb.WorkspaceStorageSetting_S3Config) (*Client, error) {
+func NewClient(ctx context.Context, s3Config *storepb.StorageS3Config) (*Client, error) {
 	resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...any) (aws.Endpoint, error) {
 		return aws.Endpoint{
 			URL: s3Config.Endpoint,

diff --git a/proto/gen/store/resource.pb.go b/proto/gen/store/resource.pb.go