Change Disabled=>Disable

tataruty · tataruty · commit fdbc6382fcdb · 2025-11-10T17:35:15.000Z
diff --git a/apis/v1alpha2/nginxproxy_types.go b/apis/v1alpha2/nginxproxy_types.go
@@ -360,10 +360,10 @@ const (
 
 // NginxAccessLog defines the configuration for an NGINX access log.
 type NginxAccessLog struct {
-	// Disabled turns off access logging when set to true.
+	// Disable turns off access logging when set to true.
 	//
 	// +optional
-	Disabled *bool `json:"disabled,omitempty"`
+	Disable *bool `json:"disable,omitempty"`
 
 	// Format specifies the custom log format string.
 	// If not specified, NGINX default 'combined' format is used.
diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go
diff --git a/charts/nginx-gateway-fabric/values.schema.json b/charts/nginx-gateway-fabric/values.schema.json
@@ -205,8 +205,8 @@
                 "accessLog": {
                   "description": "AccessLog defines the access log settings.",
                   "properties": {
-                    "disabled": {
-                      "description": "Disabled turns off access logging when set to true.",
+                    "disable": {
+                      "description": "Disable turns off access logging when set to true.",
                       "required": [],
                       "type": "boolean"
                     },
diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml
@@ -475,9 +475,9 @@ nginx:
   #         type: object
   #         description: AccessLog defines the access log settings.
   #         properties:
-  #           disabled:
+  #           disable:
   #             type: boolean
-  #             description: Disabled turns off access logging when set to true.
+  #             description: Disable turns off access logging when set to true.
   #           format:
   #             type: string
   #             description: Format specifies the custom log format string. If not specified, NGINX default 'combined' format is used.
diff --git a/config/crd/bases/gateway.nginx.org_nginxproxies.yaml b/config/crd/bases/gateway.nginx.org_nginxproxies.yaml
@@ -8021,8 +8021,8 @@ spec:
                       AccessLog defines the access log settings, including format itself and disabling option.
                       For now only path /dev/stdout can be used.
                     properties:
-                      disabled:
-                        description: Disabled turns off access logging when set to
+                      disable:
+                        description: Disable turns off access logging when set to
                           true.
                         type: boolean
                       format:
diff --git a/deploy/crds.yaml b/deploy/crds.yaml
@@ -8608,8 +8608,8 @@ spec:
                       AccessLog defines the access log settings, including format itself and disabling option.
                       For now only path /dev/stdout can be used.
                     properties:
-                      disabled:
-                        description: Disabled turns off access logging when set to
+                      disable:
+                        description: Disable turns off access logging when set to
                           true.
                         type: boolean
                       format:
diff --git a/internal/controller/nginx/config/base_http_config.go b/internal/controller/nginx/config/base_http_config.go
@@ -14,7 +14,7 @@ type AccessLog struct {
 	Format     string // User's format string
 	Path       string // Where to write logs (/dev/stdout)
 	FormatName string // Internal format name (ngf_user_defined_log_format)
-	Disabled   bool   // User's disabled flag
+	Disable    bool   // User's disable flag
 }
 type httpConfig struct {
 	DNSResolver             *dataplane.DNSResolverConfig
@@ -56,7 +56,7 @@ func buildAccessLog(accessLogConfig *dataplane.AccessLog) *AccessLog {
 		if accessLogConfig.Format != "" {
 			accessLog.Format = accessLogConfig.Format
 		}
-		accessLog.Disabled = accessLogConfig.Disabled
+		accessLog.Disable = accessLogConfig.Disable
 
 		return accessLog
 	}
diff --git a/internal/controller/nginx/config/base_http_config_template.go b/internal/controller/nginx/config/base_http_config_template.go
@@ -51,7 +51,7 @@ server {
 {{- /* Define custom log format */ -}}
 {{- /* We use a fixed name for user-defined log format to avoid complexity of passing the name around. */ -}}
 {{- if .AccessLog }}
-{{- if .AccessLog.Disabled }}
+{{- if .AccessLog.Disable }}
 access_log off;
 {{- else }}
 {{- if .AccessLog.Format }}
diff --git a/internal/controller/nginx/config/base_http_config_test.go b/internal/controller/nginx/config/base_http_config_test.go
@@ -40,7 +40,7 @@ func TestLoggingSettingsTemplate(t *testing.T) {
 		},
 		{
 			name:      "Access log off while format presented",
-			accessLog: &dataplane.AccessLog{Disabled: true, Format: logFormat},
+			accessLog: &dataplane.AccessLog{Disable: true, Format: logFormat},
 			expectedOutputs: []string{
 				`access_log off;`,
 			},
@@ -50,7 +50,7 @@ func TestLoggingSettingsTemplate(t *testing.T) {
 		},
 		{
 			name:      "Access log off",
-			accessLog: &dataplane.AccessLog{Disabled: true},
+			accessLog: &dataplane.AccessLog{Disable: true},
 			expectedOutputs: []string{
 				`access_log off;`,
 			},
diff --git a/internal/controller/state/dataplane/configuration.go b/internal/controller/state/dataplane/configuration.go
@@ -1237,8 +1237,8 @@ func buildLogging(gateway *graph.Gateway) Logging {
 
 func buildAccessLog(srcLogSettings *ngfAPIv1alpha2.NginxLogging) *AccessLog {
 	if srcLogSettings.AccessLog != nil {
-		if srcLogSettings.AccessLog.Disabled != nil && *srcLogSettings.AccessLog.Disabled {
-			return &AccessLog{Disabled: true}
+		if srcLogSettings.AccessLog.Disable != nil && *srcLogSettings.AccessLog.Disable {
+			return &AccessLog{Disable: true}
 		}
 
 		if srcLogSettings.AccessLog.Format != nil && *srcLogSettings.AccessLog.Format != "" {
diff --git a/internal/controller/state/dataplane/configuration_test.go b/internal/controller/state/dataplane/configuration_test.go
@@ -4913,8 +4913,8 @@ func TestBuildLogging(t *testing.T) {
 					Logging: &ngfAPIv1alpha2.NginxLogging{
 						ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelInfo),
 						AccessLog: &ngfAPIv1alpha2.NginxAccessLog{
-							Disabled: helpers.GetPointer(false),
-							Format:   helpers.GetPointer(logFormat),
+							Disable: helpers.GetPointer(false),
+							Format:  helpers.GetPointer(logFormat),
 						},
 					},
 				},
@@ -4923,8 +4923,8 @@ func TestBuildLogging(t *testing.T) {
 				ErrorLevel: "info",
 
 				AccessLog: &AccessLog{
-					Disabled: false,
-					Format:   logFormat,
+					Disable: false,
+					Format:  logFormat,
 				},
 			},
 		},
@@ -4935,7 +4935,7 @@ func TestBuildLogging(t *testing.T) {
 					Logging: &ngfAPIv1alpha2.NginxLogging{
 						ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelInfo),
 						AccessLog: &ngfAPIv1alpha2.NginxAccessLog{
-							Disabled: helpers.GetPointer(false),
+							Disable: helpers.GetPointer(false),
 						},
 					},
 				},
@@ -4952,16 +4952,16 @@ func TestBuildLogging(t *testing.T) {
 					Logging: &ngfAPIv1alpha2.NginxLogging{
 						ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelInfo),
 						AccessLog: &ngfAPIv1alpha2.NginxAccessLog{
-							Disabled: helpers.GetPointer(true),
-							Format:   helpers.GetPointer(logFormat),
+							Disable: helpers.GetPointer(true),
+							Format:  helpers.GetPointer(logFormat),
 						},
 					},
 				},
 			},
 			expLoggingSettings: Logging{
 				ErrorLevel: "info",
 				AccessLog: &AccessLog{
-					Disabled: true,
+					Disable: true,
 				},
 			},
 		},
@@ -4972,15 +4972,15 @@ func TestBuildLogging(t *testing.T) {
 					Logging: &ngfAPIv1alpha2.NginxLogging{
 						ErrorLevel: helpers.GetPointer(ngfAPIv1alpha2.NginxLogLevelInfo),
 						AccessLog: &ngfAPIv1alpha2.NginxAccessLog{
-							Disabled: helpers.GetPointer(true),
+							Disable: helpers.GetPointer(true),
 						},
 					},
 				},
 			},
 			expLoggingSettings: Logging{
 				ErrorLevel: "info",
 				AccessLog: &AccessLog{
-					Disabled: true,
+					Disable: true,
 				},
 			},
 		},
diff --git a/internal/controller/state/dataplane/types.go b/internal/controller/state/dataplane/types.go
@@ -503,6 +503,6 @@ type DeploymentContext struct {
 type AccessLog struct {
 	// Format is the access log format template.
 	Format string
-	// Disabled specifies whether the access log is disabled.
-	Disabled bool
+	// Disable specifies whether the access log is disabled.
+	Disable bool
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type AccessLog struct {`
`14`	`14`	`Format string // User's format string`
`15`	`15`	`Path string // Where to write logs (/dev/stdout)`
`16`	`16`	`FormatName string // Internal format name (ngf_user_defined_log_format)`
`17`		`- Disabled bool // User's disabled flag`
	`17`	`+ Disable bool // User's disable flag`
`18`	`18`	`}`
`19`	`19`	`type httpConfig struct {`
`20`	`20`	`DNSResolver *dataplane.DNSResolverConfig`
`@@ -56,7 +56,7 @@ func buildAccessLog(accessLogConfig dataplane.AccessLog) AccessLog {`
`56`	`56`	`if accessLogConfig.Format != "" {`
`57`	`57`	`accessLog.Format = accessLogConfig.Format`
`58`	`58`	`}`
`59`		`- accessLog.Disabled = accessLogConfig.Disabled`
	`59`	`+ accessLog.Disable = accessLogConfig.Disable`
`60`	`60`
`61`	`61`	`return accessLog`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1237,8 +1237,8 @@ func buildLogging(gateway *graph.Gateway) Logging {`
`1237`	`1237`
`1238`	`1238`	`func buildAccessLog(srcLogSettings ngfAPIv1alpha2.NginxLogging) AccessLog {`
`1239`	`1239`	`if srcLogSettings.AccessLog != nil {`
`1240`		`- if srcLogSettings.AccessLog.Disabled != nil && *srcLogSettings.AccessLog.Disabled {`
`1241`		`- return &AccessLog{Disabled: true}`
	`1240`	`+ if srcLogSettings.AccessLog.Disable != nil && *srcLogSettings.AccessLog.Disable {`
	`1241`	`+ return &AccessLog{Disable: true}`
`1242`	`1242`	`}`
`1243`	`1243`
`1244`	`1244`	`if srcLogSettings.AccessLog.Format != nil && *srcLogSettings.AccessLog.Format != "" {`