[GraphQL] List entity config & state resources

api/core/v3/entity_config.go

@@ -0,0 +1,33 @@
+package v3
+
+import (
+	"strconv"
+	"strings"
+
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+)
+
+var entityConfigRBACName = (&corev2.Entity{}).RBACName()
+
+func (e *EntityConfig) rbacName() string {
+	return entityConfigRBACName
+}
+
+func (e *EntityConfig) Fields() map[string]string {
+	fields := map[string]string{
+		"entity_config.name":          e.Metadata.Name,
+		"entity_config.namespace":     e.Metadata.Namespace,
+		"entity_config.deregister":    strconv.FormatBool(e.Deregister),
+		"entity_config.entity_class":  e.EntityClass,
+		"entity_config.subscriptions": strings.Join(e.Subscriptions, ","),
+	}
+	MergeMapWithPrefix(fields, e.Metadata.Labels, "entity_config.labels.")
+	return fields
+}
+
+// MergeMapWithPrefix merges contents of one map into another using a prefix.
+func MergeMapWithPrefix(a map[string]string, b map[string]string, prefix string) {
+	for k, v := range b {
+		a[prefix+k] = v
+	}
+}

api/core/v3/entity_config_test.go

@@ -0,0 +1,60 @@
+package v3
+
+import (
+	"reflect"
+	"testing"
+
+	v2 "github.com/sensu/sensu-go/api/core/v2"
+)
+
+func TestEntityConfigFields(t *testing.T) {
+	tests := []struct {
+		name    string
+		args    Fielder
+		wantKey string
+		want    string
+	}{
+		{
+			name:    "exposes name",
+			args:    FixtureEntityConfig("my-agent"),
+			wantKey: "entity_config.name",
+			want:    "my-agent",
+		},
+		{
+			name:    "exposes deregister",
+			args:    &EntityConfig{Metadata: &v2.ObjectMeta{}, Deregister: true},
+			wantKey: "entity_config.deregister",
+			want:    "true",
+		},
+		{
+			name:    "exposes class",
+			args:    &EntityConfig{Metadata: &v2.ObjectMeta{}, EntityClass: "agent"},
+			wantKey: "entity_config.entity_class",
+			want:    "agent",
+		},
+		{
+			name:    "exposes subscriptions",
+			args:    &EntityConfig{Metadata: &v2.ObjectMeta{}, Subscriptions: []string{"www", "unix"}},
+			wantKey: "entity_config.subscriptions",
+			want:    "www,unix",
+		},
+		{
+			name: "exposes labels",
+			args: &EntityConfig{
+				Metadata: &v2.ObjectMeta{
+					Labels: map[string]string{"region": "philadelphia"},
+				},
+			},
+			wantKey: "entity_config.labels.region",
+			want:    "philadelphia",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := tt.args.Fields()
+			if !reflect.DeepEqual(got[tt.wantKey], tt.want) {
+				t.Errorf("EntityConfig.Fields() = got[%s] %v, want[%s] %v", tt.wantKey, got[tt.wantKey], tt.wantKey, tt.want)
+			}
+		})
+	}
+}

api/core/v3/entity_state.go

@@ -0,0 +1,19 @@
+package v3
+
+import (
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+)
+
+var entityStateRBACName = (&corev2.Entity{}).RBACName()
+
+func (*EntityState) rbacName() string {
+	return entityStateRBACName
+}
+
+func (e *EntityState) Fields() map[string]string {
+	fields := map[string]string{
+		"entity_state.name":      e.Metadata.Name,
+		"entity_state.namespace": e.Metadata.Namespace,
+	}
+	return fields
+}

api/core/v3/entity_state_test.go

@@ -0,0 +1,36 @@
+package v3
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestEntityStateFields(t *testing.T) {
+	tests := []struct {
+		name    string
+		args    Fielder
+		wantKey string
+		want    string
+	}{
+		{
+			name:    "exposes name",
+			args:    FixtureEntityState("my-agent"),
+			wantKey: "entity_state.name",
+			want:    "my-agent",
+		},
+		{
+			name:    "exposes deregister",
+			args:    FixtureEntityState("my-agent"),
+			wantKey: "entity_state.namespace",
+			want:    "default",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := tt.args.Fields()
+			if !reflect.DeepEqual(got[tt.wantKey], tt.want) {
+				t.Errorf("EntityState.Fields() = got[%s] %v, want[%s] %v", tt.wantKey, got[tt.wantKey], tt.wantKey, tt.want)
+			}
+		})
+	}
+}

api/core/v3/fielder.go

@@ -0,0 +1,7 @@
+package v3
+
+// Fielder includes a set of fields that represent a resource.
+type Fielder interface {
+	// Fields returns a set of fields that represent the resource.
+	Fields() map[string]string
+}

api/core/v3/resource_generated_test.go

@@ -487,15 +487,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

@@ -179,15 +179,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)
 }
 
@@ -101,8 +99,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 {

backend/apid/graphql/corev3.go

@@ -0,0 +1,134 @@
+package graphql
+
+import (
+	"context"
+
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+	corev3 "github.com/sensu/sensu-go/api/core/v3"
+	"github.com/sensu/sensu-go/backend/apid/graphql/globalid"
+	"github.com/sensu/sensu-go/backend/apid/graphql/schema"
+	util_api "github.com/sensu/sensu-go/backend/apid/graphql/util/api"
+	"github.com/sensu/sensu-go/backend/store"
+	"github.com/sensu/sensu-go/graphql"
+)
+
+//
+// Constants
+//
+
+var (
+	// EntityCoreV3ConfigGlobalID can be used to produce a global id
+	GlobalIDCoreV3EntityConfig = globalid.NewGenericTranslator(&corev3.EntityConfig{}, "")
+
+	// EntityCoreV3StateGlobalID can be used to produce a global id
+	GlobalIDCoreV3EntityState = globalid.NewGenericTranslator(&corev3.EntityState{}, "")
+)
+
+//
+// EntityConfig
+//
+
+type corev3EntityConfigExtImpl struct {
+	schema.CoreV3EntityConfigAliases
+	client       GenericClient
+	entityClient EntityClient
+}
+
+// ID implements response to request for 'id' field.
+func (i *corev3EntityConfigExtImpl) ID(p graphql.ResolveParams) (string, error) {
+	return GlobalIDCoreV3EntityConfig.EncodeToString(p.Context, p.Source), nil
+}
+
+// ToJSON implements response to request for 'toJSON' field.
+func (i *corev3EntityConfigExtImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
+	return util_api.WrapResource(p.Source), nil
+}
+
+// State implements response to request for 'state' field.
+func (i *corev3EntityConfigExtImpl) State(p graphql.ResolveParams) (interface{}, error) {
+	obj := p.Source.(*corev3.EntityConfig)
+	val := corev3.EntityState{}
+	return getEntityComponent(p.Context, i.client, obj.Metadata, &val)
+}
+
+// ToCoreV2Entity implements response to request for 'toCoreV2Entity' field.
+func (i *corev3EntityConfigExtImpl) ToCoreV2Entity(p graphql.ResolveParams) (interface{}, error) {
+	obj := p.Source.(interface{ GetMetadata() *corev2.ObjectMeta })
+	ctx := contextWithNamespace(p.Context, obj.GetMetadata().Namespace)
+	return i.entityClient.FetchEntity(ctx, obj.GetMetadata().Name)
+}
+
+type corev3EntityConfigImpl struct {
+	schema.CoreV3EntityConfigAliases
+}
+
+// IsTypeOf is used to determine if a given value is associated with the type
+func (*corev3EntityConfigImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
+	_, ok := s.(*corev3.EntityConfig)
+	return ok
+}
+
+//
+// EntityState
+//
+
+type corev3EntityStateExtImpl struct {
+	schema.CoreV3EntityStateAliases
+	client       GenericClient
+	entityClient EntityClient
+}
+
+// ID implements response to request for 'id' field.
+func (*corev3EntityStateExtImpl) ID(p graphql.ResolveParams) (string, error) {
+	return GlobalIDCoreV3EntityState.EncodeToString(p.Context, p.Source), nil
+}
+
+// ToJSON implements response to request for 'toJSON' field.
+func (*corev3EntityStateExtImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
+	return util_api.WrapResource(p.Source), nil
+}
+
+// State implements response to request for 'state' field.
+func (i *corev3EntityStateExtImpl) Config(p graphql.ResolveParams) (interface{}, error) {
+	obj := p.Source.(*corev3.EntityState)
+	val := corev3.EntityConfig{}
+	return getEntityComponent(p.Context, i.client, obj.Metadata, &val)
+}
+
+// ToCoreV2Entity implements response to request for 'toCoreV2Entity' field.
+func (i *corev3EntityStateExtImpl) ToCoreV2Entity(p graphql.ResolveParams) (interface{}, error) {
+	obj := p.Source.(interface{ GetMetadata() *corev2.ObjectMeta })
+	ctx := contextWithNamespace(p.Context, obj.GetMetadata().Namespace)
+	return i.entityClient.FetchEntity(ctx, obj.GetMetadata().Name)
+}
+
+func getEntityComponent(ctx context.Context, client GenericClient, meta *corev2.ObjectMeta, val corev3.Resource) (interface{}, error) {
+	wrapper := util_api.WrapResource(val)
+	err := client.SetTypeMeta(wrapper.TypeMeta)
+	if err != nil {
+		return nil, err
+	}
+	ctx = contextWithNamespace(ctx, meta.Namespace)
+	proxy := &corev3.V2ResourceProxy{Resource: val}
+	if err = client.Get(ctx, meta.Name, proxy); err == nil {
+		return proxy.Resource, err
+	} else if _, ok := err.(*store.ErrNotFound); ok {
+		return nil, nil
+	}
+	return nil, err
+}
+
+type corev3EntityStateImpl struct {
+	schema.CoreV3EntityStateAliases
+}
+
+// IsTypeOf is used to determine if a given value is associated with the type
+func (*corev3EntityStateImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
+	_, ok := s.(*corev3.EntityState)
+	return ok
+}
+
+func init() {
+	globalid.RegisterTranslator(GlobalIDCoreV3EntityConfig)
+	globalid.RegisterTranslator(GlobalIDCoreV3EntityState)
+}