fix(psql): preserve false durability status (#81)

* fix(psql): preserve false status durability

* test(psql): cover false status patch persistence

Author: HaoyL666

api/psql/v1beta1/dbsystem_types.go

@@ -661,7 +661,8 @@ spec:
                     type: string
                 type: object
               storageDetails:
-                description: DbSystemStorageDetails defines nested fields for DbSystem.StorageDetails.
+                description: DbSystemStorageDetailsObservedState defines nested fields
+                  for DbSystem.StorageDetails.
                 properties:
                   availabilityDomain:
                     description: |-

api/psql/v1beta1/zz_generated.deepcopy.go

@@ -31,6 +31,7 @@ Each service record defines:
 | `formalSpec` | Optional controller slug from `formal/controller_manifest.tsv` when one formal row covers the service-level runtime contract. |
 | `observedState.sdkAliases` | Optional observed-state SDK struct aliases keyed by the discovered SDK resource family when status synthesis must read a differently named response model. |
 | `observedState.excludedFieldPaths` | Optional dot-separated observed-state field paths keyed by the discovered SDK resource family when sensitive or unsupported SDK fields must be omitted from generated status surfaces. |
+| `observedState.requiredPointerFieldPaths` | Optional dot-separated observed-state field paths keyed by the discovered SDK resource family that must retain value presence in generated status while remaining required in the CRD schema. |
 | `generation.controller.strategy` | Service-wide controller rollout: `none`, `manual`, or `generated`. |
 | `generation.serviceManager.strategy` | Service-wide service-manager rollout: `none`, `manual`, or `generated`. |
 | `generation.registration.strategy` | Group-level runtime registration rollout: `none`, `manual`, or `generated`. |

config/crd/bases/psql.oracle.com_dbsystems.yaml

@@ -83,7 +83,7 @@ This summary shows the top-level `status` fields. Use [the full API reference](.
 | `shape` | The name of the shape for the database instance. Example: `VM.Standard.E4.Flex` | `string` | No |
 | [`source`](../../reference/api/psql/v1beta1/index.md#kind-dbsystem-status-source) | DbSystemSource defines nested fields for DbSystem.Source. | `object` | No |
 | [`status`](../../reference/api/psql/v1beta1/index.md#kind-dbsystem-status-status) | - | `object` | Yes |
-| [`storageDetails`](../../reference/api/psql/v1beta1/index.md#kind-dbsystem-status-storagedetails) | DbSystemStorageDetails defines nested fields for DbSystem.StorageDetails. | `object` | No |
+| [`storageDetails`](../../reference/api/psql/v1beta1/index.md#kind-dbsystem-status-storagedetails) | DbSystemStorageDetailsObservedState defines nested fields for DbSystem.StorageDetails. | `object` | No |
 | `systemTags` | System tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"orcl-cloud": {"free-tier-retained": "true"}}` | `map[string, map[string, string]]` | No |
 | `systemType` | Type of the database system. | `string` | No |
 | `timeCreated` | The date and time that the database system was created, expressed in RFC 3339 (https://tools.ietf.org/rfc/rfc3339) timestamp format. Example: `2016-08-25T21:10:29.600Z` | `string` | No |

docs/api-generator-contract.md

@@ -268,7 +268,7 @@ DbSystemStatus defines the observed state of DbSystem.
 | `shape` | The name of the shape for the database instance. Example: `VM.Standard.E4.Flex` | `string` | No | - | - |
 | [`source`](#kind-dbsystem-status-source) | DbSystemSource defines nested fields for DbSystem.Source. | `object` | No | - | - |
 | [`status`](#kind-dbsystem-status-status) | - | `object` | Yes | - | - |
-| [`storageDetails`](#kind-dbsystem-status-storagedetails) | DbSystemStorageDetails defines nested fields for DbSystem.StorageDetails. | `object` | No | - | - |
+| [`storageDetails`](#kind-dbsystem-status-storagedetails) | DbSystemStorageDetailsObservedState defines nested fields for DbSystem.StorageDetails. | `object` | No | - | - |
 | `systemTags` | System tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"orcl-cloud": {"free-tier-retained": "true"}}` | `map[string, map[string, string]]` | No | - | - |
 | `systemType` | Type of the database system. | `string` | No | - | - |
 | `timeCreated` | The date and time that the database system was created, expressed in RFC 3339 (https://tools.ietf.org/rfc/rfc3339) timestamp format. Example: `2016-08-25T21:10:29.600Z` | `string` | No | - | - |
@@ -466,7 +466,7 @@ Async is the canonical controller-owned async contract. Resource-local legacy wo
 
 [Back to DbSystem status](#kind-dbsystem-status)
 
-DbSystemStorageDetails defines nested fields for DbSystem.StorageDetails.
+DbSystemStorageDetailsObservedState defines nested fields for DbSystem.StorageDetails.
 
 | Field | Description | Type | Required | Default | Enum |
 | --- | --- | --- | --- | --- | --- |

docs/guides/psql/dbsystem.md

@@ -181,8 +181,9 @@ type ServiceConfig struct {
 
 // ObservedStateConfig tunes how read-model fields are synthesized into status types.
 type ObservedStateConfig struct {
-	SDKAliases         map[string][]string `yaml:"sdkAliases,omitempty"`
-	ExcludedFieldPaths map[string][]string `yaml:"excludedFieldPaths,omitempty"`
+	SDKAliases                map[string][]string `yaml:"sdkAliases,omitempty"`
+	ExcludedFieldPaths        map[string][]string `yaml:"excludedFieldPaths,omitempty"`
+	RequiredPointerFieldPaths map[string][]string `yaml:"requiredPointerFieldPaths,omitempty"`
 }
 
 // LoadConfig reads and validates the generator config file.
@@ -315,7 +316,10 @@ func validateObservedStateConfig(service ServiceConfig) error {
 	if err := validateObservedStateAliases(service); err != nil {
 		return err
 	}
-	return validateObservedStateExcludedFieldPaths(service)
+	if err := validateObservedStateExcludedFieldPaths(service); err != nil {
+		return err
+	}
+	return validateObservedStateRequiredPointerFieldPaths(service)
 }
 
 func validateObservedStateAliases(service ServiceConfig) error {
@@ -351,6 +355,25 @@ func validateObservedStateExcludedFieldPaths(service ServiceConfig) error {
 	return nil
 }
 
+func validateObservedStateRequiredPointerFieldPaths(service ServiceConfig) error {
+	for rawName, paths := range service.ObservedState.RequiredPointerFieldPaths {
+		if strings.TrimSpace(rawName) == "" {
+			return fmt.Errorf("service %q observedState requiredPointerFieldPaths contains a blank resource name", service.Service)
+		}
+		for _, fieldPath := range paths {
+			if _, err := normalizeObservedStateFieldPath(fieldPath); err != nil {
+				return fmt.Errorf(
+					"service %q observedState requiredPointerFieldPaths[%q] %w",
+					service.Service,
+					rawName,
+					err,
+				)
+			}
+		}
+	}
+	return nil
+}
+
 func validateUniqueServiceKeys(
 	service ServiceConfig,
 	servicesByName map[string]struct{},
@@ -1413,6 +1436,33 @@ func (s ServiceConfig) ObservedStateExcludedFieldPaths(rawName string) map[strin
 	return paths
 }
 
+// ObservedStateRequiredPointerFieldPaths returns observed-state fields that must retain
+// presence information while remaining required in the generated status schema.
+func (s ServiceConfig) ObservedStateRequiredPointerFieldPaths(rawName string) map[string]struct{} {
+	rawName = strings.TrimSpace(rawName)
+	if rawName == "" {
+		return nil
+	}
+
+	configured := s.ObservedState.RequiredPointerFieldPaths[rawName]
+	if len(configured) == 0 {
+		return nil
+	}
+
+	paths := make(map[string]struct{}, len(configured))
+	for _, path := range configured {
+		normalized, err := normalizeObservedStateFieldPath(path)
+		if err != nil {
+			continue
+		}
+		paths[normalized] = struct{}{}
+	}
+	if len(paths) == 0 {
+		return nil
+	}
+	return paths
+}
+
 func normalizeObservedStateFieldPath(path string) (string, error) {
 	path = strings.TrimSpace(path)
 	if path == "" {

docs/reference/api/psql/v1beta1/index.md

@@ -6814,6 +6814,9 @@ services:
           - PrimaryDbInstanceDetails
         WorkRequestLog:
           - WorkRequestLogEntry
+      requiredPointerFieldPaths:
+        DbSystem:
+          - StorageDetails.IsRegionallyDurable
 
   - service: queue
     sdkPackage: github.com/oracle/oci-go-sdk/v65/queue

internal/generator/config.go

@@ -3627,6 +3627,30 @@ func TestObservedStateExcludedFieldPaths(t *testing.T) {
 	}
 }
 
+func TestObservedStateRequiredPointerFieldPaths(t *testing.T) {
+	t.Parallel()
+
+	service := ServiceConfig{
+		ObservedState: ObservedStateConfig{
+			RequiredPointerFieldPaths: map[string][]string{
+				"DbSystem": {"StorageDetails.IsRegionallyDurable", " storageDetails.isRegionallyDurable "},
+			},
+		},
+	}
+
+	got := service.ObservedStateRequiredPointerFieldPaths("DbSystem")
+	wantKey, err := normalizeObservedStateFieldPath("StorageDetails.IsRegionallyDurable")
+	if err != nil {
+		t.Fatalf("normalizeObservedStateFieldPath() error = %v", err)
+	}
+	if len(got) != 1 {
+		t.Fatalf("ObservedStateRequiredPointerFieldPaths() returned %d entries, want 1", len(got))
+	}
+	if _, ok := got[wantKey]; !ok {
+		t.Fatalf("ObservedStateRequiredPointerFieldPaths() = %v, want %q", got, wantKey)
+	}
+}
+
 func TestCheckedInConfigExcludesMySQLDbSystemSourceURLFromObservedState(t *testing.T) {
 	t.Parallel()
 

internal/generator/config/services.yaml

@@ -722,6 +722,7 @@ type fieldRenderingOptions struct {
 	scope                     fieldScope
 	escapeStatusJSONCollision bool
 	excludedFieldPaths        map[string]struct{}
+	requiredPointerFieldPaths map[string]struct{}
 }
 
 func buildFieldModel(field ocisdk.Field, jsonName string, options fieldRenderingOptions) FieldModel {