Update samples v4 (#346)

* Extract non-management improvements from #343

* Reduce logging in ConfigServer sample (output flooded by placeholder logs otherwise)

* Update SBA port number

Author: bart-vmware

CommonTasks.md

@@ -2,29 +2,37 @@
 
 This page contains information on basic tasks that are used throughout the Steeltoe Samples. Use this page to quickly get your local development environment up and running.
 
+Containers images produced by the Steeltoe team (all images hosted at `steeltoe.azurecr.io`) are *For local development purposes only*. Images are generally very basic and formal support should not be expected. To see how the images are built and/or participate in improving them, visit [this repository](https://github.com/SteeltoeOSS/Dockerfiles).
+
+Feel free to modify these commands as needed, knowing that commands provided in this document will result in:
+
+* The latest available (tag-matching) image being used: `--pull=always`
+* Servers that are automatically removed when the container is stopped: `--rm`
+* An attached pseudo-TTY with STDIN kept open: `-it` [read more](https://docs.docker.com/reference/cli/docker/container/run/#tty)
+* Published ports: `-p <hostPort>:<containerPort>`
+* Named containers: `--name <name>`. If the command has Steeltoe-specific configuration and/or the image was built by the Steeltoe team, the name starts with 'steeltoe-'
+
 ## Spring Cloud Config Server
 
 ### Run SCCS with Docker
 
-The Steeltoe team has built a docker image of a [basic Config server](https://github.com/SteeltoeOSS/Dockerfiles/tree/main/config-server) for an easy experience getting started
-
 To start a config server backed by the Spring Cloud Samples repo:
 
-```bash
-docker run --rm -ti -p 8888:8888 --name steeltoe-config steeltoeoss/config-server
+```shell
+docker run --rm -it --pull=always -p 8888:8888 --name steeltoe-config steeltoe.azurecr.io/config-server
 ```
 
 To start a config server backed by a folder on your local disk, start the docker image like this:
 
-```bash
+```shell
 # Note: Ensure Docker is configured to share host drive/volume so the mount below will work correctly!
-docker run --rm -ti -p 8888:8888 -v $PWD/steeltoe/config-repo:/config --name steeltoe-config steeltoeoss/configserver --spring.profiles.active=native
+docker run --rm -it --pull=always -p 8888:8888 -v $PWD/steeltoe/config-repo:/config --name steeltoe-config steeltoe.azurecr.io/configserver --spring.profiles.active=native
 ```
 
 To start a config server that registers itself with Eureka at startup (discovery-first):
 
-```bash
-docker run --rm -ti -p 8888:8888 --name steeltoe-config -e eureka.client.enabled=true steeltoeoss/config-server
+```shell
+docker run --rm -it --pull=always -p 8888:8888 --name steeltoe-config -e eureka.client.enabled=true steeltoe.azurecr.io/config-server
 ```
 
 ### Run SCCS with Java
@@ -53,14 +61,10 @@ Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Spring Cloud C
 
 ### Run Eureka with Docker
 
-The Steeltoe team has built a docker image of a [basic Eureka server](https://github.com/SteeltoeOSS/Dockerfiles/tree/main/eureka-server) for an easy experience getting started:
-
-```bash
-docker run --rm -ti -p 8761:8761 --name steeltoe-eureka steeltoeoss/eureka-server
+```shell
+docker run --rm -it --pull=always -p 8761:8761 --name steeltoe-eureka steeltoe.azurecr.io/eureka-server
 ```
 
-### Run Eureka with Java
-
 ### Provision Eureka on Cloud Foundry
 
 Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Service Registry service in a org/space.
@@ -69,72 +73,71 @@ Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Service Regist
 1. cf create-service p.service-registry standard myDiscoveryServiceInstanceName
 1. Wait for service to be ready. (use `cf services` to check the status)
 
-## RabbitMQ
-
-### Run RabbitMQ Server with Docker
+## Spring Boot Admin
 
-This command starts a RabbitMQ server with the management plugin enabled with no credentials and default ports:
+### Run Spring Boot Admin Server with Docker
 
-```script
-docker run --rm -ti -p 5672:5672 -p 15672:15672 --name rabbitmq rabbitmq:3-management
+```shell
+docker run --rm -it --pull=always -p 9099:9099 --name steeltoe-SpringBootAdmin steeltoe.azurecr.io/spring-boot-admin
 ```
 
-## Consul
+## HashiCorp Consul
 
-### Run Consul Server with Docker
+### Run HashiCorp Consul Server with Docker
 
-```script
-docker run --rm -ti -p 8500:8500 --name=steeltoe-consul hashicorp/consul
+```shell
+docker run --rm -it --pull=always -p 8500:8500 --name consul hashicorp/consul
 ```
 
-## Spring Boot Admin
-
-### Run Spring Boot Admin Server with Docker
+## MongoDB
 
-There are multiple Spring Boot Admin images to choose from, this is only one option:
+### Run MongoDB Server with Docker
 
-```script
-docker run --rm -it -p 8080:8080 --name steeltoe-springbootadmin steeltoeoss/spring-boot-admin
+```shell
+docker run --rm -it --pull=always -p 27017:27017 --name mongo mongo
 ```
 
-## Redis
+## MySQL
 
-### Run Redis server with Docker
+### Run MySQL Server with Docker
 
-```script
-docker run --rm -ti -p 6379:6379 --name redis redis
+```shell
+docker run --rm -it --pull=always -p 3306:3306 --name steeltoe-mysql -e MYSQL_ROOT_PASSWORD=steeltoe -e MYSQL_DATABASE=steeltoe -e MYSQL_USER=steeltoe -e MYSQL_PASSWORD=steeltoe mysql
 ```
 
-## MySQL
+## PostgreSQL
 
-### Run MySQL Server with Docker
+### Run PostgreSQL Server with Docker
 
-```script
-docker run --rm -ti -p 3306:3306 --name steeltoe-mysql -e MYSQL_ROOT_PASSWORD=steeltoe -e MYSQL_DATABASE=steeltoe -e MYSQL_USER=steeltoe -e MYSQL_PASSWORD=steeltoe mysql
+```shell
+docker run --rm -it --pull=always -p 5432:5432 --name steeltoe-postgres -e POSTGRES_DB=steeltoe -e POSTGRES_USER=steeltoe -e POSTGRES_PASSWORD=steeltoe postgres:alpine
 ```
 
-## SQL Server
+## RabbitMQ
 
-### Run SQL Server with Docker
+### Run RabbitMQ Server with Docker
 
-```script
-docker run --rm -ti -p 1433:1433 --name steeltoe-sqlserver -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=St33ltoeR0cks!' mcr.microsoft.com/mssql/server
+> [!NOTE]  
+> This image has the management plugin enabled and no credentials set.
+
+```shell
+docker run --rm -it --pull=always -p 5672:5672 -p 15672:15672 --name rabbitmq rabbitmq:3-management
 ```
 
-## PostgreSQL
+## Redis
 
-### Run PostgreSQL Server with Docker
+### Run Redis server with Docker
 
-```script
-docker run --rm -ti -p 5432:5432 --name steeltoe-postgres -e POSTGRES_DB=steeltoe -e POSTGRES_USER=steeltoe -e POSTGRES_PASSWORD=steeltoe postgres:alpine
+```shell
+docker run --rm -it --pull=always -p 6379:6379 --name redis redis
 ```
 
-## MongoDB
+## SQL Server
 
-### Run MongoDB Server with Docker
+### Run SQL Server with Docker
 
-```script
-docker run --rm -ti -p 27017:27017 --name mongoserver mongo
+```shell
+docker run --rm -it --pull=always -p 1433:1433 --name mssql -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=St33ltoeR0cks!' mcr.microsoft.com/mssql/server
 ```
 
 ## UAA Server for Steeltoe Samples
@@ -143,8 +146,8 @@ The Steeltoe team has created a [UAA configuration](https://github.com/SteeltoeO
 
 ### Run UAA Server with Docker
 
-```script
-docker run --rm -it -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77.10
+```shell
+docker run --rm -it --pull=always -p 8080:8080 --name steeltoe-uaa steeltoe.azurecr.io/uaa-server:77.10
 ```
 
 ### Run Steeltoe UAA on Cloud Foundry
@@ -155,6 +158,6 @@ Refer to the [README in the Dockerfiles repository](https://github.com/SteeltoeO
 
 ### Run Zipkin Server with Docker
 
-```script
-docker run --rm -ti -p 9411:9411 --name zipkin openzipkin/zipkin
+```shell
+docker run --rm -it --pull=always -p 9411:9411 --name zipkin openzipkin/zipkin
 ```

Configuration/src/ConfigurationProviders/Program.cs

@@ -4,7 +4,7 @@
 using Steeltoe.Configuration.Kubernetes.ServiceBindings;
 using Steeltoe.Configuration.Placeholder;
 using Steeltoe.Configuration.RandomValue;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.ConfigurationProviders.Models;
 
 // Steeltoe: Log to the console until the app has fully started.
@@ -32,7 +32,7 @@
 builder.Services.UpgradeBootstrapLoggerFactory(bootstrapLoggerFactory);
 
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: map VCAP_APPLICATION and VCAP_SERVICES to IOptions<CloudFoundryApplicationOptions> and IOptions<CloudFoundryServicesOptions>
 builder.Services.AddCloudFoundryOptions();

Configuration/src/ConfigurationProviders/appsettings.json

@@ -5,7 +5,7 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning",
-      "Steeltoe.Configuration": "Trace"
+      "Steeltoe.Configuration": "Debug"
     }
   },
   "AllowedHosts": "*",

Configuration/src/Steeltoe.Samples.Configuration.sln.DotSettings

@@ -87,6 +87,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSequenceEqualWithConstantPattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSliceWithRangeIndexer/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSubstringWithRangeIndexer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithPrimaryConstructorParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyStringComparison/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
@@ -105,6 +106,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/ReplaceWithPrimaryConstructorParameter/PreserveReadonlyModifier/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">SUGGESTION</s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertForInterfaceTargetTypes/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Steeltoe_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Steeltoe Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Steeltoe Full Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
@@ -612,6 +614,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>

Connectors/src/CosmosDb/Program.cs

@@ -1,16 +1,20 @@
 using Microsoft.Azure.Cosmos.Fluent;
 using Microsoft.Extensions.Options;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.CosmosDb;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.CosmosDb;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup CosmosDB options, connection factory and health checks.
 builder.AddCosmosDb(null, addOptions =>

Connectors/src/MongoDb/Program.cs

@@ -1,15 +1,19 @@
 using MongoDB.Driver;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.MongoDb;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.MongoDb;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup MongoDB options, connection factory and health checks.
 builder.AddMongoDb();

Connectors/src/MySql/Program.cs

@@ -1,15 +1,19 @@
 using MySqlConnector;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.MySql;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.MySql;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup MySQL options, connection factory and health checks.
 builder.AddMySql();

Connectors/src/MySqlEFCore/Program.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.EntityFrameworkCore.MySql;
 using Steeltoe.Connectors.MySql;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.MySqlEFCore;
 using Steeltoe.Samples.MySqlEFCore.Data;
 
@@ -10,8 +11,11 @@
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup MySQL options, connection factory and health checks.
 builder.AddMySql();

Connectors/src/PostgreSql/Program.cs

@@ -1,15 +1,19 @@
 using Npgsql;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.PostgreSql;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.PostgreSql;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup PostgreSQL options, connection factory and health checks.
 builder.AddPostgreSql();

Connectors/src/PostgreSqlEFCore/Program.cs

@@ -1,8 +1,9 @@
 using Npgsql;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.EntityFrameworkCore.PostgreSql;
 using Steeltoe.Connectors.PostgreSql;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 using Steeltoe.Samples.PostgreSqlEFCore;
 using Steeltoe.Samples.PostgreSqlEFCore.Data;
 
@@ -11,8 +12,11 @@
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup PostgreSQL options, connection factory and health checks.
 builder.AddPostgreSql();

Connectors/src/RabbitMQ/Program.cs

@@ -1,15 +1,19 @@
 using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
+using Steeltoe.Configuration.CloudFoundry;
 using Steeltoe.Connectors.RabbitMQ;
-using Steeltoe.Management.Endpoint;
+using Steeltoe.Management.Endpoint.Actuators.All;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Steeltoe: Add Cloud Foundry Configuration Provider for Actuator integration (not required for connectors).
+builder.AddCloudFoundryConfiguration();
+
 // Steeltoe: Add actuator endpoints.
-builder.AddAllActuators();
+builder.Services.AddAllActuators();
 
 // Steeltoe: Setup RabbitMQ options, connection factory and health checks.
 builder.AddRabbitMQ(null, addOptions =>