Merge pull request #277185 from KarlErickson/karler-flex

removed single-server pivots/tabs

Author: ShannonLeavitt

articles/app-service/tutorial-java-tomcat-connect-managed-identity-postgresql-database.md

@@ -3,7 +3,7 @@ title: 'Tutorial: Access data with managed identity in Java'
 description: Secure Azure Database for PostgreSQL connectivity with managed identity from a sample Java Tomcat app, and apply it to other Azure services.
 ms.devlang: java
 ms.topic: tutorial
-ms.date: 10/11/2023
+ms.date: 06/04/2024
 author: KarlErickson
 ms.author: karler
 ms.custom: passwordless-java, service-connector, devx-track-azurecli, devx-track-extended-java, AppServiceConnectivity
@@ -59,8 +59,6 @@ Follow these steps to create an Azure Database for Postgres in your subscription
 
 1. Create an Azure Database for PostgreSQL server. The server is created with an administrator account, but it isn't used because we're going to use the Microsoft Entra admin account to perform administrative tasks.
 
-   ### [Flexible Server](#tab/flexible)
-
    ```azurecli-interactive
    export POSTGRESQL_ADMIN_USER=azureuser
    # PostgreSQL admin access rights won't be used because Azure AD authentication is leveraged to administer the database.
@@ -78,29 +76,8 @@ Follow these steps to create an Azure Database for Postgres in your subscription
        --sku-name Standard_D2s_v3
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```azurecli-interactive
-   export POSTGRESQL_ADMIN_USER=azureuser
-   # PostgreSQL admin access rights won't be used because Azure AD authentication is leveraged to administer the database.
-   export POSTGRESQL_ADMIN_PASSWORD=<admin-password>
-   export POSTGRESQL_HOST=<postgresql-host-name>
-
-   # Create a PostgreSQL server.
-   az postgres server create \
-       --resource-group $RESOURCE_GROUP \
-       --name $POSTGRESQL_HOST \
-       --location $LOCATION \
-       --admin-user $POSTGRESQL_ADMIN_USER \
-       --admin-password $POSTGRESQL_ADMIN_PASSWORD \
-       --public-access 0.0.0.0 \
-       --sku-name B_Gen5_1
-   ```
-
 1. Create a database for the application.
 
-   ### [Flexible Server](#tab/flexible)
-
    ```azurecli-interactive
    export DATABASE_NAME=checklist
 
@@ -110,17 +87,6 @@ Follow these steps to create an Azure Database for Postgres in your subscription
        --database-name $DATABASE_NAME
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```azurecli-interactive
-   export DATABASE_NAME=checklist
-
-   az postgres db create \
-       --resource-group $RESOURCE_GROUP \
-       --server-name $POSTGRESQL_HOST \
-       --name $DATABASE_NAME
-   ```
-
 ## Deploy the application to App Service
 
 Follow these steps to build a WAR file and deploy to Azure App Service on Tomcat using a WAR packaging.
@@ -174,8 +140,6 @@ az extension add --name serviceconnector-passwordless --upgrade
 
 Then, connect your app to a Postgres database with a system-assigned managed identity using Service Connector.
 
-### [Flexible Server](#tab/flexible)
-
 To make this connection, run the [az webapp connection create](/cli/azure/webapp/connection/create#az-webapp-connection-create-postgres-flexible) command.
 
 ```azurecli-interactive
@@ -189,23 +153,6 @@ az webapp connection create postgres-flexible \
     --client-type java
 ```
 
-### [Single Server](#tab/single)
-
-To make this connection, run the [az webapp connection create](/cli/azure/webapp/connection/create#az-webapp-connection-create-postgres) command.
-
-```azurecli-interactive
-az webapp connection create postgres \
-    --resource-group $RESOURCE_GROUP \
-    --name $APPSERVICE_NAME \
-    --target-resource-group $RESOURCE_GROUP \
-    --server $POSTGRESQL_HOST \
-    --database $DATABASE_NAME \
-    --system-identity \
-    --client-type java
-```
-
----
-
 This command creates a connection between your web app and your PostgreSQL server, and manages authentication through a system-assigned managed identity.
 
 Next, update App Settings and add plugin in connection string

articles/container-apps/tutorial-java-quarkus-connect-managed-identity-postgresql-database.md

@@ -6,7 +6,7 @@ author: KarlErickson
 ms.topic: tutorial
 ms.author: karler
 ms.service: container-apps
-ms.date: 09/26/2022
+ms.date: 06/04/2024
 ms.custom: devx-track-azurecli, devx-track-extended-java, devx-track-java, devx-track-javaee, devx-track-javaee-quarkus, passwordless-java, service-connector, devx-track-javaee-quarkus-aca
 ---
 
@@ -84,8 +84,6 @@ cd quarkus-quickstarts/hibernate-orm-panache-quickstart
 
    Delete the existing content in *application.properties* and replace with the following to configure the database for dev, test, and production modes:
 
-   ### [Flexible Server](#tab/flexible)
-
    ```properties
    quarkus.package.type=uber-jar
 
@@ -145,67 +143,6 @@ cd quarkus-quickstarts/hibernate-orm-panache-quickstart
    io.netty:netty-transport-native-unix-common::jar
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```properties
-   quarkus.package.type=uber-jar
-
-   quarkus.hibernate-orm.database.generation=drop-and-create
-   quarkus.datasource.db-kind=postgresql
-   quarkus.datasource.jdbc.max-size=8
-   quarkus.datasource.jdbc.min-size=2
-   quarkus.hibernate-orm.log.sql=true
-   quarkus.hibernate-orm.sql-load-script=import.sql
-   quarkus.datasource.jdbc.acquisition-timeout = 10
-
-   %dev.quarkus.datasource.username=${AZURE_CLIENT_NAME}@${DBHOST}
-   %dev.quarkus.datasource.jdbc.url=jdbc:postgresql://${DBHOST}.postgres.database.azure.com:5432/${DBNAME}?\
-   authenticationPluginClassName=com.azure.identity.providers.postgresql.AzureIdentityPostgresqlAuthenticationPlugin\
-   &sslmode=require\
-   &azure.clientId=${AZURE_CLIENT_ID}\
-   &azure.clientSecret=${AZURE_CLIENT_SECRET}\
-   &azure.tenantId=${AZURE_TENANT_ID}
-
-   %prod.quarkus.datasource.username=${AZURE_MI_NAME}@${DBHOST}
-   %prod.quarkus.datasource.jdbc.url=jdbc:postgresql://${DBHOST}.postgres.database.azure.com:5432/${DBNAME}?\
-   authenticationPluginClassName=com.azure.identity.providers.postgresql.AzureIdentityPostgresqlAuthenticationPlugin\
-   &sslmode=require
-
-   %dev.quarkus.class-loading.parent-first-artifacts=com.azure:azure-core::jar,\
-   com.azure:azure-core-http-netty::jar,\
-   io.projectreactor.netty:reactor-netty-core::jar,\
-   io.projectreactor.netty:reactor-netty-http::jar,\
-   io.netty:netty-resolver-dns::jar,\
-   io.netty:netty-codec::jar,\
-   io.netty:netty-codec-http::jar,\
-   io.netty:netty-codec-http2::jar,\
-   io.netty:netty-handler::jar,\
-   io.netty:netty-resolver::jar,\
-   io.netty:netty-common::jar,\
-   io.netty:netty-transport::jar,\
-   io.netty:netty-buffer::jar,\
-   com.azure:azure-identity::jar,\
-   com.azure:azure-identity-providers-core::jar,\
-   com.azure:azure-identity-providers-jdbc-postgresql::jar,\
-   com.fasterxml.jackson.core:jackson-core::jar,\
-   com.fasterxml.jackson.core:jackson-annotations::jar,\
-   com.fasterxml.jackson.core:jackson-databind::jar,\
-   com.fasterxml.jackson.dataformat:jackson-dataformat-xml::jar,\
-   com.fasterxml.jackson.datatype:jackson-datatype-jsr310::jar,\
-   org.reactivestreams:reactive-streams::jar,\
-   io.projectreactor:reactor-core::jar,\
-   com.microsoft.azure:msal4j::jar,\
-   com.microsoft.azure:msal4j-persistence-extension::jar,\
-   org.codehaus.woodstox:stax2-api::jar,\
-   com.fasterxml.woodstox:woodstox-core::jar,\
-   com.nimbusds:oauth2-oidc-sdk::jar,\
-   com.nimbusds:content-type::jar,\
-   com.nimbusds:nimbus-jose-jwt::jar,\
-   net.minidev:json-smart::jar,\
-   net.minidev:accessors-smart::jar,\
-   io.netty:netty-transport-native-unix-common::jar
-   ```
-
 ### Build and push a Docker image to the container registry
 
 1. Build the container image.
@@ -274,8 +211,6 @@ Next, create a PostgreSQL Database and configure your container app to connect t
 
 1. Create the database service.
 
-   ### [Flexible Server](#tab/flexible)
-
    ```azurecli-interactive
    DB_SERVER_NAME='msdocs-quarkus-postgres-webapp-db'
    ADMIN_USERNAME='demoadmin'
@@ -290,24 +225,6 @@ Next, create a PostgreSQL Database and configure your container app to connect t
        --sku-name GP_Gen5_2
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```azurecli-interactive
-   DB_SERVER_NAME='msdocs-quarkus-postgres-webapp-db'
-   ADMIN_USERNAME='demoadmin'
-   ADMIN_PASSWORD='<admin-password>'
-
-   az postgres server create \
-       --resource-group $RESOURCE_GROUP \
-       --name $DB_SERVER_NAME \
-       --location $LOCATION \
-       --admin-user $DB_USERNAME \
-       --admin-password $DB_PASSWORD \
-       --sku-name GP_Gen5_2
-   ```
-
-   ---
-
    The following parameters are used in the above Azure CLI command:
 
    * *resource-group* &rarr; Use the same resource group name in which you created the web app, for example `msdocs-quarkus-postgres-webapp-rg`.
@@ -324,24 +241,13 @@ Next, create a PostgreSQL Database and configure your container app to connect t
 
 1. Create a database named `fruits` within the PostgreSQL service with this command:
 
-   ### [Flexible Server](#tab/flexible)
-
    ```azurecli-interactive
    az postgres flexible-server db create \
        --resource-group $RESOURCE_GROUP \
        --server-name $DB_SERVER_NAME \
        --database-name fruits
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```azurecli-interactive
-   az postgres db create \
-       --resource-group $RESOURCE_GROUP \
-       --server-name $DB_SERVER_NAME \
-       --name fruits
-   ```
-
 1. Install the [Service Connector](../service-connector/overview.md) passwordless extension for the Azure CLI:
 
    ```azurecli-interactive
@@ -350,8 +256,6 @@ Next, create a PostgreSQL Database and configure your container app to connect t
 
 1. Connect the database to the container app with a system-assigned managed identity, using the connection command.
 
-   ### [Flexible Server](#tab/flexible)
-
    ```azurecli-interactive
    az containerapp connection create postgres-flexible \
        --resource-group $RESOURCE_GROUP \
@@ -362,18 +266,6 @@ Next, create a PostgreSQL Database and configure your container app to connect t
        --managed-identity
    ```
 
-   ### [Single Server](#tab/single)
-
-   ```azurecli-interactive
-   az containerapp connection create postgres \
-       --resource-group $RESOURCE_GROUP \
-       --name my-container-app \
-       --target-resource-group $RESOURCE_GROUP \
-       --server $DB_SERVER_NAME \
-       --database fruits \
-       --managed-identity
-   ```
-
 ## 6. Review your changes
 
 You can find the application URL(FQDN) by using the following command:

articles/spring-apps/consumption-dedicated/quickstart-provision-standard-consumption-app-environment-with-virtual-network.md

@@ -183,7 +183,7 @@ Use the following steps to create an Azure Spring Apps instance in an Azure Cont
 1. At this point, you've created an Azure Container Apps environment with a default standard consumption workload profile. You can also add a dedicated workload profile to the same Azure Container Apps environment with the following command:
 
    ```azurecli
-   az containerapp env workload-profile set \
+   az containerapp env workload-profile add \
        --resource-group $RESOURCE_GROUP \
        --name $AZURE_CONTAINER_APPS_ENVIRONMENT
        --workload-profile-name my-wlp \

articles/spring-apps/consumption-dedicated/quickstart-provision-standard-consumption-service-instance.md

@@ -143,7 +143,7 @@ You can create the Azure Container Apps environment in one of two ways:
 1. At this point, you've created an Azure Container Apps environment with a default standard consumption workload profile. You can also add a dedicated workload profile to the same Azure Container Apps environment by using the following command:
 
    ```azurecli
-   az containerapp env workload-profile set \
+   az containerapp env workload-profile add \
        --resource-group $RESOURCE_GROUP \
        --name $AZURE_CONTAINER_APPS_ENVIRONMENT \
        --workload-profile-name my-wlp \