fix(rest): omit empty spec and status

app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml

@@ -32,7 +32,6 @@ spec:
         type: File
     targetRef:
       kind: Mesh
-status: {}
 type: MeshAccessLog
 ---
 creationTime: "0001-01-01T00:00:00Z"

app/kumactl/cmd/export/testdata/export-uni-federation-with-policies.golden.yaml

@@ -32,7 +32,6 @@ spec:
         type: File
     targetRef:
       kind: Mesh
-status: {}
 type: MeshAccessLog
 ---
 creationTime: "0001-01-01T00:00:00Z"
@@ -59,7 +58,6 @@ spec:
         type: File
     targetRef:
       kind: Mesh
-status: {}
 type: MeshAccessLog
 ---
 creationTime: "0001-01-01T00:00:00Z"

app/kumactl/cmd/export/testdata/export-uni.golden.yaml

@@ -64,7 +64,6 @@ spec:
         type: File
     targetRef:
       kind: Mesh
-status: {}
 type: MeshAccessLog
 ---
 creationTime: "0001-01-01T00:00:00Z"
@@ -93,7 +92,6 @@ spec:
         type: File
     targetRef:
       kind: Mesh
-status: {}
 type: MeshAccessLog
 ---
 creationTime: "0001-01-01T00:00:00Z"

docs/generated/openapi.yaml

@@ -19233,7 +19233,6 @@ components:
       required:
         - type
         - name
-        - spec
       properties:
         type:
           description: the type of the resource

pkg/api-server/testdata/resources/crud/put_meshaccesslog_01.golden.json

@@ -34,6 +34,5 @@
     }
    }
   ]
- },
- "status": {}
+ }
 }

pkg/api-server/testdata/resources/crud/put_meshmultizoneservice_01.golden.json

@@ -22,6 +22,5 @@
     "appProtocol": "tcp"
    }
   ]
- },
- "status": {}
+ }
 }

pkg/api-server/testdata/resources/crud/put_meshtrust_01.golden.json

@@ -24,6 +24,5 @@
     }
    }
   ]
- },
- "status": {}
+ }
 }

pkg/core/resources/apis/donothingresource/api/v1alpha1/zz_generated.resource.go

@@ -196,6 +196,7 @@ var DoNothingResourceResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "dnr",
 	IsFromAsRules:                false,

pkg/core/resources/apis/hostnamegenerator/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var HostnameGeneratorResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: true,
 	ShortName:                    "hg",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshexternalservice/api/v1alpha1/zz_generated.resource.go

@@ -211,6 +211,7 @@ var MeshExternalServiceResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: true,
 	ShortName:                    "extsvc",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshidentity/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var MeshIdentityResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: true,
 	ShortName:                    "mid",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshmultizoneservice/api/v1alpha1/zz_generated.resource.go

@@ -211,6 +211,7 @@ var MeshMultiZoneServiceResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mzsvc",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshopentelemetrybackend/api/v1alpha1/meshopentelemetrybackend.go

@@ -13,6 +13,7 @@ import (
 // +kuma:policy:has_status=true
 // +kuma:policy:short_name=motb
 // +kuma:policy:kds_flags=model.GlobalToZonesFlag | model.ZoneToGlobalFlag
+// +kuma:policy:optional_spec=true
 // +kuma:policy:singular_display_name=Mesh OpenTelemetry Backend
 type MeshOpenTelemetryBackend struct {
 	// Endpoint optionally defines the OTel collector address and port.

pkg/core/resources/apis/meshopentelemetrybackend/api/v1alpha1/rest.yaml

@@ -127,7 +127,7 @@ components:
     MeshOpenTelemetryBackendItem:
       type: object
       description: "MeshOpenTelemetryBackend defines a shared OTel collector endpoint for observability policies.\nAn empty spec is valid and represents the node-local default flow\n(kuma-dp resolves the address at runtime using HOST_IP or 127.0.0.1)."
-      required: [type, name, spec]
+      required: [type, name]
       properties:
         type:
           description: 'the type of the resource'

pkg/core/resources/apis/meshopentelemetrybackend/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var MeshOpenTelemetryBackendResourceTypeDescriptor = model.ResourceTypeDescripto
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 true,
 	AllowedOnSystemNamespaceOnly: true,
 	ShortName:                    "motb",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshservice/api/v1alpha1/zz_generated.resource.go

@@ -211,6 +211,7 @@ var MeshServiceResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "msvc",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshtrust/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var MeshTrustResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: true,
 	ShortName:                    "mtrust",
 	IsFromAsRules:                false,

pkg/core/resources/apis/meshzoneaddress/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshZoneAddressResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mza",
 	IsFromAsRules:                false,

pkg/core/resources/apis/workload/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var WorkloadResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "wl",
 	IsFromAsRules:                false,

pkg/core/resources/model/resource.go

@@ -189,6 +189,8 @@ type ResourceTypeDescriptor struct {
 	HasRulesTargetRef bool
 	// HasStatus indicates that the policy has a status field
 	HasStatus bool
+	// OptionalSpec indicates that the spec field can be omitted when empty
+	OptionalSpec bool
 	// IsProxy indicates if this resource is a proxy
 	IsProxy bool
 	// IsDestination indicates if this resource is a destination

pkg/core/resources/model/rest/converter.go

@@ -41,9 +41,13 @@ func (f *from) Resource(r core_model.Resource) Resource {
 
 	meta := f.Meta(r)
 	if r.Descriptor().IsPluginOriginated {
+		spec := r.GetSpec()
+		if r.Descriptor().OptionalSpec && core_model.IsEmpty(spec) {
+			spec = nil
+		}
 		res := &v1alpha1.Resource{
 			ResourceMeta: meta,
-			Spec:         r.GetSpec(),
+			Spec:         spec,
 		}
 		if r.Descriptor().HasStatus {
 			res.Status = r.GetStatus()

pkg/core/resources/model/rest/v1alpha1/resource.go

@@ -1,13 +1,16 @@
 package v1alpha1
 
 import (
+	"bytes"
 	"encoding/json"
 	"time"
 
 	"github.com/kumahq/kuma/v2/pkg/core/kri"
 	core_model "github.com/kumahq/kuma/v2/pkg/core/resources/model"
 )
 
+var emptyJSON = []byte("{}")
+
 type Resource struct {
 	ResourceMeta
 	Spec   core_model.ResourceSpec   `json:"spec,omitempty"`
@@ -32,7 +35,9 @@ func (r *Resource) MarshalJSON() ([]byte, error) {
 		if err != nil {
 			return nil, err
 		}
-		statusJSON = b
+		if !bytes.Equal(b, emptyJSON) {
+			statusJSON = b
+		}
 	}
 
 	var kriStr string

pkg/core/resources/model/rest/v1alpha1/resource_test.go

@@ -8,6 +8,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/kumahq/kuma/v2/pkg/core/resources/model/rest/v1alpha1"
+	meshmetric "github.com/kumahq/kuma/v2/pkg/plugins/policies/meshmetric/api/v1alpha1"
 	"github.com/kumahq/kuma/v2/pkg/test/kds/samples"
 )
 
@@ -99,6 +100,49 @@ var _ = Describe("Rest Resource", func() {
 `
 				Expect(string(bytes)).To(MatchJSON(expected))
 			})
+
+			It("should omit spec when nil", func() {
+				// given - spec is nil (set by converter for optional-spec resources)
+				res := &v1alpha1.Resource{
+					ResourceMeta: v1alpha1.ResourceMeta{
+						Type:             "MeshTrafficPermission",
+						Mesh:             "default",
+						Name:             "one",
+						CreationTime:     t1,
+						ModificationTime: t2,
+					},
+					Spec: nil,
+				}
+
+				// when
+				bytes, err := json.Marshal(res)
+
+				// then
+				Expect(err).ToNot(HaveOccurred())
+				Expect(string(bytes)).ToNot(ContainSubstring(`"spec"`))
+			})
+
+			It("should omit status when set to non-nil empty struct", func() {
+				// given
+				res := &v1alpha1.Resource{
+					ResourceMeta: v1alpha1.ResourceMeta{
+						Type:             "MeshTrafficPermission",
+						Mesh:             "default",
+						Name:             "one",
+						CreationTime:     t1,
+						ModificationTime: t2,
+					},
+					Spec:   samples.MeshTrafficPermission,
+					Status: &meshmetric.MeshMetricStatus{},
+				}
+
+				// when
+				bytes, err := json.Marshal(res)
+
+				// then
+				Expect(err).ToNot(HaveOccurred())
+				Expect(string(bytes)).ToNot(ContainSubstring(`"status"`))
+			})
 		})
 	})
 })

pkg/plugins/policies/donothingpolicy/api/v1alpha1/zz_generated.resource.go

@@ -196,6 +196,7 @@ var DoNothingPolicyResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "dnp",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshaccesslog/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var MeshAccessLogResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mal",
 	IsFromAsRules:                true,

pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshCircuitBreakerResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mcb",
 	IsFromAsRules:                true,

pkg/plugins/policies/meshfaultinjection/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshFaultInjectionResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mfi",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshhealthcheck/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshHealthCheckResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mhc",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshhttproute/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshHTTPRouteResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mhttpr",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshLoadBalancingStrategyResourceTypeDescriptor = model.ResourceTypeDescript
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mlbs",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshmetric/api/v1alpha1/zz_generated.resource.go

@@ -208,6 +208,7 @@ var MeshMetricResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    true,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mm",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshpassthrough/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshPassthroughResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mp",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshproxypatch/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshProxyPatchResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mpp",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshratelimit/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshRateLimitResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mrl",
 	IsFromAsRules:                true,

pkg/plugins/policies/meshretry/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshRetryResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mr",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshtcproute/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshTCPRouteResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             false,
 	HasRulesTargetRef:            false,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mtcpr",
 	IsFromAsRules:                false,

pkg/plugins/policies/meshtimeout/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshTimeoutResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mt",
 	IsFromAsRules:                true,

pkg/plugins/policies/meshtls/api/v1alpha1/zz_generated.resource.go

@@ -197,6 +197,7 @@ var MeshTLSResourceTypeDescriptor = model.ResourceTypeDescriptor{
 	HasFromTargetRef:             true,
 	HasRulesTargetRef:            true,
 	HasStatus:                    false,
+	OptionalSpec:                 false,
 	AllowedOnSystemNamespaceOnly: false,
 	ShortName:                    "mtls",
 	IsFromAsRules:                true,