Rename pkg/{tagging,lifecycle} to pkg/bucket sub-directory (#8892)

Rename to allow for more such features to come in a more proper hierarchical manner.
2025-11-10 05:59:43 -05:00 · 2020-01-28 03:42:34 +05:30
parent 4cb6ebcfa2
commit 0cbebf0f57
109 changed files with 102 additions and 101 deletions
--- a/pkg/bucket/lifecycle/and.go
+++ b/pkg/bucket/lifecycle/and.go
--- a/pkg/bucket/lifecycle/expiration.go
+++ b/pkg/bucket/lifecycle/expiration.go
--- a/pkg/bucket/lifecycle/expiration_test.go
+++ b/pkg/bucket/lifecycle/expiration_test.go
--- a/pkg/bucket/lifecycle/filter.go
+++ b/pkg/bucket/lifecycle/filter.go
--- a/pkg/bucket/lifecycle/filter_test.go
+++ b/pkg/bucket/lifecycle/filter_test.go
--- a/pkg/bucket/lifecycle/lifecycle.go
+++ b/pkg/bucket/lifecycle/lifecycle.go
--- a/pkg/bucket/lifecycle/lifecycle_test.go
+++ b/pkg/bucket/lifecycle/lifecycle_test.go
--- a/pkg/bucket/lifecycle/noncurrentversion.go
+++ b/pkg/bucket/lifecycle/noncurrentversion.go
--- a/pkg/bucket/lifecycle/rule.go
+++ b/pkg/bucket/lifecycle/rule.go
--- a/pkg/bucket/lifecycle/rule_test.go
+++ b/pkg/bucket/lifecycle/rule_test.go
--- a/pkg/bucket/lifecycle/tag.go
+++ b/pkg/bucket/lifecycle/tag.go
--- a/pkg/bucket/lifecycle/transition.go
+++ b/pkg/bucket/lifecycle/transition.go
--- a/pkg/bucket/object/lock/lock.go
+++ b/pkg/bucket/object/lock/lock.go
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package objectlock
+package lock

 import (
 	"context"
@@ -292,7 +292,7 @@ func ParseObjectLockConfig(reader io.Reader) (*Config, error) {
 	return &config, nil
 }

-// NewObjectLockConfig returns a initialized objectlock.Config struct
+// NewObjectLockConfig returns a initialized lock.Config struct
 func NewObjectLockConfig() *Config {
 	return &Config{
 		ObjectLockEnabled: "Enabled",
--- a/pkg/bucket/object/lock/lock_test.go
+++ b/pkg/bucket/object/lock/lock_test.go
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package objectlock
+package lock

 import (
 	"encoding/xml"
--- a/pkg/bucket/object/tagging/error.go
+++ b/pkg/bucket/object/tagging/error.go
--- a/pkg/bucket/object/tagging/tag.go
+++ b/pkg/bucket/object/tagging/tag.go
--- a/pkg/bucket/object/tagging/tagging.go
+++ b/pkg/bucket/object/tagging/tagging.go
--- a/pkg/bucket/object/tagging/tagset.go
+++ b/pkg/bucket/object/tagging/tagset.go
--- a/pkg/bucket/policy/action.go
+++ b/pkg/bucket/policy/action.go
@@ -19,7 +19,7 @@ package policy
 import (
 	"encoding/json"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 // Action - policy action.
--- a/pkg/bucket/policy/action_test.go
+++ b/pkg/bucket/policy/action_test.go
--- a/pkg/bucket/policy/actionset.go
+++ b/pkg/bucket/policy/actionset.go
--- a/pkg/bucket/policy/actionset_test.go
+++ b/pkg/bucket/policy/actionset_test.go
--- a/pkg/bucket/policy/condition/binaryequalsfunc.go
+++ b/pkg/bucket/policy/condition/binaryequalsfunc.go
--- a/pkg/bucket/policy/condition/binaryequalsfunc_test.go
+++ b/pkg/bucket/policy/condition/binaryequalsfunc_test.go
--- a/pkg/bucket/policy/condition/boolfunc.go
+++ b/pkg/bucket/policy/condition/boolfunc.go
--- a/pkg/bucket/policy/condition/boolfunc_test.go
+++ b/pkg/bucket/policy/condition/boolfunc_test.go
--- a/pkg/bucket/policy/condition/func.go
+++ b/pkg/bucket/policy/condition/func.go
--- a/pkg/bucket/policy/condition/func_test.go
+++ b/pkg/bucket/policy/condition/func_test.go
--- a/pkg/bucket/policy/condition/ipaddressfunc.go
+++ b/pkg/bucket/policy/condition/ipaddressfunc.go
--- a/pkg/bucket/policy/condition/ipaddressfunc_test.go
+++ b/pkg/bucket/policy/condition/ipaddressfunc_test.go
--- a/pkg/bucket/policy/condition/key.go
+++ b/pkg/bucket/policy/condition/key.go
--- a/pkg/bucket/policy/condition/key_test.go
+++ b/pkg/bucket/policy/condition/key_test.go
--- a/pkg/bucket/policy/condition/name.go
+++ b/pkg/bucket/policy/condition/name.go
--- a/pkg/bucket/policy/condition/name_test.go
+++ b/pkg/bucket/policy/condition/name_test.go
--- a/pkg/bucket/policy/condition/nullfunc.go
+++ b/pkg/bucket/policy/condition/nullfunc.go
--- a/pkg/bucket/policy/condition/nullfunc_test.go
+++ b/pkg/bucket/policy/condition/nullfunc_test.go
--- a/pkg/bucket/policy/condition/stringequalsfunc.go
+++ b/pkg/bucket/policy/condition/stringequalsfunc.go
--- a/pkg/bucket/policy/condition/stringequalsfunc_test.go
+++ b/pkg/bucket/policy/condition/stringequalsfunc_test.go
--- a/pkg/bucket/policy/condition/stringequalsignorecasefunc.go
+++ b/pkg/bucket/policy/condition/stringequalsignorecasefunc.go
--- a/pkg/bucket/policy/condition/stringequalsignorecasefunc_test.go
+++ b/pkg/bucket/policy/condition/stringequalsignorecasefunc_test.go
--- a/pkg/bucket/policy/condition/stringlikefunc.go
+++ b/pkg/bucket/policy/condition/stringlikefunc.go
--- a/pkg/bucket/policy/condition/stringlikefunc_test.go
+++ b/pkg/bucket/policy/condition/stringlikefunc_test.go
--- a/pkg/bucket/policy/condition/value.go
+++ b/pkg/bucket/policy/condition/value.go
--- a/pkg/bucket/policy/condition/value_test.go
+++ b/pkg/bucket/policy/condition/value_test.go
--- a/pkg/bucket/policy/condition/valueset.go
+++ b/pkg/bucket/policy/condition/valueset.go
--- a/pkg/bucket/policy/condition/valueset_test.go
+++ b/pkg/bucket/policy/condition/valueset_test.go
--- a/pkg/bucket/policy/effect.go
+++ b/pkg/bucket/policy/effect.go
--- a/pkg/bucket/policy/effect_test.go
+++ b/pkg/bucket/policy/effect_test.go
--- a/pkg/bucket/policy/error.go
+++ b/pkg/bucket/policy/error.go
--- a/pkg/bucket/policy/id.go
+++ b/pkg/bucket/policy/id.go
--- a/pkg/bucket/policy/id_test.go
+++ b/pkg/bucket/policy/id_test.go
--- a/pkg/bucket/policy/policy.go
+++ b/pkg/bucket/policy/policy.go
--- a/pkg/bucket/policy/policy_test.go
+++ b/pkg/bucket/policy/policy_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 func TestPolicyIsAllowed(t *testing.T) {
--- a/pkg/bucket/policy/principal.go
+++ b/pkg/bucket/policy/principal.go
--- a/pkg/bucket/policy/principal_test.go
+++ b/pkg/bucket/policy/principal_test.go
--- a/pkg/bucket/policy/resource.go
+++ b/pkg/bucket/policy/resource.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"strings"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 	"github.com/minio/minio/pkg/wildcard"
 )

--- a/pkg/bucket/policy/resource_test.go
+++ b/pkg/bucket/policy/resource_test.go
--- a/pkg/bucket/policy/resourceset.go
+++ b/pkg/bucket/policy/resourceset.go
--- a/pkg/bucket/policy/resourceset_test.go
+++ b/pkg/bucket/policy/resourceset_test.go
--- a/pkg/bucket/policy/statement.go
+++ b/pkg/bucket/policy/statement.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"strings"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 // Statement - policy statement.
--- a/pkg/bucket/policy/statement_test.go
+++ b/pkg/bucket/policy/statement_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 func TestStatementIsAllowed(t *testing.T) {
--- a/pkg/iam/policy/action.go
+++ b/pkg/iam/policy/action.go
@@ -19,7 +19,7 @@ package iampolicy
 import (
 	"encoding/json"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 	"github.com/minio/minio/pkg/wildcard"
 )

--- a/pkg/iam/policy/admin-action.go
+++ b/pkg/iam/policy/admin-action.go
@@ -17,7 +17,7 @@
 package iampolicy

 import (
-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 // AdminAction - admin policy action.
--- a/pkg/iam/policy/constants.go
+++ b/pkg/iam/policy/constants.go
@@ -17,7 +17,7 @@
 package iampolicy

 import (
-	"github.com/minio/minio/pkg/policy"
+	"github.com/minio/minio/pkg/bucket/policy"
 )

 // Policy claim constants
--- a/pkg/iam/policy/policy.go
+++ b/pkg/iam/policy/policy.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"strings"

-	"github.com/minio/minio/pkg/policy"
+	"github.com/minio/minio/pkg/bucket/policy"
 )

 // DefaultVersion - default policy version as per AWS S3 specification.
--- a/pkg/iam/policy/policy_test.go
+++ b/pkg/iam/policy/policy_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"

-	"github.com/minio/minio/pkg/policy"
-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 func TestPolicyIsAllowed(t *testing.T) {
--- a/pkg/iam/policy/resource.go
+++ b/pkg/iam/policy/resource.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"strings"

-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 	"github.com/minio/minio/pkg/wildcard"
 )

--- a/pkg/iam/policy/statement.go
+++ b/pkg/iam/policy/statement.go
@@ -20,8 +20,8 @@ import (
 	"encoding/json"
 	"strings"

-	"github.com/minio/minio/pkg/policy"
-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 // Statement - iam policy statement.
--- a/pkg/iam/policy/statement_test.go
+++ b/pkg/iam/policy/statement_test.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"testing"

-	"github.com/minio/minio/pkg/policy"
-	"github.com/minio/minio/pkg/policy/condition"
+	"github.com/minio/minio/pkg/bucket/policy"
+	"github.com/minio/minio/pkg/bucket/policy/condition"
 )

 func TestStatementIsAllowed(t *testing.T) {