Update cf create-service commands, fix cloud brokers

Author: bart-vmware

CommonTasks.md

@@ -2,13 +2,13 @@
 
 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).
+Container 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)
+* An attached pseudo-TTY with STDIN that is 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-'
 
@@ -22,7 +22,7 @@ To start a config server backed by the Spring Cloud Samples repo:
 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:
+To start a config server backed by a folder on your local disk, start a Docker container like this:
 
 ```shell
 # Note: Ensure Docker is configured to share host drive/volume so the mount below will work correctly!
@@ -45,17 +45,22 @@ To run a Spring Cloud Config Server without Docker:
 1. Build the source: `.\mvnw install -DskipTests`
 1. Start the server: `.\mvnw spring-boot:run`
 
-The default configuration of the Config Server uses [this github repo](https://github.com/spring-cloud-samples/config-repo) for its source of configuration data.
+The default configuration of the Config Server uses [this GitHub repo](https://github.com/spring-cloud-samples/config-repo) for its source of configuration data.
 
 ### Provision SCCS on Cloud Foundry
 
-Use the [Cloud Foundry CLI](https://github.com/cloudfoundry/cli) to create a Spring Cloud Config Server in an org/space, backed by a given git repo. Many of the Steeltoe samples use the `spring-cloud-samples` repo, but you may need to alter the parameter used.
+Use the [Cloud Foundry CLI](https://github.com/cloudfoundry/cli) to create a Spring Cloud Config Server instance in an org/space, backed by a given git repo. Many of the Steeltoe samples use the `spring-cloud-samples` repo, but you may need to alter the parameter used.
 
-1. `cf target -o myorg -s myspace`
+1. Choose a service plan
+   ```shell
+   cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
+   ```
 1. Use the correct escaping for your shell:
-   1. bash or PowerShell: `cf create-service p-config-server standard myConfigServerInstanceName -c '{"git":{"uri": "https://github.com/spring-cloud-samples/config-repo"}}'`
-   1. CMD: `cf create-service p.config-server standard myConfigServerInstanceName -c "{\"git\":{\"uri\":\"https://github.com/spring-cloud-samples/config-repo\"}}"`
-1. Wait for service to be ready. (use `cf services` to check the status)
+   1. bash or PowerShell: `cf create-service p.config-server your-plan sampleConfigServer -c '{"git":{"uri": "https://github.com/spring-cloud-samples/config-repo"}}'`
+   1. cmd: `cf create-service p.config-server your-plan sampleConfigServer -c "{\"git\":{\"uri\":\"https://github.com/spring-cloud-samples/config-repo\"}}"`
+1. Wait for the service to be ready (use `cf services` to check the status)
 
 ## Spring Cloud Eureka Server
 
@@ -67,11 +72,16 @@ docker run --rm -it --pull=always -p 8761:8761 --name steeltoe-eureka steeltoe.a
 
 ### Provision Eureka on Cloud Foundry
 
-Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Service Registry service in a org/space.
+Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Service Registry instance in an org/space.
 
-1. cf target -o myorg -s myspace
-1. cf create-service p.service-registry standard myDiscoveryServiceInstanceName
-1. Wait for service to be ready. (use `cf services` to check the status)
+1. Choose a service plan
+   ```shell
+   cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
+   ```
+1. `cf create-service p.service-registry your-plan sampleDiscoveryService`
+1. Wait for the service to be ready (use `cf services` to check the status)
 
 ## Spring Boot Admin
 

Connectors/src/MongoDb/README.md

@@ -28,6 +28,8 @@ Upon startup, the app inserts a couple of objects into the bound MongoDB databas
 1. Create a MongoDB service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    cf create-service csb-azure-mongodb your-plan sampleMongoDbService
    ```
 1. Wait for the service to become ready (you can check with `cf services`)
@@ -49,7 +51,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-mongodb-service --class mongodb-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/MySql/README.md

@@ -35,10 +35,12 @@ Upon startup, the app inserts a couple of rows into the bound MySQL database. Th
 1. Create a MySQL service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
    - When using Tanzu for MySQL on Cloud Foundry:
      ```shell
-     cf create-service p.mysql db-small sampleMySqlService
+     cf create-service p.mysql your-plan sampleMySqlService
      ```
    - When using Tanzu Cloud Service Broker for GCP:
      ```shell
@@ -67,7 +69,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-mysql-service --class mysql-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/MySqlEFCore/README.md

@@ -34,10 +34,12 @@ Upon startup, the app inserts a couple of rows into the bound MySQL database. Th
 1. Create a MySQL service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
    - When using Tanzu for MySQL on Cloud Foundry:
      ```shell
-     cf create-service p.mysql db-small sampleMySqlService
+     cf create-service p.mysql your-plan sampleMySqlService
      ```
    - When using Tanzu Cloud Service Broker for GCP:
      ```shell
@@ -66,7 +68,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-mysql-service --class mysql-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/PostgreSql/README.md

@@ -35,10 +35,12 @@ Upon startup, the app inserts a couple of rows into the bound PostgreSQL databas
 1. Create a PostgreSQL service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
    - When using Tanzu for Postgres on Cloud Foundry:
      ```shell
-     cf create-service postgres small samplePostgreSqlService
+     cf create-service postgres your-plan samplePostgreSqlService
      ```
    - When using Tanzu Cloud Service Broker for GCP:
      ```shell
@@ -67,7 +69,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-postgresql-service --class postgresql-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/PostgreSqlEFCore/README.md

@@ -34,10 +34,12 @@ Upon startup, the app inserts a couple of rows into the bound PostgreSQL databas
 1. Create a PostgreSQL service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
    - When using Tanzu for Postgres on Cloud Foundry:
      ```shell
-     cf create-service postgres small samplePostgreSqlService
+     cf create-service postgres your-plan samplePostgreSqlService
      ```
    - When using Tanzu Cloud Service Broker for GCP:
      ```shell
@@ -66,7 +68,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-postgresql-service --class postgresql-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/RabbitMQ/README.md

@@ -30,7 +30,9 @@ To receive a RabbitMQ message that you have sent: click the Receive button. Mess
 1. Create a RabbitMQ service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
-   cf create-service p.rabbitmq rmq-single-node sampleRabbitMQService
+   cf marketplace
+   cf marketplace -e your-offering
+   cf create-service p.rabbitmq your-plan sampleRabbitMQService
    ```
 1. Wait for the service to become ready (you can check with `cf services`)
 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs rabbitmq-connector-sample`)
@@ -51,7 +53,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create sample-rabbitmq-service --class rabbitmq-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/Redis/README.md

@@ -22,7 +22,7 @@ This sample uses [StackExchange.Redis](https://www.nuget.org/packages/StackExcha
    and [Tanzu CLI](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/install-tanzu-cli.html)
 
 > [!NOTE]
-> Versions of ASP.NET before v9 require that Lua scripting is activated, which is disabled by default on Cloud Foundry, so check your plan settings.
+> Versions of ASP.NET Core before v9 require that Lua scripting is activated, which is disabled by default on Cloud Foundry, so check your plan settings.
 
 ## Running locally
 
@@ -39,14 +39,12 @@ Upon startup, the app inserts a couple of key/value pairs into the bound Redis/V
 1. Create a Redis service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
-   - When using Redis for Tanzu Application Service:
+   - When using Redis for Tanzu Application Service or Tanzu for Valkey on Cloud Foundry:
      ```shell
-     cf create-service p-redis shared-vm sampleRedisService
-     ```
-  - When using Tanzu for Valkey on Cloud Foundry:
-     ```shell
-     cf create-service p.redis vk-plan sampleRedisService
+     cf create-service p.redis your-plan sampleRedisService
      ```
    - When using Tanzu Cloud Service Broker for Microsoft Azure:
      ```shell
@@ -75,7 +73,7 @@ in the `workload.yaml` that is included in the `config` folder of this project.
 
 ```shell
 kubectl config set-context --current --namespace=your-namespace
-tanzu service class-claim create my-postgresql-service --class postgresql-unmanaged
+tanzu service class-claim create example-redis-service --class redis-unmanaged
 ```
 
 If you'd like to learn more about these services, see [claiming services](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-application-platform/1-12/tap/getting-started-claim-services.html)

Connectors/src/SqlServerEFCore/README.md

@@ -31,14 +31,16 @@ Upon startup, the app inserts a couple of rows into the bound SQL Server databas
 1. Create a SQL Server service instance in an org/space
    ```shell
    cf target -o your-org -s your-space
+   cf marketplace
+   cf marketplace -e your-offering
    ```
    - When using Tanzu Cloud Service Broker for Microsoft Azure:
      ```shell
      cf create-service csb-azure-mssql-db your-plan sampleSqlServerService
      ```
    - When using Tanzu Cloud Service Broker for AWS:
      ```shell
-     cf create-service csb-aws-mssql your-plan samplePostgreSqlService
+     cf create-service csb-aws-mssql your-plan sampleSqlServerService
      ```
 1. Wait for the service to become ready (you can check with `cf services`)
 1. Run the `cf push` command to deploy from source (you can monitor logs with `cf logs sqlserver-efcore-connector-sample`)

Discovery/src/FortuneTeller/README.md

@@ -134,7 +134,9 @@ This variant uses service instances that are registered in [Spring Cloud Eureka]
 1. Create a Eureka service instance in an org/space:
    ```shell
    cf target -o your-org -s your-space
-   cf create-service p.service-registry standard sampleDiscoveryService
+   cf marketplace
+   cf marketplace -e your-offering
+   cf create-service p.service-registry your-plan sampleDiscoveryService
    ```
 1. Wait for the service to become ready (you can check with `cf services`)
 1. Run the `cf push` command from the FortuneTellerApi directory, wait until it has started, then run it from the FortuneTellerWeb directory