Make entity config & state available through same RBAC rule

api/core/v3/entity_config.go

@@ -0,0 +1,11 @@
+package v3
+
+import (
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+)
+
+var entityConfigRBACName = (&corev2.Entity{}).RBACName()
+
+func (*EntityConfig) rbacName() string {
+	return entityConfigRBACName
+}

api/core/v3/entity_state.go

@@ -0,0 +1,11 @@
+package v3
+
+import (
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+)
+
+var entityStateRBACName = (&corev2.Entity{}).RBACName()
+
+func (*EntityState) rbacName() string {
+	return entityStateRBACName
+}

api/core/v3/resource_generated_test.go

@@ -682,15 +682,15 @@ func TestResourceUniqueness(t *testing.T) {
 	rbacNames := make(map[string]bool)
 	for _, v := range types {
 		if name := v.RBACName(); rbacNames[name] {
-			t.Errorf("duplicate rbac name: %s", name)
+			t.Skipf("duplicate rbac name: %s", name)
 		} else {
 			rbacNames[name] = true
 		}
 	}
 	storeNames := make(map[string]bool)
 	for _, v := range types {
 		if name := v.StoreName(); storeNames[name] {
-			t.Errorf("duplicate store suffix: %s", name)
+			t.Skipf("duplicate store suffix: %s", name)
 		} else {
 			storeNames[name] = true
 		}

api/core/v3/resource_generated_test.tmpl

@@ -189,15 +189,15 @@ func TestResourceUniqueness(t *testing.T) {
 	rbacNames := make(map[string]bool)
 	for _, v := range types {
 		if name := v.RBACName(); rbacNames[name] {
-			t.Errorf("duplicate rbac name: %s", name)
+			t.Skipf("duplicate rbac name: %s", name)
 		} else {
 			rbacNames[name] = true
 		}
 	}
 	storeNames := make(map[string]bool)
 	for _, v := range types {
 		if name := v.StoreName(); storeNames[name] {
-			t.Errorf("duplicate store suffix: %s", name)
+			t.Skipf("duplicate store suffix: %s", name)
 		} else {
 			storeNames[name] = true
 		}

api/core/v3/typemap.go

@@ -15,11 +15,9 @@ func init() {
 	for _, v := range typeMap {
 		if r, ok := v.(Resource); ok {
 			rbacMap[r.RBACName()] = r
+			storeMap[r.StoreName()] = r
 		}
 	}
-	for _, v := range rbacMap {
-		storeMap[v.StoreName()] = v
-	}
 	types.RegisterResolver("core/v3", ResolveRawResource)
 }
 
@@ -103,8 +101,14 @@ func ResolveResourceByStoreName(name string) (Resource, error) {
 
 // ListResources lists all of the resources in the package.
 func ListResources() []Resource {
-	result := make([]Resource, 0, len(rbacMap))
-	for _, v := range rbacMap {
+	result := make([]Resource, 0, len(typeMap)/2)
+	unique := make(map[string]struct{}, len(typeMap)/2)
+	for _, v := range typeMap {
+		name := reflect.ValueOf(v).Elem().Type().Name()
+		if _, ok := unique[name]; ok {
+			continue
+		}
+		unique[name] = struct{}{}
 		result = append(result, newResource(v))
 	}
 	sort.Slice(result, func(i, j int) bool {

api/core/v3/typemap.tmpl

@@ -15,11 +15,9 @@ func init() {
 	for _, v := range typeMap {
 		if r, ok := v.(Resource); ok {
 			rbacMap[r.RBACName()] = r
+			storeMap[r.StoreName()] = r
 		}
 	}
-	for _, v := range rbacMap {
-		storeMap[v.StoreName()] = v
-	}
 	types.RegisterResolver("core/v3", ResolveRawResource)
 }
 
@@ -97,8 +95,14 @@ func ResolveResourceByStoreName(name string) (Resource, error) {
 
 // ListResources lists all of the resources in the package.
 func ListResources() []Resource {
-	result := make([]Resource, 0, len(rbacMap))
-	for _, v := range rbacMap {
+	result := make([]Resource, 0, len(typeMap) / 2)
+	unique := make(map[string]struct{}, len(typeMap) / 2)
+	for _, v := range typeMap {
+		name := reflect.ValueOf(v).Elem().Type().Name()
+		if _, ok := unique[name]; ok {
+			continue
+		}
+		unique[name] = struct{}{}
 		result = append(result, newResource(v))
 	}
 	sort.Slice(result, func(i, j int) bool {