Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added TAS capabilities, and local development #69

Merged

Conversation

xtreme-brian-shim
Copy link

Rebased from our fork which is up-to-date with the current Azure default branch. This includes the 43 changes from the Azure team, and all of our changes that were built from that base (60ish).

yoshioterada and others added 30 commits August 22, 2024 11:12
* Link missing for Deploy to Azure

If I push the link of the "Deploy to Azure" button, it failed to show the Form in the Azure Portal.

And it seems that the link had changed as follows.

Previous Link (Currently Failed)
https://raw.githubusercontent.com/Azure-Samples/acme-fitness-store/Azure/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/acmedeploy.json)

Now (Correct Link)
https://raw.githubusercontent.com/Azure-Samples/acme-fitness-store/Azure/azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/full/03-workshop-environment-setup/acmedeploy.json

So I modified the link for it.

* Connection String Modified for Order Service

If I configured the Connection String for Npgsql (C#).
Following error was showed and couldn't start the order service.

So I modified to be able to access to the PostgreSQL from the catalog service.

```bash
az keyvault secret set \
    --vault-name acme-fitness-kv-yoshio \
    --name "ConnectionStrings--OrderContext" \
    --value "Server=$POSTGRES_SERVER.postgres.database.azure.com;Database=$ORDER_SERVICE_DB;Port=5432;SSL Mode=Require;Trust Server Certificate=true;User ID=$POSTGRES_SERVER_USER;Password=$POSTGRES_SERVER_PASSWORD"
```

```text
Unhandled exception. System.ArgumentException: To validate server certificates, please use VerifyFull or VerifyCA instead of Require. To disable validation, explicitly set 'Trust Server Certificate' to true. See https://www.npgsql.org/doc/release-notes/6.0.html for more details.
```

* Modified Env Value

I modified the expression of the env variables

* I modified the style with more visible

I modified the style with more visible.

I also tried to the separate line and works fine.
* Add markdown link check

* update link

* Fix links

* fix links

* fix link

* fix links

* fix links and typos

* fix

* fix
* Rename Azure AD

* update link

* update name
* Created Japanese Translation Documents for Workshop

Created Japanese Translation Documents for Workshop

* Create Japanese Translation documents for Workshop

Create Japanese Translation documents for Workshop

* Deleted wrong explanation

Deleted wrong explanation

* Updated Markdown missing

Updated Markdown missing

* Modified Markdown expression

Modified Markdown expression

* Upload Image files

Upload Image files

* Added AI Workshop

Added AI Workshop

* Modified Link for AI

Modified Link for AI

* Create README.md

Create README.md

* Update README.md

Modified from "Azure Active Directory" to "Microsoft Entra ID"

* Update README.md

コマンドの実行順によるエラーが発生したため、順番を訂正

* Update README.md

Log Analytics ワークスペースが作成されていなかったため

* Update README.md

正しく動作するように修正

* Update README.md

Keyvault が作成されていないのに Key Vault の操作があったため、
Keyvault の作成を追加

* Update README.md

ルーティング設定のファイルの場所が異なるため、ディレクトリを移動。
Portal API のサンプル画面が表示されていなかったため、画面ダンプを追加

* Update README.md

Java アプリのデプロイに失敗していたため、正しい引数に修正

* Update README.md

説明を追記

* Update README.md

PostgreSQL のパスワード設定などを追記

* Update README.md

Update README.md

* Update for intermediate

Update for intermediate

* Update README.md

Modified Invalid URL for the image

* Update README.md

Added OpenAI Environment Variables

* Update README.md

Modified Environment Variable name

* Update README.md

Deleted English explanations

* Update README.md

Modified the Connection String for PostgreSQL from C#

* Modified Connection Strings

Modified Connection Strings

* Update README.md

Modified the style with more visible

* Update README.md

Update README.md

* Update README.md

Update README.md

* Update README.md

説明を修正

* Update README.md

Log Analytics は ARM テンプレートで作成されるため、作成方法は削除

* Modified LR

Modified Line separator

* Modified to run the script before az login

Modified to run the script before az login

* Deleted Invalid command

Deleted Invalid command

* Modified Invalid explanation for change the KEY_VAULT settings

Modified Invalid explanation for change the KEY_VAULT settings

* Added BP_JVM_VERSION arguments

Added BP_JVM_VERSION arguments

* Deleted invalid character and english statement

Deleted invalid character and english statement

* Modified operation for run the scripts

Modified operation for run the scripts

* Deleted command which no need to execute

Deleted command which no need to execute

* Added detail instructions

Added detail instructions.
This modification was coming from @suzukiyuhsuke san's feedback.

* Added explanation

Added explanation

* modified the directory name from ja to ja-jp

From the request from Dingmeng-san, I modified the directory name from ja to ja-jp

* I moved the ja-jp directory under the azure-spring-apps-enterprise directory

I moved the ja-jp directory under the azure-spring-apps-enterprise directory

* update home page

* copy pictures

* Update links

* update links

* update links

* update links

* update links

* update links

* remove pictures

* update links

* update links

* Update README.md

Update Japanese sentence more natural by Japanese people.

* Update README.md

I added line separator

* Update README.md

I would like to add line separator

---------

Co-authored-by: Dingmeng Xue <dixue@microsoft.com>
* Sync code with origin

* update
)

* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Optimize image size of samples
* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Optimize image size of samples

* Update dependencies of AI project

* update bom
* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Optimize image size of samples

* Update dependencies of AI project

* update bom

* Fix product number issue on UI
* update payment.yml

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Optimize image size of samples

* Update dependencies of AI project

* update bom

* Fix product number issue on UI

* Update docs

* update
* Add cosmos vector store (Azure-Samples#192)

* add cosmos db vector store

* add cosmos db vector store

* Polish CosmosDBVectorStore code (Azure-Samples#193)

* refactor cosmosDB vector store

---------

Co-authored-by: Theo van Kraay <theo.van@microsoft.com>
Co-authored-by: Mark Heckler <mark.heckler@gmail.com>
* Adding Azure for Spring Developers full day workshop.

* Adding content for Azure for Spring Developers full day workshop.

* Fixed typo.

* Added lab02.

* Updated Lab02

* Added Lab03

* - Allow adding, editing, and deleting products
- Update Assist service:
  + Add a vectorstore, which doesn't calculate the embeddings when provided in the documents
  + Enable adding/updating documents
  + List the index out of date documents
  + Add a job to update the documents for some products
- Update the source file of bikes.json and accessories.json to have id, which equals to the id of the product sql file, and the vector_store.json.

* Update ProductVo -> ProductValueObject

* Remove files

* Remove day sessions

* Revert doc

* Reverted code around ProductResponse

* Add new product scripts

* update

* Rename OPENAI_APIKEY to OPENAI_API_KEY

* remove bind operation

---------

Co-authored-by: Neven Cvetkovic <neven.cvetkovic@gmail.com>
Co-authored-by: Xiaolu Dai <xiada@microsoft.com>
Co-authored-by: Xiaolu Dai <31124698+saragluna@users.noreply.github.com>
* Adding Azure for Spring Developers full day workshop.

* Adding content for Azure for Spring Developers full day workshop.

* Fixed typo.

* Added lab02.

* Updated Lab02

* Added Lab03

* Quick fix.

* Added Lab04

* Added Lab05.

* Added Lab06. Added placeholders for two additional labs - databases and SSO.

* Reorganized Lab07 and Lab08 to be optional.

* Added Lab09 to prepare Azure OpenAI service.

* Fixed TYPO in the env variable name.

* Added Lab10

* Added Lab 11 - summary

* Fixed typo in the link.

* Added missing command to load the environment variables.

* Made AI lab not optional.

* Updated az cli version to 2.61.0

* Updated references to `asa-student` user.

* Fixed typo.

* Fixed typo.

* Changed the order of commands. Fixed the flow.

* Changed test port from 8081 to 9090 because Web Preview in Cloud Shell does not allow ports <1024 and 8080-8090.

* Added --verbose to commands.

* Fixed broken links.

* Update setup-ai-env-variables-template.sh

* Update README.md

* rename SPRING_AI_AZURE_OPENAI_APIKEY

---------

Co-authored-by: Neven Cvetkovic <neven.cvetkovic@gmail.com>
…Type

Co-authored-by: Carlos Poon <carlos.poon@broadcom>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broacom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
    Co-authored-by: Brian Shim <brian.shim@broadcom.com>
    Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
    Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
… identity, and payment apps (8080,8081,8082,8083,8804 respectively)

Co-authored-by: Carlos Poon <carlos.poon@braodcom.com>
Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
…g to TAS

Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
pivot-carlos-poon and others added 19 commits August 22, 2024 11:25
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
…ocal development

Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
… into a single local-development one

Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
SSO parameters.   untested.
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
typo
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
…ered when asked. Logout works with new jar.

Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Fix CatalogLiveness error in console log.
Refactor run.sh

Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
Co-authored-by: Brian Shim <brian.shim@broadcom.com>
Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
Co-authored-by: David Joo <david.joo@broadcom.com>
Co-authored-by: Tony Thompson <tony.thompson@broadcom.com>
    Co-authored-by: Brian Shim <brian.shim@broadcom.com>
    Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
@xtreme-brian-shim xtreme-brian-shim marked this pull request as ready for review August 22, 2024 21:04
Brian Shim and others added 6 commits August 22, 2024 17:19
    Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
    Co-authored-by: David Joo <david.joo@broadcom.com>
…ing unnecessary sso redirect for /userinfo endpoint
    Co-authored-by: Dayo Ajayi <dayo.ajayi@broadcom.com>
    Co-authored-by: Carlos Poon <carlos.poon@broadcom.com>
@candicenonsense candicenonsense merged commit 7816762 into spring-cloud-services-samples:main Aug 23, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants