diff --git a/.github/workflows/mlc_config.json b/.github/workflows/mlc_config.json index 2a8e642c..411530ff 100644 --- a/.github/workflows/mlc_config.json +++ b/.github/workflows/mlc_config.json @@ -25,5 +25,5 @@ "pattern": "^https://github.com/Azure-Samples/acme-fitness-store/invitations" } ], - "aliveStatusCodes": [200] + "aliveStatusCodes": [0, 200, 302] } \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c673bad..1cb8d4d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,6 @@ VMware uses GitHub and accepts code contributions via [pull requests](https://help.github.com/articles/using-pull-requests). If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue when you open a Pull Request. -For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq). Follow these steps to make a contribution to any of our open source repositories: @@ -21,4 +20,4 @@ Notes: * All contributions need to be sent using GitHub Pull Requests, preferably consisting of a single commit * Tests are required for any changes * We favor small pull requests with a single clearly-defined purpose -* Your pull request is much more likely to be accepted if it has a clear log message which conveys the intent of your change \ No newline at end of file +* Your pull request is much more likely to be accepted if it has a clear log message which conveys the intent of your change diff --git a/azure-spring-apps-enterprise/README.md b/azure-spring-apps-enterprise/README.md index 140585c9..32ef571a 100644 --- a/azure-spring-apps-enterprise/README.md +++ b/azure-spring-apps-enterprise/README.md @@ -62,13 +62,13 @@ This application is composed of several services: In order to deploy a Java app to cloud, you need an Azure subscription. If you do not already have an Azure subscription, you can activate your -[MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) +[MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/) or sign up for a -[free Azure account](https://azure.microsoft.com/free/). +[free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account). In addition, you will need the following: -| [Azure CLI version 2.50.0 or higher](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) +| [Azure CLI version 2.50.0 or higher](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) | [Git](https://git-scm.com/) | [`jq` utility](https://stedolan.github.io/jq/download/) | @@ -125,7 +125,7 @@ az extension remove --name spring-cloud az extension remove --name spring az extension add --name spring ``` -If `spring`'s version still < `1.14.0` after above commands, you can try to [re-install Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli). +If `spring`'s version still < `1.14.0` after above commands, you can try to [re-install Azure CLI](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli). ## Clone the repo @@ -194,7 +194,7 @@ export LOG_ANALYTICS_WORKSPACE=log-analytics-name # existing workspace or one export REGION=region-name # choose a region with Enterprise tier support ``` -The REGION value should be one of available regions for Azure Spring Apps (e.g. eastus). Please visit [here](https://azure.microsoft.com/en-us/global-infrastructure/services/?products=spring-apps®ions=all) for all available regions for Azure Spring Apps. +The REGION value should be one of available regions for Azure Spring Apps (e.g. eastus). Please visit [here](https://azure.microsoft.com/explore/global-infrastructure/products-by-region) for all available regions for Azure Spring Apps. Then, set the environment: @@ -596,7 +596,7 @@ az ad app credential reset --id ${APPLICATION_ID} --append > ../resources/json/s az ad sp create --id ${APPLICATION_ID} ``` -More detailed instructions on Application Registrations can be found [here](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) +More detailed instructions on Application Registrations can be found [here](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) ### Prepare your environment for SSO Deployments @@ -631,7 +631,7 @@ az ad app update --id ${APPLICATION_ID} \ --web-redirect-uris "https://${GATEWAY_URL}/login/oauth2/code/sso" "https://${PORTAL_URL}/oauth2-redirect.html" "https://${PORTAL_URL}/login/oauth2/code/sso" ``` -Detailed information about redirect URIs can be found [here](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri). +Detailed information about redirect URIs can be found [here](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri). ### Using an Existing SSO Identity Provider @@ -1688,7 +1688,7 @@ az ad sp create-for-rbac --name "change-me" \ ### Add Secrets to GitHub Actions -> Detailed instructions for adding secrets to GitHub Actions can be found [here](https://docs.microsoft.com/azure/spring-cloud/how-to-github-actions?pivots=programming-language-java#set-up-github-repository-and-authenticate-1). +> Detailed instructions for adding secrets to GitHub Actions can be found [here](https://learn.microsoft.com/azure/spring-apps/how-to-github-actions?pivots=programming-language-java#set-up-github-repository-and-authenticate-1). Add the following secrets (8x) to GitHub Actions: @@ -1925,11 +1925,11 @@ In this quickstart, you've deployed polyglot applications to Azure Spring Apps u You also configured VMware Tanzu components in the enterprise tier. To learn more about Azure Spring Apps or VMware Tanzu components, go to: -* [Azure Spring Apps](https://azure.microsoft.com/en-us/services/spring-cloud/) -* [Azure Spring Apps docs](https://docs.microsoft.com/en-us/azure/spring-cloud/quickstart-provision-service-instance-enterprise?tabs=azure-portal) +* [Azure Spring Apps](https://azure.microsoft.com/services/spring-apps/) +* [Azure Spring Apps docs](https://learn.microsoft.com/azure/spring-apps/enterprise/) * [Deploy Spring Apps from scratch](https://github.com/microsoft/azure-spring-cloud-training) * [Deploy existing Spring Apps](https://github.com/Azure-Samples/azure-spring-cloud) -* [Azure for Java Cloud Developers](https://docs.microsoft.com/en-us/azure/java/) +* [Azure for Java Cloud Developers](https://learn.microsoft.com/azure/java/) * [Spring Cloud Azure](https://spring.io/projects/spring-cloud-azure) * [Spring Cloud](https://spring.io/projects/spring-cloud) * [Spring Cloud Gateway](https://docs.vmware.com/en/VMware-Spring-Cloud-Gateway-for-Kubernetes/index.html) diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/README.md b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/README.md index 5236eeb6..fda32fde 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/README.md +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/README.md @@ -59,11 +59,11 @@ Azure Spring Apps Enterprise を使用すると、Azure 上で Spring Boot ア ## 事前準備 -Azure 上に Java アプリケーションをデプロイするため、Azure サブスクリプションが必要です。 Azure のアカウントをお持ちでない場合、[MSDN サブスクライバーの特典](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/)を有効にするか、もしくは[無料の Azure アカウント](https://azure.microsoft.com/free/)を作成してください。 +Azure 上に Java アプリケーションをデプロイするため、Azure サブスクリプションが必要です。 Azure のアカウントをお持ちでない場合、[MSDN サブスクライバーの特典](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/)を有効にするか、もしくは[無料の Azure アカウント](https://azure.microsoft.com/pricing/purchase-options/azure-account)を作成してください。 さらに、次のものが必要になります。 -| [Azure CLI version 2.50.0 以降](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) +| [Azure CLI version 2.50.0 以降](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) | [Git](https://git-scm.com/) | [`jq` コマンド](https://stedolan.github.io/jq/download/) | @@ -108,7 +108,7 @@ az extension remove --name spring az extension add --name spring ``` -上記のコマンドを実装した後、`spring` のバージョンが `1.14.0` 以上になっているかを確認してください。更新されていない場合は、[Azure CLI の再インストール](https://docs.microsoft.com/ja-jp/cli/azure/install-azure-cli)を試してください。 +上記のコマンドを実装した後、`spring` のバージョンが `1.14.0` 以上になっているかを確認してください。更新されていない場合は、[Azure CLI の再インストール](https://learn.microsoft.com/ja-jp/cli/azure/install-azure-cli)を試してください。 ## レポジトリを Clone @@ -175,7 +175,7 @@ export LOG_ANALYTICS_WORKSPACE=log-analytics-name # existing workspace or one export REGION=region-name # choose a region with Enterprise tier support ``` -REGION の値は、Azure Spring Apps が利用可能なリージョン (eastus など) を設定する必要があります。Azure Spring アプリで利用可能なすべてのリージョンについては、[こちら](https://azure.microsoft.com/en-us/global-infrastructure/services/?products=spring-apps®ions=all)を参照してください。 +REGION の値は、Azure Spring Apps が利用可能なリージョン (eastus など) を設定する必要があります。Azure Spring アプリで利用可能なすべてのリージョンについては、[こちら](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/)を参照してください。 次に、source コマンドで環境を設定します。 @@ -573,7 +573,7 @@ az ad app credential reset --id ${APPLICATION_ID} --append > ../resources/json/s az ad sp create --id ${APPLICATION_ID} ``` -アプリケーションの登録に関する詳細な手順については、[こちら](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app)を参照してください。 +アプリケーションの登録に関する詳細な手順については、[こちら](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app)を参照してください。 ### SSO デプロイのための環境の準備 @@ -608,7 +608,7 @@ az ad app update --id ${APPLICATION_ID} \ --web-redirect-uris "https://${GATEWAY_URL}/login/oauth2/code/sso" "https://${PORTAL_URL}/oauth2-redirect.html" "https://${PORTAL_URL}/login/oauth2/code/sso" ``` -リダイレクト URI の詳細については、[こちら](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri)を参照してください。 +リダイレクト URI の詳細については、[こちら](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri)を参照してください。 ### 既存の SSO ID プロバイダーの使用 @@ -1669,7 +1669,7 @@ az ad sp create-for-rbac --name "change-me" \ ### GitHub Actions にシークレットを追加 -> GitHub Actions にシークレットを追加する詳細な手順については、[こちら](https://docs.microsoft.com/azure/spring-cloud/how-to-github-actions?pivots=programming-language-java#set-up-github-repository-and-authenticate-1)を参照してください。 +> GitHub Actions にシークレットを追加する詳細な手順については、[こちら](https://learn.microsoft.com/azure/spring-apps/how-to-github-actions?pivots=programming-language-java#set-up-github-repository-and-authenticate-1)を参照してください。 次のシークレット (8x) を GitHub Actions に追加します @@ -1921,11 +1921,11 @@ cd apps/acme-assist このクイック・スタートでは、Azure CLI を使用して多言語アプリケーションを Azure Spring Apps にデプロイしました。 また、エンタープライズ版を利用し VMware Tanzu コンポーネントを設定しました。 Azure Spring Apps もしくは VMware Tanzu コンポーネントの詳細は下記から入手できます。 -* [Azure Spring Apps](https://azure.microsoft.com/en-us/services/spring-cloud/) -* [Azure Spring Apps docs](https://docs.microsoft.com/en-us/azure/spring-cloud/quickstart-provision-service-instance-enterprise?tabs=azure-portal) +* [Azure Spring Apps](https://azure.microsoft.com/products/spring-apps/) +* [Azure Spring Apps docs](https://learn.microsoft.com/azure/spring-apps/enterprise/) * [Deploy Spring Apps from scratch](https://github.com/microsoft/azure-spring-cloud-training) * [Deploy existing Spring Apps](https://github.com/Azure-Samples/azure-spring-cloud) -* [Azure for Java Cloud Developers](https://docs.microsoft.com/en-us/azure/java/) +* [Azure for Java Cloud Developers](https://learn.microsoft.com/en-us/azure/java/) * [Spring Cloud Azure](https://spring.io/projects/spring-cloud-azure) * [Spring Cloud](https://spring.io/projects/spring-cloud) * [Spring Cloud Gateway](https://docs.vmware.com/en/VMware-Spring-Cloud-Gateway-for-Kubernetes/index.html) diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md index 445e8dbd..216a216b 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md @@ -64,11 +64,11 @@ また、エンタープライズティアで VMware Tanzu コンポーネントを設定しました。 Azure Spring Apps や VMware Tanzu コンポーネントについてさらに詳しく知りたい場合は、下記をご覧ください: -* [Azure Spring Apps](https://azure.microsoft.com/services/spring-cloud/) -* [Azure Spring Apps docs](https://docs.microsoft.com/azure/spring-cloud/quickstart-provision-service-instance-enterprise?tabs=azure-portal) +* [Azure Spring Apps](https://azure.microsoft.com/products/spring-apps/) +* [Azure Spring Apps docs](https://learn.microsoft.com/azure/spring-apps/enterprise/) * [Deploy Spring Apps from scratch](https://github.com/microsoft/azure-spring-cloud-training) * [Deploy existing Spring Apps](https://github.com/Azure-Samples/azure-spring-cloud) -* [Azure for Java Cloud Developers](https://docs.microsoft.com/en-us/azure/java/) +* [Azure for Java Cloud Developers](https://learn.microsoft.com/azure/java/) * [Spring Cloud Azure](https://spring.io/projects/spring-cloud-azure) * [Spring Cloud](https://spring.io/projects/spring-cloud) * [Spring Cloud Gateway](https://docs.vmware.com/en/VMware-Spring-Cloud-Gateway-for-Kubernetes/index.html) diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md index 4d3a5d2f..34811353 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md @@ -64,7 +64,7 @@ Azure Key Vault は一旦作成すると、リソースを削除した後も、 この Codespaces の環境には、次のソフトウェアがインストールされています。 - 1. [JDK 17](https://docs.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-yoterada#openjdk-17) + 1. [JDK 17](https://learn.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-yoterada#openjdk-17) ```shell java -version @@ -78,7 +78,7 @@ Azure Key Vault は一旦作成すると、リソースを削除した後も、 which java ``` - 3. [Azure CLI version 2.31.0 もしくはそれ以降](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest):現在インストールされている Azure CLI のバージョンを確認するためには、下記のコマンドを実行します。 + 3. [Azure CLI version 2.31.0 もしくはそれ以降](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest):現在インストールされている Azure CLI のバージョンを確認するためには、下記のコマンドを実行します。 ```shell which az diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json index 05abdf85..084e5ceb 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json @@ -145,7 +145,7 @@ // "tagsArray": { // "type": "object", // "metadata": { - // "description": "See documentation on tags: https://docs.microsoft.com/azure/azure-resource-manager/management/tag-resources." + // "description": "See documentation on tags: https://learn.microsoft.com/azure/azure-resource-manager/management/tag-resources." // } // } }, diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md index 87b9294f..f1ee3efe 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md @@ -35,7 +35,7 @@ az ad app update --id ${APPLICATION_ID} \ "https://${PORTAL_URL}/oauth2-redirect.html" "https://${PORTAL_URL}/login/oauth2/code/sso" ``` -リダイレクト先の URI に関する詳細な情報は[こちら](https://docs.microsoft.com/ja-jp/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri)をご参照ください。 +リダイレクト先の URI に関する詳細な情報は[こちら](https://learn.microsoft.com/ja-jp/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri)をご参照ください。 アプリケーションに対してサービスプリンシパルを割り当てます。 @@ -43,7 +43,7 @@ az ad app update --id ${APPLICATION_ID} \ az ad sp create --id ${APPLICATION_ID} ``` -アプリケーションの登録に関するより詳細な情報は、[こちら](https://docs.microsoft.com/ja-jp/azure/active-directory/develop/quickstart-register-app)をご参照ください。 +アプリケーションの登録に関するより詳細な情報は、[こちら](https://learn.microsoft.com/ja-jp/azure/active-directory/develop/quickstart-register-app)をご参照ください。 ### 1.1. SSO を有効化するための環境設定の準備 diff --git a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md index ae3ec431..92e46355 100644 --- a/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md +++ b/azure-spring-apps-enterprise/ja-jp/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md @@ -15,9 +15,9 @@ Github Codespaces を利用して、開発環境・実行環境を構築可能 2. GitHu Codespaces へのアクセス許可が与えられた後、[https://github.com/Azure-Samples/acme-fitness-store/tree/Azure に移動し、「Code」ボタンをクリックしてください。リストされているオプションとして「codespaces」が実行できるようになっています。このオプションが表示されない場合は、Azure-Samples 組織に追加されていないか、Github ID が組織でまだアクティブになっていない可能性があります。この問題についてワークショップコーディネーターにご相談ください。招待状が送信されたメールが場合は、https://github.com/Azure-Samples/acme-fitness-store/invitations にアクセスして直接申請できます。 3. 上記の手順が成功した場合、Codespaces の VSCode 内でターミナルを開くことができるようになっています。Codespaces の詳細については、[こちら](https://docs.github.com/codespaces)をご参照ください。この Codespaces の環境では、次のソフトウェアがインストールされています。 - 1. * [JDK 17](https://docs.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) + 1. * [JDK 17](https://learn.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) 2. * 環境変数は、`JAVA_HOME` は JDK のインストール・パスを設定する必要があります。このパスで指定するディレクトリには、`bin`, `jre`, `lib` とそのサブディレクトリが必要です。さらに、`PATH` 変数に `${JAVA_HOME}/bin` ディレクトリが含まれていることも確認してください。テストするには、bashシェルに `which javac` 入力して、結果のパスが内のファイルを指していることを確認します。 - 3. * [Azure CLI バージョン 2.31.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) 以降のバージョン。現在の Azure CLI インストールのバージョンを確認するには、次のコマンドを実行してください。 + 3. * [Azure CLI バージョン 2.31.0](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) 以降のバージョン。現在の Azure CLI インストールのバージョンを確認するには、次のコマンドを実行してください。 ```bash az --version diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md index f761a27b..e0dd8975 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/ai/04-build-and-deploy-assist-app-to-azure-spring-apps-enterprise/README.md @@ -135,11 +135,11 @@ In this quickstart, you've deployed polyglot applications to Azure Spring Apps u You also configured VMware Tanzu components in the enterprise tier. To learn more about Azure Spring Apps or VMware Tanzu components, go to: -* [Azure Spring Apps](https://azure.microsoft.com/en-us/services/spring-cloud/) -* [Azure Spring Apps docs](https://docs.microsoft.com/en-us/azure/spring-cloud/quickstart-provision-service-instance-enterprise?tabs=azure-portal) +* [Azure Spring Apps](https://azure.microsoft.com/products/spring-apps/) +* [Azure Spring Apps docs](https://learn.microsoft.com/azure/spring-apps/enterprise/) * [Deploy Spring Apps from scratch](https://github.com/microsoft/azure-spring-cloud-training) * [Deploy existing Spring Apps](https://github.com/Azure-Samples/azure-spring-cloud) -* [Azure for Java Cloud Developers](https://docs.microsoft.com/en-us/azure/java/) +* [Azure for Java Cloud Developers](https://learn.microsoft.com/azure/java/) * [Spring Cloud Azure](https://spring.io/projects/spring-cloud-azure) * [Spring Cloud](https://spring.io/projects/spring-cloud) * [Spring Cloud Gateway](https://docs.vmware.com/en/VMware-Spring-Cloud-Gateway-for-Kubernetes/index.html) diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/01-azure-introduction/README.md b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/01-azure-introduction/README.md index d2c509d6..bddb5320 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/01-azure-introduction/README.md +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/01-azure-introduction/README.md @@ -34,7 +34,7 @@ az version ### Alternative 2: Using your desktop shell -* Please install [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) to your desktop. +* Please install [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) to your desktop. * Use `az version` to check the version of Azure CLI installed, e.g. diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md index b6d5a678..2993618b 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/README.md @@ -43,9 +43,9 @@ This workshop leverages Github Codespaces to provide a development environment f 2. Upon getting the confirmation that you are added to the Org, navigate to https://github.com/Azure-Samples/acme-fitness-store/tree/Azure, click "Code" button. You should be able to "Codespaces" as an option listed. If you do not see that option listed, most probably you are not added to [Azure-Samples](https://github.com/Azure-Samples/) org or your github id is still not active in this org. Please discuss this issue with your workshop co-ordinator. 3. Assuming the above steps are successful, you should be able to open a terminal inside VS Code that opens up in Codespaces. Refer to this link to understand more about [Codespaces](https://docs.github.com/codespaces). This Codespace comes installed with the following software: - 1. * [JDK 17](https://docs.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) + 1. * [JDK 17](https://learn.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) 2. * The environment variable `JAVA_HOME` should be set to the path of the JDK installation. The directory specified by this path should have `bin`, `jre`, and `lib` among its subdirectories. Further, ensure your `PATH` variable contains the directory `${JAVA_HOME}/bin`. To test, type `which javac` into bash shell ensure the resulting path points to a file inside `${JAVA_HOME}/bin`. - 3. * [Azure CLI version 2.31.0 or higher](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) version 2.31.0 or later. You can check the version of your current Azure CLI installation by running: + 3. * [Azure CLI version 2.31.0 or higher](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) version 2.31.0 or later. You can check the version of your current Azure CLI installation by running: ```bash az --version diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json index 05abdf85..084e5ceb 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/azuredeploy.json @@ -145,7 +145,7 @@ // "tagsArray": { // "type": "object", // "metadata": { - // "description": "See documentation on tags: https://docs.microsoft.com/azure/azure-resource-manager/management/tag-resources." + // "description": "See documentation on tags: https://learn.microsoft.com/azure/azure-resource-manager/management/tag-resources." // } // } }, diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md index 45670bcc..7890ea8a 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/12-hol-3.4-configure-single-signon/README.md @@ -33,7 +33,7 @@ az ad app update --id ${APPLICATION_ID} \ "https://${PORTAL_URL}/oauth2-redirect.html" "https://${PORTAL_URL}/login/oauth2/code/sso" ``` -Detailed information about redirect URIs can be found [here](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri). +Detailed information about redirect URIs can be found [here](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#add-a-redirect-uri). Assign a Service Principal to the Application Registration @@ -41,7 +41,7 @@ Assign a Service Principal to the Application Registration az ad sp create --id ${APPLICATION_ID} ``` -More detailed instructions on Application Registrations can be found [here](https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) +More detailed instructions on Application Registrations can be found [here](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) ### 1.1. Prepare your environment for SSO Deployments diff --git a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md index 999f6360..c9053795 100644 --- a/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md +++ b/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/intermediate/01-workshop-environment-setup/README.md @@ -13,9 +13,9 @@ Github Codespaces can be leveraged to provide a development environment for runn 2. Upon getting the confirmation that you are added to the Org, navigate to https://github.com/Azure-Samples/acme-fitness-store/tree/Azure, click "Code" button. You should be able to "Codespaces" as an option listed. If you do not see that option listed, most probably you are not added to [Azure-Samples](https://github.com/Azure-Samples/) org or your github id is still not active in this org. Please discuss this issue with your workshop coordinator. If invitation was sent but it is not in your mailbox, you can visit https://github.com/Azure-Samples/acme-fitness-store/invitations to accept it directly. 3. Assuming the above steps are successful, you should be able to open a terminal inside VS Code that opens up in Codespaces. Refer to this link to understand more about [Codespaces](https://docs.github.com/codespaces). This Codespaces comes installed with the following software: - 1. * [JDK 17](https://docs.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) + 1. * [JDK 17](https://learn.microsoft.com/java/openjdk/download?WT.mc_id=azurespringcloud-github-judubois#openjdk-17) 2. * The environment variable `JAVA_HOME` should be set to the path of the JDK installation. The directory specified by this path should have `bin`, `jre`, and `lib` among its subdirectories. Further, ensure your `PATH` variable contains the directory `${JAVA_HOME}/bin`. To test, type `which javac` into bash shell ensure the resulting path points to a file inside `${JAVA_HOME}/bin`. - 3. * [Azure CLI version 2.31.0 or higher](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) version 2.31.0 or later. You can check the version of your current Azure CLI installation by running: + 3. * [Azure CLI version 2.31.0 or higher](https://learn.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) version 2.31.0 or later. You can check the version of your current Azure CLI installation by running: ```bash az --version