From 175425b942914cbd4e24a891228687db2fccdece Mon Sep 17 00:00:00 2001 From: Will <28876888+willtsai@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:45:17 -0800 Subject: [PATCH] Upmerge v0.27 to v0.28 (#903) * Add edge rad CLI pull to samples tests (#737) * Add install-radius script Signed-off-by: willdavsmith * chmod Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * test Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith * PR Signed-off-by: willdavsmith --------- Signed-off-by: willdavsmith Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * dapr tutorial port and routes fixes Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Revert "Update container build to only push on merges (#726)" This reverts commit 54b3d4e1caa01cdcd106905be056ae262ebbcb5c. Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Revert "Revert "Update container build to only push on merges (#726)"" This reverts commit 7cfd4adb6981472faa09d0ad4739b0d36133e1a6. Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Revert "dapr tutorial port and routes fixes" This reverts commit 7f6f52565cb71f856ede599c396f1e3b7b666b79. Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * dapr tutorial port and routes fixes (#748) Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Update condition Signed-off-by: Aaron Crawfis Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Update rad-bicep pull Signed-off-by: Aaron Crawfis Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Update eShop to use Recipes (#590) * Replace eShop with eShop on recipes * PR * Fix * Test * PR * oops * Updates * PR * PR * PR * PR comments * PR comments * fixing * again * fix * rewind * PR * PR * Simplify env registration Signed-off-by: Aaron Crawfis * Make registry a parameter Signed-off-by: Aaron Crawfis * Update test Signed-off-by: Aaron Crawfis * Update namespaces Signed-off-by: Aaron Crawfis * Fix tag Signed-off-by: Aaron Crawfis * Update env names Signed-off-by: Aaron Crawfis * Fix namespaces Signed-off-by: Aaron Crawfis * Fix recipe Signed-off-by: Aaron Crawfis --------- Signed-off-by: Aaron Crawfis Co-authored-by: Aaron Crawfis Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Fix Dapr sample in CI (#817) * Adding debug for pod list Signed-off-by: willdavsmith * Adding debug for pod list Signed-off-by: willdavsmith * Adding debug for pod list Signed-off-by: willdavsmith * Adding debug for pod list Signed-off-by: willdavsmith * Adding debug for pod list Signed-off-by: willdavsmith * make sure it's not flaky Signed-off-by: willdavsmith * remove debug Signed-off-by: willdavsmith --------- Signed-off-by: willdavsmith Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Force delete Radius application, EKS Cluster, and AWS resources on failed workflow run (#843) Signed-off-by: willdavsmith Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Remove customer label Signed-off-by: Aaron Crawfis Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Add issue labels (#858) Signed-off-by: Aaron Crawfis Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /samples/demo/client (#886) Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> * Fix Dapr microservices sample (#654) (#890) * Adding application name for dapr app * Adding application name for dapr app * Update samples/dapr/.rad/rad.yaml --------- Signed-off-by: Will <28876888+willtsai@users.noreply.github.com> Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> Co-authored-by: MD Ashique Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> --------- Signed-off-by: willdavsmith Signed-off-by: Will Tsai <28876888+willtsai@users.noreply.github.com> Signed-off-by: Aaron Crawfis Signed-off-by: dependabot[bot] Signed-off-by: Will <28876888+willtsai@users.noreply.github.com> Co-authored-by: Will Smith Co-authored-by: Aaron Crawfis Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: MD Ashique --- .github/workflows/issues.yaml | 29 --------------------------- .github/workflows/test.yaml | 2 +- samples/dapr/.rad/rad.yaml | 2 ++ samples/demo/client/package-lock.json | 12 +++++------ 4 files changed, 9 insertions(+), 36 deletions(-) create mode 100644 samples/dapr/.rad/rad.yaml diff --git a/.github/workflows/issues.yaml b/.github/workflows/issues.yaml index 659aa5d1..be2bea1a 100644 --- a/.github/workflows/issues.yaml +++ b/.github/workflows/issues.yaml @@ -5,35 +5,6 @@ on: types: [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned] jobs: - customer: - name: Add a label if Issue created by customer - if: github.event.action == 'opened' - runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }} - steps: - - name: Add label if author in preview team - env: - ISSUE: ${{ github.event.issue.html_url }} - AUTHOR: ${{ github.actor }} - run: | - MEMBERS=$(gh api orgs/radius-project/teams/Radius-Preview/members | jq -r '.[] | .login') - ADMINS=$(gh api orgs/radius-project/teams/Radius-Admin/members | jq -r '.[] | .login') - for USER in $MEMBERS; do - if [[ "$USER" == "$AUTHOR" ]]; then - ISADMIN=false - for ADMIN in $ADMINS; do - if [[ "$USER" == "$ADMIN" ]]; then - echo "$USER is an admin, skipping" - ISADMIN=true - fi - done - if [[ "$ISADMIN" == "false" ]]; then - echo "Adding label for issue $ISSUE" - gh issue edit $ISSUE --add-label "customer-issue" - fi - fi - done ado: name: Sync issue to Azure DevOps runs-on: ubuntu-latest diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a18d60e3..d8bf3d99 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -286,7 +286,7 @@ jobs: if-no-files-found: error - name: Create GitHub issue on failure if: failure() && github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' - run: gh issue create --title "Samples deployment failed for ${{ matrix.app }}" --body "Test failed on ${{ github.repository }}. See [workflow logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details." --repo ${{ github.repository }} + run: gh issue create --title "Samples deployment failed for ${{ matrix.app }}" --body "Test failed on ${{ github.repository }}. See [workflow logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details." --repo ${{ github.repository }} --label bug --label test-failure # Cleanup - name: Delete app if: always() && steps.gen-id.outputs.RUN_TEST == 'true' diff --git a/samples/dapr/.rad/rad.yaml b/samples/dapr/.rad/rad.yaml new file mode 100644 index 00000000..4daa00b9 --- /dev/null +++ b/samples/dapr/.rad/rad.yaml @@ -0,0 +1,2 @@ +workspace: + application: "dapr" \ No newline at end of file diff --git a/samples/demo/client/package-lock.json b/samples/demo/client/package-lock.json index c77540f7..8ebb1535 100644 --- a/samples/demo/client/package-lock.json +++ b/samples/demo/client/package-lock.json @@ -26,9 +26,9 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", - "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==" + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", + "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==" }, "node_modules/@ampproject/remapping": { "version": "2.2.0", @@ -15158,9 +15158,9 @@ }, "dependencies": { "@adobe/css-tools": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", - "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==" + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", + "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==" }, "@ampproject/remapping": { "version": "2.2.0",