diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Bootstrap_AutoConfiguration/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Bootstrap_AutoConfiguration/ConfigurationSchema.json new file mode 100644 index 0000000..d3dd0a4 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Bootstrap_AutoConfiguration/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Bootstrap": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Bootstrap.AutoConfiguration": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Common/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Common/ConfigurationSchema.json new file mode 100644 index 0000000..2f5c023 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Common/ConfigurationSchema.json @@ -0,0 +1,14 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Hosting/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Hosting/ConfigurationSchema.json new file mode 100644 index 0000000..3ca1828 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Hosting/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common.Hosting": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Http/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Http/ConfigurationSchema.json new file mode 100644 index 0000000..be28e95 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Http/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common.Http": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Logging/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Logging/ConfigurationSchema.json new file mode 100644 index 0000000..4dc17d7 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Logging/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common.Logging": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Net/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Net/ConfigurationSchema.json new file mode 100644 index 0000000..d1b98ca --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Common_Net/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Common.Net": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Abstractions/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Abstractions/ConfigurationSchema.json new file mode 100644 index 0000000..4e42c28 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Abstractions/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.Abstractions": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_CloudFoundry/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_CloudFoundry/ConfigurationSchema.json new file mode 100644 index 0000000..c44c85a --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_CloudFoundry/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.CloudFoundry": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_ConfigServer/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_ConfigServer/ConfigurationSchema.json index 8f9e677..0bfa06a 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_ConfigServer/ConfigurationSchema.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_ConfigServer/ConfigurationSchema.json @@ -173,7 +173,7 @@ }, "TokenRenewRate": { "type": "integer", - "description": "Gets or sets the vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." + "description": "Gets or sets the Vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." }, "TokenTtl": { "type": "integer", diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Kubernetes_ServiceBindings/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Kubernetes_ServiceBindings/ConfigurationSchema.json new file mode 100644 index 0000000..df9796c --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Kubernetes_ServiceBindings/ConfigurationSchema.json @@ -0,0 +1,20 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.Kubernetes": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.Kubernetes.ServiceBindings": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Placeholder/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Placeholder/ConfigurationSchema.json new file mode 100644 index 0000000..fd9d115 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_Placeholder/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.Placeholder": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_RandomValue/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_RandomValue/ConfigurationSchema.json new file mode 100644 index 0000000..049c278 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_RandomValue/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.RandomValue": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_SpringBoot/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_SpringBoot/ConfigurationSchema.json new file mode 100644 index 0000000..5082a91 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Configuration_SpringBoot/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Configuration.SpringBoot": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Connectors_EntityFrameworkCore/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Connectors_EntityFrameworkCore/ConfigurationSchema.json new file mode 100644 index 0000000..d07e30c --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Connectors_EntityFrameworkCore/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Connectors": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Connectors.EntityFrameworkCore": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Consul/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Consul/ConfigurationSchema.json index 3111a53..58acfc8 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Consul/ConfigurationSchema.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Consul/ConfigurationSchema.json @@ -188,7 +188,7 @@ }, "UseAspNetCoreUrls": { "type": "boolean", - "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true." + "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Port' or 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Scheme' is explicitly configured." }, "UseNetworkInterfaces": { "type": "boolean", diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Eureka/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Eureka/ConfigurationSchema.json index 2e1c600..95634e3 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Eureka/ConfigurationSchema.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_Eureka/ConfigurationSchema.json @@ -258,6 +258,10 @@ "type": "string", "description": "Gets or sets the relative path to the status page for the instance. The status page URL is then constructed out of the 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName' and the type of communication - secure or non-secure, as specified in 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort'. It is normally used for informational purposes for other services to find out about the status of the instance. Users can provide a simple HTML page indicating what the current status of the instance is. Default value: /info." }, + "UseAspNetCoreUrls": { + "type": "boolean", + "description": "Gets or sets a value indicating whether to register with the port number(s) ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort' or 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' is explicitly configured." + }, "UseNetworkInterfaces": { "type": "boolean", "description": "Gets or sets a value indicating whether 'System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces' is used to determine 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.IPAddress' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName'. Default value: false." diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_HttpClients/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_HttpClients/ConfigurationSchema.json new file mode 100644 index 0000000..7543664 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Discovery_HttpClients/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Discovery": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Discovery.HttpClients": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Logging_Abstractions/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Logging_Abstractions/ConfigurationSchema.json new file mode 100644 index 0000000..4a14939 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Logging_Abstractions/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Logging": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Logging.Abstractions": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Abstractions/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Abstractions/ConfigurationSchema.json new file mode 100644 index 0000000..20ca549 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Abstractions/ConfigurationSchema.json @@ -0,0 +1,17 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Management": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Management.Abstractions": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Endpoint/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Endpoint/ConfigurationSchema.json index 883f304..6d5e8ea 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Endpoint/ConfigurationSchema.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Endpoint/ConfigurationSchema.json @@ -810,7 +810,7 @@ }, "UseStatusCodeFromResponse": { "type": "boolean", - "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overruled by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." + "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overridden by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." }, "Web": { "type": "object", diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Tracing/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Tracing/ConfigurationSchema.json index a36a6c5..bcccfa2 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Tracing/ConfigurationSchema.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Management_Tracing/ConfigurationSchema.json @@ -1,4 +1,19 @@ { + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Management": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Management.Tracing": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + }, "type": "object", "properties": { "Spring": { diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_JwtBearer/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_JwtBearer/ConfigurationSchema.json new file mode 100644 index 0000000..215b1d2 --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_JwtBearer/ConfigurationSchema.json @@ -0,0 +1,20 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.Authentication": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.Authentication.JwtBearer": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_OpenIdConnect/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_OpenIdConnect/ConfigurationSchema.json new file mode 100644 index 0000000..59d837a --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_Authentication_OpenIdConnect/ConfigurationSchema.json @@ -0,0 +1,20 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.Authentication": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.Authentication.OpenIdConnect": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_DataProtection_Redis/ConfigurationSchema.json b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_DataProtection_Redis/ConfigurationSchema.json new file mode 100644 index 0000000..1ccb69c --- /dev/null +++ b/ConfigurationSchemaGeneratorTest/Baseline/InputFiles/Security_DataProtection_Redis/ConfigurationSchema.json @@ -0,0 +1,20 @@ +{ + "definitions": { + "logLevel": { + "properties": { + "Steeltoe": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.DataProtection": { + "$ref": "#/definitions/logLevelThreshold" + }, + "Steeltoe.Security.DataProtection.Redis": { + "$ref": "#/definitions/logLevelThreshold" + } + } + } + } +} diff --git a/ConfigurationSchemaGeneratorTest/Baseline/merge-actual.json b/ConfigurationSchemaGeneratorTest/Baseline/merge-actual.json index c730fd3..68eb628 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/merge-actual.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/merge-actual.json @@ -229,7 +229,7 @@ }, "UseAspNetCoreUrls": { "type": "boolean", - "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true." + "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Port' or 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Scheme' is explicitly configured." }, "UseNetworkInterfaces": { "type": "boolean", @@ -581,6 +581,10 @@ "type": "string", "description": "Gets or sets the relative path to the status page for the instance. The status page URL is then constructed out of the 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName' and the type of communication - secure or non-secure, as specified in 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort'. It is normally used for informational purposes for other services to find out about the status of the instance. Users can provide a simple HTML page indicating what the current status of the instance is. Default value: /info." }, + "UseAspNetCoreUrls": { + "type": "boolean", + "description": "Gets or sets a value indicating whether to register with the port number(s) ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort' or 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' is explicitly configured." + }, "UseNetworkInterfaces": { "type": "boolean", "description": "Gets or sets a value indicating whether 'System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces' is used to determine 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.IPAddress' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName'. Default value: false." @@ -1419,7 +1423,7 @@ }, "UseStatusCodeFromResponse": { "type": "boolean", - "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overruled by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." + "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overridden by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." }, "Web": { "type": "object", @@ -1701,7 +1705,7 @@ }, "TokenRenewRate": { "type": "integer", - "description": "Gets or sets the vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." + "description": "Gets or sets the Vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." }, "TokenTtl": { "type": "integer", diff --git a/ConfigurationSchemaGeneratorTest/Baseline/merge-expected.json b/ConfigurationSchemaGeneratorTest/Baseline/merge-expected.json index c730fd3..68eb628 100644 --- a/ConfigurationSchemaGeneratorTest/Baseline/merge-expected.json +++ b/ConfigurationSchemaGeneratorTest/Baseline/merge-expected.json @@ -229,7 +229,7 @@ }, "UseAspNetCoreUrls": { "type": "boolean", - "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true." + "description": "Gets or sets a value indicating whether to register with the port number ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Port' or 'Steeltoe.Discovery.Consul.Configuration.ConsulDiscoveryOptions.Scheme' is explicitly configured." }, "UseNetworkInterfaces": { "type": "boolean", @@ -581,6 +581,10 @@ "type": "string", "description": "Gets or sets the relative path to the status page for the instance. The status page URL is then constructed out of the 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName' and the type of communication - secure or non-secure, as specified in 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort'. It is normally used for informational purposes for other services to find out about the status of the instance. Users can provide a simple HTML page indicating what the current status of the instance is. Default value: /info." }, + "UseAspNetCoreUrls": { + "type": "boolean", + "description": "Gets or sets a value indicating whether to register with the port number(s) ASP.NET Core is listening on. Default value: true.\n\nThis property is ignored when 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.NonSecurePort' or 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.SecurePort' is explicitly configured." + }, "UseNetworkInterfaces": { "type": "boolean", "description": "Gets or sets a value indicating whether 'System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces' is used to determine 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.IPAddress' and 'Steeltoe.Discovery.Eureka.Configuration.EurekaInstanceOptions.HostName'. Default value: false." @@ -1419,7 +1423,7 @@ }, "UseStatusCodeFromResponse": { "type": "boolean", - "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overruled by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." + "description": "Gets or sets a value indicating whether the HTTP response status code is based on the health status. This setting can be overridden by sending an X-Use-Status-Code-From-Response HTTP header. Default value: true." }, "Web": { "type": "object", @@ -1701,7 +1705,7 @@ }, "TokenRenewRate": { "type": "integer", - "description": "Gets or sets the vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." + "description": "Gets or sets the Vault token renew rate (in milliseconds). Default value: 60_000 (1 minute)." }, "TokenTtl": { "type": "integer",