Merge pull request #12 from rzrbld/future-release-1_1

Future release 1.1

openAPI/openapi_v3.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.0"
 info:
   description: "Adminio API"
-  version: "2.0.0"
+  version: "2.3.0"
   title: "Adminio API"
   contact:
     name: "rzrbld at github.com"
@@ -353,6 +353,126 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
+  /bucket/set-tags:
+    post:
+      summary: Set bucket tags
+      operationId: setBucketTags
+      tags:
+        - bucket
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                bucketName:
+                  type: string
+                  format: string
+                bucketTags:
+                  description: comma separated list of tags. e.g. `tag1=value1&tag2=value2`
+                  type: string
+                  format: string
+      responses:
+        '200':
+          description: Success
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Success"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /bucket/get-tags:
+    post:
+      summary: Get bucket tags
+      operationId: getBucketTags
+      tags:
+        - bucket
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                bucketName:
+                  type: string
+                  format: string
+      responses:
+        '200':
+          description: bucket tags
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/BucketTags"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /bucket/get-policy:
+    post:
+      summary: Get bucket policy
+      operationId: getBucketPolicy
+      tags:
+        - bucket
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                bucketName:
+                  type: string
+                  format: string
+      responses:
+        '200':
+          description: bucket policy
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/BucketPolicy"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /bucket/set-policy:
+    post:
+      summary: Set bucket policy
+      operationId: setBucketPolicy
+      tags:
+        - bucket
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                bucketName:
+                  type: string
+                  format: string
+                bucketPolicy:
+                  description: predefined values none, upload, download, public or custom json string
+                  type: string
+                  format: string
+      responses:
+        '200':
+          description: Success
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Success"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
   /users/list:
     get:
       summary: List all users
@@ -1029,6 +1149,15 @@ components:
          type: integer
        quotatype:
          type: string
+    BucketTags:
+     type: object
+    BucketPolicy:
+     type: object
+     properties:
+       policy:
+         type: string
+       name:
+         type: string
     BucketInfo:
      type: object
      properties:
@@ -1051,6 +1180,10 @@ components:
            $ref: "#/components/schemas/BucketInfo"
          quota:
            $ref: "#/components/schemas/BucketQuota"
+         tags:
+           $ref: "#/components/schemas/BucketTags"
+         policy:
+           type: string
     BucketLifecycle:
       type: string
     Error:

src/go.mod

@@ -16,42 +16,49 @@ require (
 	github.com/iris-contrib/jade v1.1.4 // indirect
 	github.com/iris-contrib/middleware/cors v0.0.0-20191219204441-78279b78a367
 	github.com/iris-contrib/middleware/prometheus v0.0.0-20191219204441-78279b78a367
+	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
-	github.com/kataras/golog v0.0.15 // indirect
+	github.com/kataras/golog v0.0.18 // indirect
 	github.com/kataras/iris/v12 v12.1.8
-	github.com/klauspost/compress v1.10.5 // indirect
+	github.com/klauspost/compress v1.10.10 // indirect
+	github.com/klauspost/cpuid v1.3.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/markbates/goth v1.64.0
-	github.com/mattn/go-colorable v0.1.6 // indirect
-	github.com/minio/minio v0.0.0-20200518183557-a3f41c70498c
-	github.com/minio/minio-go/v6 v6.0.55
+	github.com/markbates/goth v1.64.2
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.3 // indirect
+	github.com/minio/hdfs/v3 v3.0.1 // indirect
+	github.com/minio/lsync v1.0.1 // indirect
+	github.com/minio/minio v0.0.0-20200630183019-d2d1ebe0849b
+	github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec
 	github.com/montanaflynn/stats v0.6.3 // indirect
 	github.com/moul/http2curl v1.0.0 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/onsi/ginkgo v1.12.0 // indirect
-	github.com/onsi/gomega v1.10.0 // indirect
-	github.com/prometheus/client_golang v1.6.0
+	github.com/onsi/ginkgo v1.13.0 // indirect
+	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/common v0.10.0 // indirect
+	github.com/prometheus/procfs v0.1.3 // indirect
 	github.com/rzrbld/goth-provider-wso2 v0.0.0-20200321130802-e588ec0a9128
 	github.com/secure-io/sio-go v0.3.1 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/shirou/gopsutil v2.20.4+incompatible // indirect
+	github.com/shirou/gopsutil v2.20.6+incompatible // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/smartystreets/assertions v1.1.0 // indirect
+	github.com/smartystreets/assertions v1.1.1 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/valyala/fasthttp v1.12.0 // indirect
+	github.com/stretchr/testify v1.6.1 // indirect
+	github.com/valyala/fasthttp v1.14.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yudai/pp v2.0.1+incompatible // indirect
-	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect
-	golang.org/x/net v0.0.0-20200513185701-a91f0712d120 // indirect
-	golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 // indirect
+	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
+	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
+	golang.org/x/text v0.3.3 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/ini.v1 v1.56.0 // indirect
+	gopkg.in/ini.v1 v1.57.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 )