Add response type to user/group policy association (#198)

Bump up to v3 Bonus - Fix content-type in policy attach/detach API
minio · Jun 14, 2023 · 0d0990c · 0d0990c
1 parent 420204c
commit 0d0990c
Show file tree

Hide file tree

Showing 30 changed files with 53 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ package main
 import (
     "fmt"
 
-    "github.com/minio/madmin-go/v2"
+    "github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/api-error-response.go b/api-error-response.go
@@ -113,7 +113,7 @@ func httpRespToErrorResponse(resp *http.Response) error {
 //
 // For example:
 //
-//	import admin "github.com/minio/madmin-go/v2"
+//	import admin "github.com/minio/madmin-go/v3"
 //	...
 //	...
 //	ss, err := adm.ServiceStatus(...)

diff --git a/api_test.go b/api_test.go
@@ -23,7 +23,7 @@ package madmin_test
 import (
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func TestMinioAdminClient(t *testing.T) {

diff --git a/examples/accounting-info.go b/examples/accounting-info.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/alive.go b/examples/alive.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/bucket-bandwidth.go b/examples/bucket-bandwidth.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/bucket-metadata.go b/examples/bucket-metadata.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/bucket-quota.go b/examples/bucket-quota.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/bucket-target.go b/examples/bucket-target.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/cluster-health.go b/examples/cluster-health.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/create-job.go b/examples/create-job.go
@@ -26,7 +26,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/data-usage-info.go b/examples/data-usage-info.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/force-unlock.go b/examples/force-unlock.go
@@ -26,7 +26,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/heal-manual.go b/examples/heal-manual.go
@@ -29,7 +29,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/heal-status.go b/examples/heal-status.go
@@ -26,7 +26,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/iam-migrate.go b/examples/iam-migrate.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/kms-status.go b/examples/kms-status.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/list-pools.go b/examples/list-pools.go
@@ -27,7 +27,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/perf-object.go b/examples/perf-object.go
@@ -26,7 +26,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/profiling.go b/examples/profiling.go
@@ -28,7 +28,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/replicate-diff.go b/examples/replicate-diff.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/server-info.go b/examples/server-info.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/service-account.go b/examples/service-account.go
@@ -29,7 +29,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/service-restart.go b/examples/service-restart.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/service-trace.go b/examples/service-trace.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/storage-info.go b/examples/storage-info.go
@@ -25,7 +25,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/examples/top-locks.go b/examples/top-locks.go
@@ -26,7 +26,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/minio/madmin-go/v2
+module github.com/minio/madmin-go/v3
 
 go 1.17
 

diff --git a/health.go b/health.go
@@ -36,8 +36,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/minio/madmin-go/v2/cgroup"
-	"github.com/minio/madmin-go/v2/kernel"
+	"github.com/minio/madmin-go/v3/cgroup"
+	"github.com/minio/madmin-go/v3/kernel"
 	"github.com/prometheus/procfs"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"

diff --git a/policy-commands.go b/policy-commands.go
@@ -226,53 +226,62 @@ func (adm *AdminClient) SetPolicy(ctx context.Context, policyName, entityName st
 	return nil
 }
 
-func (adm *AdminClient) attachOrDetachPolicyBuiltin(ctx context.Context, isAttach bool, r PolicyAssociationReq) error {
+func (adm *AdminClient) attachOrDetachPolicyBuiltin(ctx context.Context, isAttach bool,
+	r PolicyAssociationReq,
+) (PolicyAssociationResp, error) {
 	err := r.IsValid()
 	if err != nil {
-		return err
+		return PolicyAssociationResp{}, err
 	}
 
 	plainBytes, err := json.Marshal(r)
 	if err != nil {
-		return err
+		return PolicyAssociationResp{}, err
 	}
 
 	encBytes, err := EncryptData(adm.getSecretKey(), plainBytes)
 	if err != nil {
-		return err
+		return PolicyAssociationResp{}, err
 	}
 
 	suffix := "detach"
 	if isAttach {
 		suffix = "attach"
 	}
-
+	h := make(http.Header, 1)
+	h.Add("Content-Type", "application/octet-stream")
 	reqData := requestData{
-		relPath: adminAPIPrefix + "/idp/builtin/policy/" + suffix,
-		content: encBytes,
+		customHeaders: h,
+		relPath:       adminAPIPrefix + "/idp/builtin/policy/" + suffix,
+		content:       encBytes,
 	}
 
 	resp, err := adm.executeMethod(ctx, http.MethodPost, reqData)
 	defer closeResponse(resp)
 	if err != nil {
-		return err
+		return PolicyAssociationResp{}, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return PolicyAssociationResp{}, httpRespToErrorResponse(resp)
 	}
 
-	if (isAttach && resp.StatusCode != http.StatusCreated) ||
-		(!isAttach && resp.StatusCode != http.StatusNoContent) {
-		return httpRespToErrorResponse(resp)
+	content, err := DecryptData(adm.getSecretKey(), resp.Body)
+	if err != nil {
+		return PolicyAssociationResp{}, err
 	}
 
-	return nil
+	rsp := PolicyAssociationResp{}
+	err = json.Unmarshal(content, &rsp)
+	return rsp, err
 }
 
 // AttachPolicy - attach policies to a user or group.
-func (adm *AdminClient) AttachPolicy(ctx context.Context, r PolicyAssociationReq) error {
+func (adm *AdminClient) AttachPolicy(ctx context.Context, r PolicyAssociationReq) (PolicyAssociationResp, error) {
 	return adm.attachOrDetachPolicyBuiltin(ctx, true, r)
 }
 
 // DetachPolicy - detach policies from a user or group.
-func (adm *AdminClient) DetachPolicy(ctx context.Context, r PolicyAssociationReq) error {
+func (adm *AdminClient) DetachPolicy(ctx context.Context, r PolicyAssociationReq) (PolicyAssociationResp, error) {
 	return adm.attachOrDetachPolicyBuiltin(ctx, false, r)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ import ( @@
     	"fmt"
     	"log"
-    	"github.com/minio/madmin-go/v2"
+    	"github.com/minio/madmin-go/v3"
     )
     func main() {
@@ Expand Down @@