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.

Sign up for GitHub

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

Jump to bottom

Fix inconsistent dapr.yaml and appIDs #1152

Merged
merged 7 commits into from
Feb 3, 2025
Merged

Fix inconsistent dapr.yaml and appIDs #1152

merged 7 commits into from
Feb 3, 2025

Conversation

marcduiker
Copy link
Contributor

@marcduiker marcduiker commented Jan 29, 2025 •
edited
Loading

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.

@marcduiker
Fix inconsistent multi-app run files
21caf4b 
Signed-off-by: Marc Duiker <[email protected]>
@marcduiker
Rename appID for consistency
84e3854 
Signed-off-by: Marc Duiker <[email protected]>
@marcduiker
Update appID for consistency
017bc25 
Signed-off-by: Marc Duiker <[email protected]>
@marcduiker
fix appID
fc93627 
Signed-off-by: Marc Duiker <[email protected]>
@marcduiker
Fix appID
ac7eab7 
Signed-off-by: Marc Duiker <[email protected]>
@marcduiker marcduiker requested review from a team as code owners January 29, 2025 16:33
This was referenced Jan 29, 2025
Merged
Merged
alicejgibbons
alicejgibbons requested changes Jan 30, 2025
View reviewed changes
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

@marcduiker
Remove schedulerHostAddress
469bdd4 
Signed-off-by: Marc Duiker <[email protected]>
@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
msfussell
msfussell approved these changes Feb 3, 2025
View reviewed changes
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
@elena-kolevska @snyk-bot
@jseguillon @mikeee @rochabr @WhitWaldo @KentHsu @alicejgibbons @paulyuk @marcduiker @ConstantinChirila @msfussell @yaron2
Merge 1.15 into master (#1172)
2f5a5d0 
* 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 <[email protected]>

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

Signed-off-by: Mike Nguyen <[email protected]>

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

Signed-off-by: Mike Nguyen <[email protected]>

* Creating Conversation folder

Signed-off-by: Fernando Rocha <[email protected]>

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

Signed-off-by: Whit Waldo <[email protected]>

* Updated Dapr package version to use latest RC02

Signed-off-by: Whit Waldo <[email protected]>

* COnverstaion API

Signed-off-by: Fernando Rocha <[email protected]>

* add python-sdk in cryptography (#1093)

Signed-off-by: KentHsu <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>

* Fixing Conversation HTTP example for RC5

Signed-off-by: Fernando Rocha <[email protected]>

* Fixing Conversation SDK example for RC5

Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation.go

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update go.mod

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update go.mod

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

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

Signed-off-by: Mike Nguyen <[email protected]>

* Tests updates

Signed-off-by: Alice Gibbons <[email protected]>

* HTTP csharp jobs quickstart

Signed-off-by: Alice Gibbons <[email protected]>

* Finishing conversation sdk and fixing components path

Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/README.md

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* fix: bump python crypto dep to >=1.14

Signed-off-by: Mike Nguyen <[email protected]>

* fix: modify actors/cs test assertion

Signed-off-by: Mike Nguyen <[email protected]>

* fix: define update deps for python wf quickstart

Signed-off-by: Mike Nguyen <[email protected]>

* fix(test): typo in existing quickstart validation

Signed-off-by: Mike Nguyen <[email protected]>

* fix: update python WF dep names

Signed-off-by: Mike Nguyen <[email protected]>

* 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 <[email protected]>

* Update conversation/go/sdk/dapr.yaml

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/dapr.yaml

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/sdk/dapr.yaml

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Updating sleep and timeout times

Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Comversation README improvements

Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/go/sdk/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* removing files from PR

Signed-off-by: Fernando Rocha <[email protected]>

* Csharp conversation quickstarts

Signed-off-by: Alice Gibbons <[email protected]>

* Python Jobs  API - HTTP quickstart

Signed-off-by: Fernando Rocha <[email protected]>

* 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 <[email protected]>

* Test fix

Signed-off-by: Elena Kolevska <[email protected]>

* test fix

Signed-off-by: Elena Kolevska <[email protected]>

* Bumps runtime and cli versions

Signed-off-by: Elena Kolevska <[email protected]>

* Bumps runtime to rc8

Signed-off-by: Elena Kolevska <[email protected]>

---------

Signed-off-by: Elena Kolevska <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>

* Python Conversation http Quickstart (#1150)

* Python Conversation API - HTTP quickstart

Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/python/http/dapr.yaml

Co-authored-by: Marc Duiker <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update conversation/python/http/dapr.yaml

Co-authored-by: Marc Duiker <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

---------

Signed-off-by: Fernando Rocha <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>
Co-authored-by: Marc Duiker <[email protected]>

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

* Added Quickstart for Javascript Jobs HTTP api

Signed-off-by: Constantin Chirila <[email protected]>

* Updated Read me for Jobs quickstart

Signed-off-by: Constantin Chirila <[email protected]>

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

Signed-off-by: Constantin Chirila <[email protected]>

* Updated JS Jobs README to clear dotnet processes

Signed-off-by: Constantin Chirila <[email protected]>

* Reordered props in dapr.yaml

Signed-off-by: Constantin Chirila <[email protected]>

---------

Signed-off-by: Constantin Chirila <[email protected]>
Co-authored-by: Constantin Chirila <[email protected]>
Co-authored-by: Mike Nguyen <[email protected]>

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

* Fix inconsistent multi-app run files

Signed-off-by: Marc Duiker <[email protected]>

* Rename appID for consistency

Signed-off-by: Marc Duiker <[email protected]>

* Update appID for consistency

Signed-off-by: Marc Duiker <[email protected]>

* fix appID

Signed-off-by: Marc Duiker <[email protected]>

* Fix appID

Signed-off-by: Marc Duiker <[email protected]>

* Remove schedulerHostAddress

Signed-off-by: Marc Duiker <[email protected]>

---------

Signed-off-by: Marc Duiker <[email protected]>

* RC 9 and CLI RC 4 (#1153)

Signed-off-by: Alice Gibbons <[email protected]>

* Conversation JS HTTP Quickstart (#1154)

* Added Quickstart for Javascript Conversation HTTP api

Signed-off-by: Constantin Chirila <[email protected]>

* Minor change

Signed-off-by: Constantin Chirila <[email protected]>

* Updated Readme

Signed-off-by: Constantin Chirila <[email protected]>

* Removed redundant check on response

Signed-off-by: Constantin Chirila <[email protected]>

* Updated Readme

Signed-off-by: Constantin Chirila <[email protected]>

---------

Signed-off-by: Constantin Chirila <[email protected]>
Co-authored-by: Constantin Chirila <[email protected]>

* splitting header

Signed-off-by: Fernando Rocha <[email protected]>

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

Signed-off-by: Paul Yuknewicz <[email protected]>

* removing flask, fixing print statements

Signed-off-by: Fernando Rocha <[email protected]>

* readme

Signed-off-by: Fernando Rocha <[email protected]>

* gitignore

Signed-off-by: Fernando Rocha <[email protected]>

* Update jobs/python/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* Update jobs/python/http/README.md

Co-authored-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>

* removing debug logs

Signed-off-by: Fernando Rocha <[email protected]>

* Update jobs/python/http/README.md

Signed-off-by: Alice Gibbons <[email protected]>

* chore:RC 11

Signed-off-by: Alice Gibbons <[email protected]>

* removing localhost scheduler and gitignore

Signed-off-by: Fernando Rocha <[email protected]>

* removing unecessary parsing step

Signed-off-by: Fernando Rocha <[email protected]>

* Update .NET workflow quickstart

Signed-off-by: Marc Duiker <[email protected]>

* Update Java Workflow sample

Signed-off-by: Marc Duiker <[email protected]>

* Update Python Quickstart

Signed-off-by: Marc Duiker <[email protected]>

* Fix event name

Signed-off-by: Marc Duiker <[email protected]>

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

Signed-off-by: Marc Duiker <[email protected]>

* Update Python WF quickstart to wait_for_workflow_completion

Signed-off-by: Marc Duiker <[email protected]>

* Clean up Python

Signed-off-by: Marc Duiker <[email protected]>

* update Go Workflow to use WaitForCompletion

Signed-off-by: Marc Duiker <[email protected]>

* Add clarification about sending/receiving events

Signed-off-by: Marc Duiker <[email protected]>

* All validations are working

Signed-off-by: Marc Duiker <[email protected]>

* Fixed python conversation quickstart

* Add link to raise event

Signed-off-by: Marc Duiker <[email protected]>

* release: bump go examples to rc1

Signed-off-by: Mike Nguyen <[email protected]>

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

Signed-off-by: Fernando Rocha <[email protected]>

* 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 <[email protected]>

* Fixes .net http quickstart for Conversation API

Signed-off-by: Elena Kolevska <[email protected]>

* rename

Signed-off-by: Elena Kolevska <[email protected]>

* Fixes js conversation quickstart

Signed-off-by: Elena Kolevska <[email protected]>

* Older dependency

Signed-off-by: Elena Kolevska <[email protected]>

* Sets up a clean virtual environment for every quickstart

Signed-off-by: Elena Kolevska <[email protected]>

* Apply suggestions from code review

Co-authored-by: Mark Fussell <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>

* Adds uvicorn in requirements.txt

Signed-off-by: Elena Kolevska <[email protected]>

* Runs the install step

Signed-off-by: Elena Kolevska <[email protected]>

---------

Signed-off-by: Elena Kolevska <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>
Co-authored-by: Mark Fussell <[email protected]>

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

Signed-off-by: Whit Waldo <[email protected]>
Co-authored-by: Yaron Schneider <[email protected]>
Co-authored-by: Alice Gibbons <[email protected]>

* Update global.env

Signed-off-by: Yaron Schneider <[email protected]>

* Bumps python sdk to 1.15.0

Signed-off-by: Elena Kolevska <[email protected]>

---------

Signed-off-by: Joël Séguillon <[email protected]>
Signed-off-by: Mike Nguyen <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>
Signed-off-by: Whit Waldo <[email protected]>
Signed-off-by: KentHsu <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>
Signed-off-by: Fernando Rocha <[email protected]>
Signed-off-by: Paul Yuknewicz <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>
Signed-off-by: Constantin Chirila <[email protected]>
Signed-off-by: Marc Duiker <[email protected]>
Signed-off-by: Alice Gibbons <[email protected]>
Signed-off-by: Yaron Schneider <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Joël Séguillon <[email protected]>
Co-authored-by: Mike Nguyen <[email protected]>
Co-authored-by: Fernando Rocha <[email protected]>
Co-authored-by: Whit Waldo <[email protected]>
Co-authored-by: Kent (Chia-Hao), Hsu <[email protected]>
Co-authored-by: Fernando Rocha <[email protected]>
Co-authored-by: Alice Gibbons <[email protected]>
Co-authored-by: Alice Gibbons <[email protected]>
Co-authored-by: Paul Yuknewicz <[email protected]>
Co-authored-by: Marc Duiker <[email protected]>
Co-authored-by: Constantin Chirila <[email protected]>
Co-authored-by: Constantin Chirila <[email protected]>
Co-authored-by: Mark Fussell <[email protected]>
Co-authored-by: Yaron Schneider <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alicejgibbons alicejgibbons alicejgibbons requested changes

@msfussell msfussell msfussell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Inconsistent usage of multi-app run file definitions
3 participants
@marcduiker @alicejgibbons @msfussell