diff --git a/components/console-backend-service/Gopkg.lock b/components/console-backend-service/Gopkg.lock index 82b9976b1a69..70bcc1eacd0b 100644 --- a/components/console-backend-service/Gopkg.lock +++ b/components/console-backend-service/Gopkg.lock @@ -399,11 +399,11 @@ revision = "a7d7e2ee18c91208651008bd7d192568d09883f8" [[projects]] - digest = "1:76d6dcdd415f38b171f2a8f8e3f6727ac6f039fb5445024279c33b89bfa0c034" + digest = "1:99424f7a75003ed260a8c77aacbb22e330ec31937cfdefee5f894f0cf5a8fa5a" name = "github.com/kyma-project/rafter" packages = ["pkg/apis/rafter/v1beta1"] pruneopts = "NUT" - revision = "1b5e6fe41dabafd462de0cfce628184173ce01a3" + revision = "a0157e52e150b26f63c2ddc9f4e63c0cb7650ac7" [[projects]] digest = "1:730bb303c6e80807a43c37b546e06de0fa32f9cde76a198e87653ce8859fd028" diff --git a/components/console-backend-service/Gopkg.toml b/components/console-backend-service/Gopkg.toml index 4fe189569a29..80c817c5fda7 100644 --- a/components/console-backend-service/Gopkg.toml +++ b/components/console-backend-service/Gopkg.toml @@ -47,7 +47,7 @@ required = [ [[constraint]] name="github.com/kyma-project/rafter" - revision = "1b5e6fe41dabafd462de0cfce628184173ce01a3" + revision = "a0157e52e150b26f63c2ddc9f4e63c0cb7650ac7" [[constraint]] name="github.com/kyma-project/helm-broker" diff --git a/components/console-backend-service/internal/domain/rafter/asset_converter.go b/components/console-backend-service/internal/domain/rafter/asset_converter.go index 7721a6e5d7bd..5694b7d35328 100644 --- a/components/console-backend-service/internal/domain/rafter/asset_converter.go +++ b/components/console-backend-service/internal/domain/rafter/asset_converter.go @@ -37,11 +37,12 @@ func (c *assetConverter) ToGQL(item *v1beta1.Asset) (*gqlschema.Asset, error) { } asset := gqlschema.Asset{ - Name: item.Name, - Namespace: item.Namespace, - Type: item.Labels[TypeLabel], - Status: status, - Parameters: parameters, + Name: item.Name, + Namespace: item.Namespace, + Type: item.Labels[TypeLabel], + Status: status, + Parameters: parameters, + DisplayName: item.Spec.DisplayName, } return &asset, nil diff --git a/components/console-backend-service/internal/domain/rafter/asset_converter_test.go b/components/console-backend-service/internal/domain/rafter/asset_converter_test.go index c2917a35da0e..11332f1cfb94 100644 --- a/components/console-backend-service/internal/domain/rafter/asset_converter_test.go +++ b/components/console-backend-service/internal/domain/rafter/asset_converter_test.go @@ -28,7 +28,8 @@ func TestAssetConverter_ToGQL(t *testing.T) { Reason: "ExampleReason", Message: "ExampleMessage", }, - Parameters: gqlschema.JSON{"complex": map[string]interface{}{"data": "true"}, "json": "true"}, + Parameters: gqlschema.JSON{"complex": map[string]interface{}{"data": "true"}, "json": "true"}, + DisplayName: "ExampleDisplayName", } result, err := converter.ToGQL(item) @@ -107,7 +108,8 @@ func fixAsset() *v1beta1.Asset { BucketRef: v1beta1.AssetBucketRef{ Name: "ExampleBucketRef", }, - Parameters: &runtime.RawExtension{Raw: []byte(`{"json":"true","complex":{"data":"true"}}`)}, + Parameters: &runtime.RawExtension{Raw: []byte(`{"json":"true","complex":{"data":"true"}}`)}, + DisplayName: "ExampleDisplayName", }, }, Status: v1beta1.AssetStatus{ diff --git a/components/console-backend-service/internal/domain/rafter/clusterasset_converter.go b/components/console-backend-service/internal/domain/rafter/clusterasset_converter.go index c20f5ff6ea19..15be129e7df5 100644 --- a/components/console-backend-service/internal/domain/rafter/clusterasset_converter.go +++ b/components/console-backend-service/internal/domain/rafter/clusterasset_converter.go @@ -37,10 +37,11 @@ func (c *clusterAssetConverter) ToGQL(item *v1beta1.ClusterAsset) (*gqlschema.Cl } clusterAsset := gqlschema.ClusterAsset{ - Name: item.Name, - Type: item.Labels[TypeLabel], - Status: status, - Parameters: parameters, + Name: item.Name, + Type: item.Labels[TypeLabel], + Status: status, + Parameters: parameters, + DisplayName: item.Spec.DisplayName, } return &clusterAsset, nil diff --git a/components/console-backend-service/internal/domain/rafter/clusterasset_converter_test.go b/components/console-backend-service/internal/domain/rafter/clusterasset_converter_test.go index 10695c621749..8e8b4292ef31 100644 --- a/components/console-backend-service/internal/domain/rafter/clusterasset_converter_test.go +++ b/components/console-backend-service/internal/domain/rafter/clusterasset_converter_test.go @@ -27,7 +27,8 @@ func TestClusterAssetConverter_ToGQL(t *testing.T) { Reason: "ExampleReason", Message: "ExampleMessage", }, - Parameters: gqlschema.JSON{"complex": map[string]interface{}{"data": "true"}, "json": "true"}, + Parameters: gqlschema.JSON{"complex": map[string]interface{}{"data": "true"}, "json": "true"}, + DisplayName: "ExampleDisplayName", } result, err := converter.ToGQL(item) @@ -105,7 +106,8 @@ func fixClusterAsset() *v1beta1.ClusterAsset { BucketRef: v1beta1.AssetBucketRef{ Name: "ExampleBucketRef", }, - Parameters: &runtime.RawExtension{Raw: []byte(`{"json":"true","complex":{"data":"true"}}`)}, + Parameters: &runtime.RawExtension{Raw: []byte(`{"json":"true","complex":{"data":"true"}}`)}, + DisplayName: "ExampleDisplayName", }, }, Status: v1beta1.ClusterAssetStatus{ diff --git a/components/console-backend-service/internal/gqlschema/asset.go b/components/console-backend-service/internal/gqlschema/asset.go index a2a9882438f8..fb63ae40c608 100644 --- a/components/console-backend-service/internal/gqlschema/asset.go +++ b/components/console-backend-service/internal/gqlschema/asset.go @@ -1,9 +1,10 @@ package gqlschema type Asset struct { - Name string `json:"name"` - Namespace string `json:"namespace"` - Type string `json:"type"` - Status AssetStatus `json:"status"` - Parameters JSON `json:"parameters"` + Name string `json:"name"` + Namespace string `json:"namespace"` + Type string `json:"type"` + Status AssetStatus `json:"status"` + Parameters JSON `json:"parameters"` + DisplayName string `json:"displayName"` } diff --git a/components/console-backend-service/internal/gqlschema/clusterasset.go b/components/console-backend-service/internal/gqlschema/clusterasset.go index fe4f59639661..8187e24f51bd 100644 --- a/components/console-backend-service/internal/gqlschema/clusterasset.go +++ b/components/console-backend-service/internal/gqlschema/clusterasset.go @@ -1,8 +1,9 @@ package gqlschema type ClusterAsset struct { - Name string `json:"name"` - Type string `json:"type"` - Status AssetStatus `json:"status"` - Parameters JSON `json:"parameters"` + Name string `json:"name"` + Type string `json:"type"` + Status AssetStatus `json:"status"` + Parameters JSON `json:"parameters"` + DisplayName string `json:"displayName"` } diff --git a/components/console-backend-service/internal/gqlschema/schema.graphql b/components/console-backend-service/internal/gqlschema/schema.graphql index 55d7aff78704..b7b3daff43b6 100644 --- a/components/console-backend-service/internal/gqlschema/schema.graphql +++ b/components/console-backend-service/internal/gqlschema/schema.graphql @@ -40,6 +40,7 @@ type Asset { type: String! files(filterExtensions: [String!]): [File!]! status: AssetStatus! + displayName: String } type AssetEvent { @@ -53,6 +54,7 @@ type ClusterAsset { type: String! files(filterExtensions: [String!]): [File!]! status: AssetStatus! + displayName: String } type ClusterAssetEvent { diff --git a/components/console-backend-service/internal/gqlschema/schema_gen.go b/components/console-backend-service/internal/gqlschema/schema_gen.go index f509eb22415e..aa6e3d095cc9 100644 --- a/components/console-backend-service/internal/gqlschema/schema_gen.go +++ b/components/console-backend-service/internal/gqlschema/schema_gen.go @@ -195,12 +195,13 @@ type ComplexityRoot struct { } Asset struct { - Name func(childComplexity int) int - Namespace func(childComplexity int) int - Parameters func(childComplexity int) int - Type func(childComplexity int) int - Files func(childComplexity int, filterExtensions []string) int - Status func(childComplexity int) int + Name func(childComplexity int) int + Namespace func(childComplexity int) int + Parameters func(childComplexity int) int + Type func(childComplexity int) int + Files func(childComplexity int, filterExtensions []string) int + Status func(childComplexity int) int + DisplayName func(childComplexity int) int } AssetEvent struct { @@ -257,11 +258,12 @@ type ComplexityRoot struct { } ClusterAsset struct { - Name func(childComplexity int) int - Parameters func(childComplexity int) int - Type func(childComplexity int) int - Files func(childComplexity int, filterExtensions []string) int - Status func(childComplexity int) int + Name func(childComplexity int) int + Parameters func(childComplexity int) int + Type func(childComplexity int) int + Files func(childComplexity int, filterExtensions []string) int + Status func(childComplexity int) int + DisplayName func(childComplexity int) int } ClusterAssetEvent struct { @@ -5688,6 +5690,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Asset.Status(childComplexity), true + case "Asset.displayName": + if e.complexity.Asset.DisplayName == nil { + break + } + + return e.complexity.Asset.DisplayName(childComplexity), true + case "AssetEvent.type": if e.complexity.AssetEvent.Type == nil { break @@ -5915,6 +5924,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.ClusterAsset.Status(childComplexity), true + case "ClusterAsset.displayName": + if e.complexity.ClusterAsset.DisplayName == nil { + break + } + + return e.complexity.ClusterAsset.DisplayName(childComplexity), true + case "ClusterAssetEvent.type": if e.complexity.ClusterAssetEvent.Type == nil { break @@ -13088,6 +13104,8 @@ func (ec *executionContext) _Asset(ctx context.Context, sel ast.SelectionSet, ob if out.Values[i] == graphql.Null { invalid = true } + case "displayName": + out.Values[i] = ec._Asset_displayName(ctx, field, obj) default: panic("unknown field " + strconv.Quote(field.Name)) } @@ -13301,6 +13319,30 @@ func (ec *executionContext) _Asset_status(ctx context.Context, field graphql.Col return ec._AssetStatus(ctx, field.Selections, &res) } +// nolint: vetshadow +func (ec *executionContext) _Asset_displayName(ctx context.Context, field graphql.CollectedField, obj *Asset) graphql.Marshaler { + ctx = ec.Tracer.StartFieldExecution(ctx, field) + defer func() { ec.Tracer.EndFieldExecution(ctx) }() + rctx := &graphql.ResolverContext{ + Object: "Asset", + Args: nil, + Field: field, + } + ctx = graphql.WithResolverContext(ctx, rctx) + ctx = ec.Tracer.StartFieldResolverExecution(ctx, rctx) + resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.DisplayName, nil + }) + if resTmp == nil { + return graphql.Null + } + res := resTmp.(string) + rctx.Result = res + ctx = ec.Tracer.StartFieldChildExecution(ctx) + return graphql.MarshalString(res) +} + var assetEventImplementors = []string{"AssetEvent"} // nolint: gocyclo, errcheck, gas, goconst @@ -14483,6 +14525,8 @@ func (ec *executionContext) _ClusterAsset(ctx context.Context, sel ast.Selection if out.Values[i] == graphql.Null { invalid = true } + case "displayName": + out.Values[i] = ec._ClusterAsset_displayName(ctx, field, obj) default: panic("unknown field " + strconv.Quote(field.Name)) } @@ -14669,6 +14713,30 @@ func (ec *executionContext) _ClusterAsset_status(ctx context.Context, field grap return ec._AssetStatus(ctx, field.Selections, &res) } +// nolint: vetshadow +func (ec *executionContext) _ClusterAsset_displayName(ctx context.Context, field graphql.CollectedField, obj *ClusterAsset) graphql.Marshaler { + ctx = ec.Tracer.StartFieldExecution(ctx, field) + defer func() { ec.Tracer.EndFieldExecution(ctx) }() + rctx := &graphql.ResolverContext{ + Object: "ClusterAsset", + Args: nil, + Field: field, + } + ctx = graphql.WithResolverContext(ctx, rctx) + ctx = ec.Tracer.StartFieldResolverExecution(ctx, rctx) + resTmp := ec.FieldMiddleware(ctx, obj, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.DisplayName, nil + }) + if resTmp == nil { + return graphql.Null + } + res := resTmp.(string) + rctx.Result = res + ctx = ec.Tracer.StartFieldChildExecution(ctx) + return graphql.MarshalString(res) +} + var clusterAssetEventImplementors = []string{"ClusterAssetEvent"} // nolint: gocyclo, errcheck, gas, goconst @@ -37145,6 +37213,7 @@ type Asset { type: String! files(filterExtensions: [String!]): [File!]! status: AssetStatus! + displayName: String } type AssetEvent { @@ -37158,6 +37227,7 @@ type ClusterAsset { type: String! files(filterExtensions: [String!]): [File!]! status: AssetStatus! + displayName: String } type ClusterAssetEvent {