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

Fix inconsistent dapr.yaml and appIDs #1152

Merged
merged 7 commits into from
Feb 3, 2025

Conversation

marcduiker
Copy link
Contributor

@marcduiker marcduiker commented Jan 29, 2025

Description

  1. All dapr.yaml files now start with the appID as the first key in the apps array.
  2. appIDs are consistent across languages and APIs. This includes http and sdk variations and workflow appIDs.

Issue reference

We strive to have all PRs being opened based on an issue, where the problem or feature have been discussed prior to implementation.

Please reference the issue this PR will close: #1151

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

  • The quickstart code compiles correctly
  • You've tested new builds of the quickstart if you changed quickstart code
  • You've updated the quickstart's README if necessary
  • If you have changed the steps for a quickstart be sure that you have updated the automated validation accordingly. All of our quickstarts have annotations that allow them to be executed automatically as code. For more information see mechanical-markdown. For user guide with examples see Examples.

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Copy link
Contributor

@alicejgibbons alicejgibbons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Marc, we should check that this works after Elena's PR: #1148

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
@alicejgibbons
Copy link
Contributor

@marcduiker you need to change merge target into release-1.15 branch too btw

@marcduiker marcduiker changed the base branch from master to release-1.15 January 31, 2025 15:38
Copy link
Member

@msfussell msfussell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@msfussell msfussell merged commit 9449aa4 into dapr:release-1.15 Feb 3, 2025
6 of 7 checks passed
yaron2 added a commit that referenced this pull request Feb 28, 2025
* fix: configuration/python/http/order-processor/requirements.txt to reduce vulnerabilities


The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-URLLIB3-7267250

* fix: pub_sub/python/sdk/order-processor-fastapi/requirements.txt to reduce vulnerabilities


The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-ANYIO-7361842

* helloworld: add terminal to node app for vscode

Signed-off-by: Joël Séguillon <joel.seguillon@gmail.com>

* chore: bump runtime version to rc.2 (#1126)

Signed-off-by: Mike Nguyen <hey@mike.ee>

* chore: cleanup & unify workflows and bump kind version (#1127)

Signed-off-by: Mike Nguyen <hey@mike.ee>

* Creating Conversation folder

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Modernized and updated Workflow .NET quickstart to use latest best practices and Dapr package (1.15.0 rc01)

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* Updated Dapr package version to use latest RC02

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

* COnverstaion API

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* add python-sdk in cryptography (#1093)

Signed-off-by: KentHsu <chiahaohsu9@gmail.com>
Signed-off-by: Alice Gibbons <alice@diagrid.io>

* Fixing Conversation HTTP example for RC5

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Fixing Conversation SDK example for RC5

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update conversation.go

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update go.mod

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update go.mod

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* fix: updates CLI and runtime version to fix tests (#1138)

Signed-off-by: Mike Nguyen <hey@mike.ee>

* Tests updates

Signed-off-by: Alice Gibbons <alice@diagrid.io>

* HTTP csharp jobs quickstart

Signed-off-by: Alice Gibbons <alice@diagrid.io>

* Finishing conversation sdk and fixing components path

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update conversation/go/http/README.md

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* fix: bump python crypto dep to >=1.14

Signed-off-by: Mike Nguyen <hey@mike.ee>

* fix: modify actors/cs test assertion

Signed-off-by: Mike Nguyen <hey@mike.ee>

* fix: define update deps for python wf quickstart

Signed-off-by: Mike Nguyen <hey@mike.ee>

* fix(test): typo in existing quickstart validation

Signed-off-by: Mike Nguyen <hey@mike.ee>

* fix: update python WF dep names

Signed-off-by: Mike Nguyen <hey@mike.ee>

* Update global.env with Dapr CLI 1.15.0-rc.2

Need RC.2 containing fix for deprecation flags.  see dapr/cli#1478

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

* Update conversation/go/sdk/dapr.yaml

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/http/dapr.yaml

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/sdk/dapr.yaml

Co-authored-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Updating sleep and timeout times

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Comversation README improvements

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* removing files from PR

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Csharp conversation quickstarts

Signed-off-by: Alice Gibbons <alice@diagrid.io>

* Python Jobs  API - HTTP quickstart

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Version bump (dapr rc8, cli rc3 and python sdk 1.15.0rc2) (#1148)

* Updates to python sdk 1.15.0rc2

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Test fix

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* test fix

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Bumps runtime and cli versions

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Bumps runtime to rc8

Signed-off-by: Elena Kolevska <elena@kolevska.com>

---------

Signed-off-by: Elena Kolevska <elena@kolevska.com>
Signed-off-by: Elena Kolevska <elena-kolevska@users.noreply.github.com>

* Python Conversation http Quickstart (#1150)

* Python Conversation API - HTTP quickstart

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update conversation/python/http/dapr.yaml

Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update conversation/python/http/dapr.yaml

Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

---------

Signed-off-by: Fernando Rocha <fernando@diagrid.io>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>
Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Added Quickstart for Javascript Jobs  HTTP api (#1134)

* Added Quickstart for Javascript Jobs HTTP api

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Updated Read me for Jobs quickstart

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Updated Package json with the right services names and correct ports

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Updated JS Jobs README to clear dotnet processes

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Reordered props in dapr.yaml

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

---------

Signed-off-by: Constantin Chirila <constantin@diagrid.io>
Co-authored-by: Constantin Chirila <constantin@diagrid.io>
Co-authored-by: Mike Nguyen <hey@mike.ee>

* Fix inconsistent dapr.yaml and appIDs (#1152)

* Fix inconsistent multi-app run files

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Rename appID for consistency

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update appID for consistency

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* fix appID

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Fix appID

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Remove schedulerHostAddress

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

---------

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* RC 9 and CLI RC 4 (#1153)

Signed-off-by: Alice Gibbons <alice@diagrid.io>

* Conversation JS HTTP Quickstart (#1154)

* Added Quickstart for Javascript Conversation HTTP api

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Minor change

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Updated Readme

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Removed redundant check on response

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

* Updated Readme

Signed-off-by: Constantin Chirila <constantin@diagrid.io>

---------

Signed-off-by: Constantin Chirila <constantin@diagrid.io>
Co-authored-by: Constantin Chirila <constantin@diagrid.io>

* splitting header

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* updating to runtime version 1.15.0-rc.10 and cli version 1.15.0-rc.5

Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>

* removing flask, fixing print statements

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* readme

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* gitignore

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update jobs/python/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* Update jobs/python/http/README.md

Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>

* removing debug logs

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update jobs/python/http/README.md

Signed-off-by: Alice Gibbons <alicejgibbons@gmail.com>

* chore:RC 11

Signed-off-by: Alice Gibbons <alice@diagrid.io>

* removing localhost scheduler and gitignore

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* removing unecessary parsing step

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Update .NET workflow quickstart

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update Java Workflow sample

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update Python Quickstart

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Fix event name

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update JavaScrrip WF Quickstart with new naming, input and output.

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Update Python WF quickstart to wait_for_workflow_completion

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Clean up Python

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* update Go Workflow to use WaitForCompletion

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Add clarification about sending/receiving events

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* All validations are working

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Fixed python conversation quickstart

* Add link to raise event

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

* release: bump go examples to rc1

Signed-off-by: Mike Nguyen <hey@mike.ee>

* updating dapr version to 1.15.0-rc.18 (#1168)

Signed-off-by: Fernando Rocha <fernando@diagrid.io>

* Conversation quickstarts updates - Python and Go (#1169)

* Adds python conversation api sdk quickstart. Updates python sdk version. Updates parameter name in conversation quickstart in Go.

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Fixes .net http quickstart for Conversation API

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* rename

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Fixes js conversation quickstart

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Older dependency

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Sets up a clean virtual environment for every quickstart

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Apply suggestions from code review

Co-authored-by: Mark Fussell <markfussell@gmail.com>
Signed-off-by: Elena Kolevska <elena-kolevska@users.noreply.github.com>

* Adds uvicorn in requirements.txt

Signed-off-by: Elena Kolevska <elena@kolevska.com>

* Runs the install step

Signed-off-by: Elena Kolevska <elena@kolevska.com>

---------

Signed-off-by: Elena Kolevska <elena@kolevska.com>
Signed-off-by: Elena Kolevska <elena-kolevska@users.noreply.github.com>
Co-authored-by: Mark Fussell <markfussell@gmail.com>

* Updated Dapr .NET SDK package to use latest protos - no other changes needed to the example (#1170)

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
Co-authored-by: Alice Gibbons <alice@diagrid.io>

* Update global.env

Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

* Bumps python sdk to 1.15.0

Signed-off-by: Elena Kolevska <elena@kolevska.com>

---------

Signed-off-by: Joël Séguillon <joel.seguillon@gmail.com>
Signed-off-by: Mike Nguyen <hey@mike.ee>
Signed-off-by: Fernando Rocha <fernando@diagrid.io>
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
Signed-off-by: KentHsu <chiahaohsu9@gmail.com>
Signed-off-by: Alice Gibbons <alice@diagrid.io>
Signed-off-by: Fernando Rocha <fernandorsl@gmail.com>
Signed-off-by: Paul Yuknewicz <paulyuk@microsoft.com>
Signed-off-by: Elena Kolevska <elena@kolevska.com>
Signed-off-by: Elena Kolevska <elena-kolevska@users.noreply.github.com>
Signed-off-by: Constantin Chirila <constantin@diagrid.io>
Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>
Signed-off-by: Alice Gibbons <alicejgibbons@gmail.com>
Signed-off-by: Yaron Schneider <schneider.yaron@live.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Joël Séguillon <joel.seguillon@gmail.com>
Co-authored-by: Mike Nguyen <hey@mike.ee>
Co-authored-by: Fernando Rocha <fernando@diagrid.io>
Co-authored-by: Whit Waldo <whit.waldo@innovian.net>
Co-authored-by: Kent (Chia-Hao), Hsu <mycodelearner2020@gmail.com>
Co-authored-by: Fernando Rocha <fernandorsl@gmail.com>
Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>
Co-authored-by: Alice Gibbons <alice@diagrid.io>
Co-authored-by: Paul Yuknewicz <paulyuk@microsoft.com>
Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>
Co-authored-by: Constantin Chirila <constantin.chirila@gmail.com>
Co-authored-by: Constantin Chirila <constantin@diagrid.io>
Co-authored-by: Mark Fussell <markfussell@gmail.com>
Co-authored-by: Yaron Schneider <schneider.yaron@live.com>
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.

Inconsistent usage of multi-app run file definitions
3 participants