Merge branch 'main' into feat/add_pagination

# Conflicts:
#	api/jiaozifs.gen.go
#	controller/branch_ctl.go
#	integrationtest/branch_test.go
#	models/branch_test.go

Author: Brownjy

api/api_impl/server.go

@@ -5,28 +5,21 @@ import (
 	"errors"
 	"net"
 	"net/http"
-
-	"github.com/jiaozifs/jiaozifs/auth"
-
-	"github.com/jiaozifs/jiaozifs/auth/crypt"
+	"net/url"
 
 	"github.com/MadAppGang/httplog"
-	"github.com/rs/cors"
-
 	"github.com/flowchartsman/swaggerui"
-
-	"github.com/gorilla/sessions"
-
-	"github.com/jiaozifs/jiaozifs/models"
-
-	"net/url"
-
 	"github.com/getkin/kin-openapi/openapi3filter"
 	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/sessions"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/auth"
+	"github.com/jiaozifs/jiaozifs/auth/crypt"
 	"github.com/jiaozifs/jiaozifs/config"
+	"github.com/jiaozifs/jiaozifs/models"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
+	"github.com/rs/cors"
 	"go.uber.org/fx"
 )
 

api/custom_response.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 
 	"github.com/jiaozifs/jiaozifs/auth"
-
 	"github.com/jiaozifs/jiaozifs/models"
 )
 

api/jiaozifs.gen.go

@@ -131,7 +131,7 @@ components:
           type: string
     RefType:
       type: string
-      enum: ["branch", "wip","tag", "test"]
+      enum: ["branch", "wip","tag", "commit"]
     Branch:
       type: object
       required:
@@ -185,6 +185,10 @@ components:
           type: string
         Name:
           type: string
+        BlockStoreConfig:
+          description: block storage config url encoded json
+          type: string
+
     UpdateRepository:
       type: object
       properties:
@@ -492,7 +496,6 @@ components:
       type: object
       additionalProperties:
         type: string
-
     ObjectStats:
       type: object
       required:
@@ -520,7 +523,6 @@ components:
         content_type:
           type: string
           description: Object media type
-
     ObjectStatsList:
       type: object
       required:
@@ -533,7 +535,93 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/ObjectStats"
-
+    BlockStoreConfig:
+      type: object
+      properties:
+        Type:
+          type: string
+          description: type of support storage type
+          enum: [ "local", "gs", "azure", "s3" ]
+        DefaultNamespacePrefix:
+          type: string
+        Local:
+          type: object
+          required:
+            - Path
+          properties:
+            Path:
+              type: string
+        Azure:
+          type: object
+          required:
+            - StorageAccount
+            - StorageAccessKey
+            - TryTimeout
+          properties:
+            StorageAccessKey:
+              type: string
+            StorageAccount:
+              type: string
+            TryTimeout:
+              type: integer
+              format: int64
+        GS:
+          type: object
+          required:
+            - CredentialsJSON
+            - S3Endpoint
+          properties:
+            CredentialsJSON:
+              type: string
+            S3Endpoint:
+              type: string
+        S3:
+          type: object
+          required:
+            - Credentials
+            - DiscoverBucketRegion
+            - Region
+            - Endpoint
+          properties:
+            Credentials:
+              $ref: '#/components/schemas/Credential'
+            WebIdentity:
+              $ref: '#/components/schemas/WebIdentity'
+            DiscoverBucketRegion:
+              type: boolean
+            Endpoint:
+              type: string
+            ForcePathStyle:
+              type: boolean
+            Region:
+              type: string
+    WebIdentity:
+      properties:
+        SessionDuration:
+          type: integer
+          format: int64
+        SessionExpiryWindow:
+          type: integer
+          format: int64
+    S3AuthInfo:
+      type: object
+      description: S3AuthInfo holds S3-style authentication.
+      properties:
+        Credentials:
+          $ref: '#/components/schemas/Credential'
+        CredentialsFile:
+          type: string
+    Credential:
+      type: object
+      properties:
+        AccessKeyID:
+          $ref: '#/components/schemas/SecureString'
+        SecretAccessKey:
+          $ref: '#/components/schemas/SecureString'
+        SessionToken:
+          $ref: '#/components/schemas/SecureString'
+    SecureString:
+      type: string
     Pagination:
       type: object
       required:
@@ -556,7 +644,6 @@ components:
           type: integer
           minimum: 0
           description: Maximal number of entries per page
-
     Error:
       type: object
       required:
@@ -1015,7 +1102,7 @@ paths:
         403:
           description: Forbidden
 
-  /repos/{owner}/{repository}/contents/:
+  /repos/{owner}/{repository}/contents:
     parameters:
       - in: path
         name: owner