From 97c57f05ee7e8f7720e613dc0e6b1409ce589728 Mon Sep 17 00:00:00 2001
From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Wed, 16 Oct 2019 13:38:10 +0200
Subject: [PATCH] rgw: rename ACL & policy IsPublic to is_public

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---
 src/rgw/rgw_acl.cc        | 2 +-
 src/rgw/rgw_acl.h         | 2 +-
 src/rgw/rgw_iam_policy.cc | 2 +-
 src/rgw/rgw_iam_policy.h  | 2 +-
 src/rgw/rgw_op.cc         | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc
index ff27a7ae676..e1d1ecb442b 100644
--- a/src/rgw/rgw_acl.cc
+++ b/src/rgw/rgw_acl.cc
@@ -188,7 +188,7 @@ bool RGWAccessControlPolicy::verify_permission(const DoutPrefixProvider* dpp,
 }
 
 
-bool RGWAccessControlPolicy::IsPublic() const
+bool RGWAccessControlPolicy::is_public() const
 {
 
   static constexpr auto public_groups = {ACL_GROUP_ALL_USERS,
diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h
index 278e8b4cbe9..aeb30e2f99c 100644
--- a/src/rgw/rgw_acl.h
+++ b/src/rgw/rgw_acl.h
@@ -465,7 +465,7 @@ public:
   }
 
   virtual bool compare_group_name(string& id, ACLGroupTypeEnum group) { return false; }
-  bool IsPublic() const;
+  bool is_public() const;
 };
 WRITE_CLASS_ENCODER(RGWAccessControlPolicy)
 
diff --git a/src/rgw/rgw_iam_policy.cc b/src/rgw/rgw_iam_policy.cc
index 72c4f4ab6d5..7325ec0854b 100644
--- a/src/rgw/rgw_iam_policy.cc
+++ b/src/rgw/rgw_iam_policy.cc
@@ -1458,7 +1458,7 @@ struct IsPublicStatement
 };
 
 
-bool IsPublic(const Policy& p)
+bool is_public(const Policy& p)
 {
   return std::any_of(p.statements.begin(), p.statements.end(), IsPublicStatement());
 }
diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
index 78f363a145b..d66fd48dc9e 100644
--- a/src/rgw/rgw_iam_policy.h
+++ b/src/rgw/rgw_iam_policy.h
@@ -494,7 +494,7 @@ struct Policy {
 };
 
 std::ostream& operator <<(ostream& m, const Policy& p);
-bool IsPublic(const Policy& p);
+bool is_public(const Policy& p);
 
 }
 }
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 6509d6b0eaa..ae535e2f3de 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5539,7 +5539,7 @@ void RGWPutACLs::execute()
 
   if (s->bucket_access_conf &&
       s->bucket_access_conf->block_public_acls() &&
-      new_policy.IsPublic()) {
+      new_policy.is_public()) {
     op_ret = -EACCES;
     return;
   }
@@ -7696,7 +7696,7 @@ void RGWPutBucketPolicy::execute()
     auto attrs = s->bucket_attrs;
     if (s->bucket_access_conf &&
         s->bucket_access_conf->block_public_policy() &&
-        rgw::IAM::IsPublic(p)) {
+        rgw::IAM::is_public(p)) {
       op_ret = -EACCES;
       return;
     }
@@ -8113,7 +8113,7 @@ int RGWGetBucketPolicyStatus::verify_permission()
 
 void RGWGetBucketPolicyStatus::execute()
 {
-  isPublic = (s->iam_policy && rgw::IAM::IsPublic(*s->iam_policy)) || s->bucket_acl->IsPublic();
+  isPublic = (s->iam_policy && rgw::IAM::is_public(*s->iam_policy)) || s->bucket_acl->is_public();
 }
 
 int RGWPutBucketPublicAccessBlock::verify_permission()
-- 
2.39.5