auth_command: change to a bool response and setting from apply.

The function applies as I would expect but I believe it could be refactored to be cleaner. Additional questions...can be proto & raft requests be cleaned up.
etcd-io · Jan 19, 2020 · 2ce580e · 2ce580e
1 parent a52762e
commit 2ce580e
Show file tree

Hide file tree

Showing 6 changed files with 296 additions and 315 deletions.
diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md
@@ -251,7 +251,7 @@ Empty field.
 
 | Field | Description | Type |
 | ----- | ----------- | ---- |
-| header |  | ResponseHeader |
+| status |  | bool |
 
 
 

diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json
@@ -1479,8 +1479,9 @@
     "etcdserverpbAuthStatusResponse": {
       "type": "object",
       "properties": {
-        "header": {
-          "$ref": "#/definitions/etcdserverpbResponseHeader"
+        "status": {
+          "type": "boolean",
+          "format": "boolean"
         }
       }
     },

diff --git a/auth/store.go b/auth/store.go
@@ -286,13 +286,7 @@ func (as *authStore) AuthDisable() {
 }
 
 func (as *authStore) AuthStatus() bool {
-	as.enabledMu.Lock()
-	defer as.enabledMu.Unlock()
-	if as.IsAuthEnabled() {
-		return true
-	}
-
-	return false
+	return as.IsAuthEnabled()
 }
 
 func (as *authStore) Close() error {

diff --git a/etcdserver/apply.go b/etcdserver/apply.go
@@ -743,8 +743,8 @@ func (a *applierV3backend) AuthDisable() (*pb.AuthDisableResponse, error) {
 }
 
 func (a *applierV3backend) AuthStatus() (*pb.AuthStatusResponse, error) {
-	a.s.AuthStore().AuthStatus()
-	return &pb.AuthStatusResponse{Header: newHeader(a.s)}, nil
+	status := a.s.AuthStore().AuthStatus()
+	return &pb.AuthStatusResponse{status}, nil
 }
 
 func (a *applierV3backend) Authenticate(r *pb.InternalAuthenticateRequest) (*pb.AuthenticateResponse, error) {