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

Upmerge release branches into edge #1212

Merged
merged 85 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
e207144
Fix resource type
AaronCrawfis Nov 1, 2022
4c1c041
Fix Dapr mode
AaronCrawfis Nov 11, 2022
1d75890
Bump express from 4.17.1 to 4.17.3 in /quickstarts/dapr/nodeapp (#108)
dependabot[bot] Dec 13, 2022
d13c08e
Bump loader-utils from 2.0.3 to 2.0.4 in /demo/client (#111)
dependabot[bot] Dec 13, 2022
64d8bfc
Bump minimatch from 3.0.4 to 3.1.2 in /tutorial (#114)
dependabot[bot] Dec 13, 2022
b0ee052
Bump decode-uri-component from 0.2.0 to 0.2.2 in /tutorial (#113)
dependabot[bot] Dec 13, 2022
053e2f2
Bump minimatch in /reference-apps/container-app-store/node-service (#…
dependabot[bot] Dec 13, 2022
c73f311
Bump qs and express in /reference-apps/container-app-store/node-servi…
dependabot[bot] Dec 13, 2022
fc5320b
Bump express from 4.17.1 to 4.17.3 in /tutorial (#109)
dependabot[bot] Dec 13, 2022
d5a7857
Making tutorial match docs version (#116)
jkotalik Dec 13, 2022
9a14c6b
Continue on error for container deletion
AaronCrawfis Feb 9, 2023
bf265cb
Update issues.yaml
AaronCrawfis Feb 9, 2023
26a5469
Change ADO_wit
AaronCrawfis Feb 14, 2023
3b5f565
Merge branch 'edge' into v0.17
AaronCrawfis Feb 14, 2023
9830a5d
Update version number
AaronCrawfis Feb 14, 2023
59f4fc0
Remove container app store
AaronCrawfis Apr 10, 2023
9e0603c
Add eshop instructions
AaronCrawfis Apr 18, 2023
1b0055c
Revert instructions
AaronCrawfis Apr 18, 2023
2f2821e
Merge branch 'edge' into v0.20
AaronCrawfis May 25, 2023
1ca6640
Change Bicep installation step
AaronCrawfis May 26, 2023
a81458e
Update issues.yaml
AaronCrawfis Jun 1, 2023
8a8f1dc
Update issues.yaml
AaronCrawfis Jun 1, 2023
59222ba
Update issues.yaml
AaronCrawfis Jun 1, 2023
3251a6a
Merge branch 'edge' into v0.21
AaronCrawfis Jun 1, 2023
026d89e
Update test.yaml
AaronCrawfis Jun 1, 2023
824ed2c
Add check for node creation (#240)
AaronCrawfis Jun 2, 2023
7c5a665
Add contribution guide
AaronCrawfis Jun 7, 2023
666ac46
Add Issue templates
AaronCrawfis Jun 7, 2023
023876b
Fix link
AaronCrawfis Jun 7, 2023
faf5bba
Fix casing
AaronCrawfis Jun 12, 2023
f52e40c
change mentions of <Project Radius> to just <Radius> (#263)
willtsai Jun 12, 2023
16b06ba
edge to v0.22 upmerge to pick up changes (#388)
willtsai Jun 29, 2023
2002009
add background info for dapr quickstart (#381)
willtsai Jul 6, 2023
a8c4228
Switch to sql edge (#398)
AaronCrawfis Jul 7, 2023
47c2d17
Update Dapr UI port (#416)
AaronCrawfis Jul 17, 2023
deda94b
Update demo.app.spec.ts (#546)
AaronCrawfis Sep 6, 2023
2a2ec11
Add samples release automation (#499) (#554)
willdavsmith Sep 14, 2023
a11f6a3
Bump word-wrap from 1.2.3 to 1.2.5 in /demo/client (#431)
dependabot[bot] Sep 28, 2023
0226764
Bump golang.org/x/net in /reference-apps/container-app-store/go-servi…
dependabot[bot] Oct 12, 2023
e77e77e
Add issue labels (#858)
AaronCrawfis Nov 27, 2023
89e330d
Remove customer label
AaronCrawfis Nov 27, 2023
012d8be
Merge branch 'v0.27' of https://github.com/radius-project/samples int…
AaronCrawfis Nov 27, 2023
a420f9e
Fix failing CI in 0.27 branch (#881)
willdavsmith Nov 28, 2023
d611db9
Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /samples/demo/client (#886)
dependabot[bot] Dec 1, 2023
22e504a
Fix Dapr microservices sample (#654)
ASHIQUEMD Dec 4, 2023
595b651
Fix Dapr microservices sample (#654) (#890)
willtsai Dec 5, 2023
175425b
Upmerge v0.27 to v0.28 (#903)
willtsai Dec 13, 2023
9213e9c
Update changes in test.yaml workflow into v0.28 (#904)
lakshmimsft Dec 14, 2023
5c525d4
Fixing AWS RDS Purge workflow (#970)
willdavsmith Feb 13, 2024
9700e14
Add aws login (#974)
willdavsmith Feb 14, 2024
26aaa6f
Add GH action to close stale PRs (#977)
kachawla Feb 16, 2024
678363c
Adding a secton that waits until the app is ready (#980)
ytimocin Feb 22, 2024
939ee41
Update images for guestbook sample app (#986)
willtsai Feb 22, 2024
191c5ef
Merge branch 'v0.30' into v0.31
AaronCrawfis Mar 2, 2024
34ac1de
Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /samples/demo/clie…
dependabot[bot] Mar 25, 2024
073270f
Bump follow-redirects from 1.15.4 to 1.15.6 in /samples/demo/client (…
dependabot[bot] Mar 25, 2024
ce84220
Bump ip from 2.0.0 to 2.0.1 in /samples/demo (#984)
dependabot[bot] Mar 25, 2024
a42248f
Bump follow-redirects from 1.15.5 to 1.15.6 in /playwright (#1015)
dependabot[bot] Mar 25, 2024
22de01a
Bump express from 4.18.2 to 4.19.2 in /samples/demo/client (#1027)
dependabot[bot] Mar 26, 2024
e90262a
Bump express from 4.18.2 to 4.19.2 in /samples/demo (#1028)
dependabot[bot] Mar 26, 2024
ea5fe71
Bump express from 4.18.2 to 4.19.2 in /samples/dapr/nodeapp (#1026)
dependabot[bot] Mar 26, 2024
8e762b1
Make env configurable (#1046)
Reshrahim Apr 10, 2024
c110029
Adding test AKS workflow to v0.32 (#1052)
ytimocin Apr 16, 2024
050670d
Merge branch 'v0.14' into willdavsmith/the-upmerge
willdavsmith Apr 19, 2024
d1fa8f2
Merge remote-tracking branch 'origin/v0.15' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
f679db5
Merge remote-tracking branch 'origin/v0.16' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
b48eb62
Merge remote-tracking branch 'origin/v0.17' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
6084b08
Merge remote-tracking branch 'origin/v0.19' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
db49cb9
Merge remote-tracking branch 'origin/v0.20' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
52e4dc7
Merge remote-tracking branch 'origin/v0.21' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
9a93329
Merge remote-tracking branch 'origin/v0.22' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
4b538a4
Merge remote-tracking branch 'origin/v0.24' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
6565924
Merge remote-tracking branch 'origin/v0.25' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
6f47031
Merge remote-tracking branch 'origin/v0.26' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
f0f9552
Merge remote-tracking branch 'origin/v0.27' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
d0e8566
Merge remote-tracking branch 'origin/v0.28' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
9c58a8f
Merge remote-tracking branch 'origin/v0.30' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
89d13d7
Merge remote-tracking branch 'origin/v0.31' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
1a5e87c
Merge remote-tracking branch 'origin/v0.32' into willdavsmith/the-upm…
willdavsmith Apr 19, 2024
e771d36
Removing code
willdavsmith Apr 19, 2024
da0cf2a
Removing code
willdavsmith Apr 19, 2024
655f17e
Removing code
willdavsmith Apr 19, 2024
b84ba12
Use retry and update eshop playwright tests to wait for the catalog t…
ytimocin Apr 19, 2024
df00dd4
Merge remote-tracking branch 'origin/v0.32' into willdavsmith/the-upm…
willdavsmith Apr 22, 2024
a32672a
Fixing eshop page
willdavsmith Apr 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug Report
about: Report broken functionality within a Radius sample
title: "<BUG TITLE>"
assignees: ''
labels: ["bug"]
---

## Bug information

### Steps to reproduce (required)
<!--How can we recreate this bug? Be specific-->

### Observed behavior (required)
<!--What you're experiencing that you believe is a bug-->

<!--If applicable, add screenshots to help explain your problem-->

### Desired behavior (required)
<!--What you're expecting to happen-->

### Workaround (optional)
<!--Have you found a workaround to get you unblocked?-->

## System information

### rad Version (required)
<!--What rad cli version are you running?-->

<!-- PASTE OUTPUT OF `rad version` -->

### Operating system (required)
<!--What operating system (macOS Monterey, Windows 11, etc.) and architecture (x86, x64, arm64, etc.) are you running?-->

<!-- For example: macOS Monterey, M1 chip -->

## Additional context
<!--Add any other context about the problem here-->
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Feature Request
about: Request a feature in Radius samples
title: "<FEATURE TITLE>"
assignees: ''
---

## Overview of feature request

<!--What are you proposing Radius add/update/remove?-->

## Acceptance criteria

<!--What will need to be completed/working for this feature to be marked "Done"-->

## Additional context

<!--Add any other context about the problem here-->
27 changes: 27 additions & 0 deletions .github/workflows/close-stale-prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This workflow warns and then closes PRs that have had no activity for 90 days.
#
# For more information, see:
# https://github.com/actions/stale
name: Close stale pull requests

on:
schedule:
- cron: '0 18 * * *' # Run the workflow every day at 6PM UTC (10AM PST).

jobs:
stale:

runs-on: ubuntu-latest
permissions:
pull-requests: write

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: 'This pull request has been automatically marked as stale because it has been inactive for 90 days. Remove stale label or comment or this PR will be closed in 7 days.'
stale-pr-label: 'stale'
days-before-pr-stale: 90 # 3 months
days-before-pr-close: 7
days-before-issue-stale: -1
days-before-issue-close: -1
5 changes: 5 additions & 0 deletions .github/workflows/issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Issues Automation
on:
issues:
types: [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]

concurrency:
group: issue-${{ github.event.issue.number }}
cancel-in-progress: false

jobs:
ado:
Expand All @@ -21,3 +25,4 @@ jobs:
ado_new_state: "New"
ado_active_state: "Active"
ado_close_state: "Closed"
ado_wit: "GitHub Issue"
11 changes: 11 additions & 0 deletions .github/workflows/purge-aws-rds-snapshots.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,22 @@ on:
schedule:
# Runs at 00:30 and 12:30
- cron: "30 0,12 * * *"
env:
GH_TOKEN: ${{ github.token }}
AWS_REGION: us-west-2
jobs:
purge_rds_snapshots:
name: Purge AWS RDS DBInstance snapshots
runs-on: [ubuntu-latest]
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Login to AWS
run: |
aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws configure set region ${{ env.AWS_REGION }}
aws configure set output json
- name: Purge AWS RDS DBInstance snapshots
run: |
./.github/scripts/purge-aws-rds-snapshots.sh
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/purge-test-resources.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Purge test resources
on:
schedule:
- cron: "30 0,12 * * *"
env:
AZURE_RG_DELETE_LIST_FILE: "az_rg_list.txt"
VALID_RESOURCE_WINDOW: 6*60*60
jobs:
purge_azure_resources:
name: Azure resources clean-ups
runs-on: [self-hosted, 1ES.Pool=1ES-Radius]
steps:
- name: Login to Azure
run: |
az login --service-principal \
--username ${{ secrets.AZURE_SP_TESTS_APPID }} \
--password ${{ secrets.AZURE_SP_TESTS_PASSWORD }} \
--tenant ${{ secrets.AZURE_SP_TESTS_TENANTID }}

az account set --subscription ${{ secrets.AZURE_SUBSCRIPTIONID_TESTS }}

- name: List Test Resource Groups
run: |
echo "## Test resource group list" >> $GITHUB_STEP_SUMMARY
az group list --query "[?starts_with(name, 'samplestest-')].{Name:name, creationTime:tags.creationTime}" -o json > resource_groups.json

current_time=$(date +%s)
hours_ago=$((current_time - ${{ env.VALID_RESOURCE_WINDOW }}))

jq -r '.[] | select(.creationTime == null || .creationTime < '$hours_ago') | .Name' resource_groups.json > ${{ env.AZURE_RG_DELETE_LIST_FILE}}
jq -r '.[] | {name: .Name, creationTime: .creationTime // "None"}' resource_groups.json > $GITHUB_STEP_SUMMARY

- name: Delete Azure Resource Groups
run: |
echo "## Deleting resource group list" >> $GITHUB_STEP_SUMMARY
cat ${{ env.AZURE_RG_DELETE_LIST_FILE}} | while read -r line
do
echo " * $line" >> $GITHUB_STEP_SUMMARY
az group delete --resource-group $line --yes --verbose
done

- name: Create GitHub issue on failure
if: ${{ failure() }}
run: |
gh issue create --title "Samples purge test resources failed \
--body "Test failed on ${{ github.repository }}. See [workflow logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details." \
s--repo ${{ github.repository }}
37 changes: 21 additions & 16 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
if: steps.gen-id.outputs.RUN_TEST == 'true'
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: az CLI login
if: steps.gen-id.outputs.RUN_TEST == 'true' && matrix.credential == 'azure'
run: |
Expand Down Expand Up @@ -270,20 +270,25 @@ jobs:
- name: Run Playwright Test
if: steps.gen-id.outputs.RUN_TEST == 'true' && matrix.uiTestFile != ''
id: run-playwright-test
run: |
if [[ "${{ matrix.container }}" != "" ]]; then
rad resource expose containers ${{ matrix.container }} ${{ matrix.exposeArgs }} --port ${{ matrix.port }} &
echo "Endpoint: http://localhost:${{ matrix.port }}"
export ENDPOINT="http://localhost:${{ matrix.port }}"
else
endpoint="$(rad app status -a ${{ matrix.app }} | sed 's/ /\n/g' | grep http)"
echo "Endpoint: $endpoint"
export ENDPOINT=$endpoint
fi
cd playwright/
npm ci
npx playwright install --with-deps
npx playwright test ${{ matrix.uiTestFile }} --retries 3
uses: nick-fields/retry@v3
with:
timeout_minutes: 5
max_attempts: 3
retry_wait_seconds: 30
command: |
if [[ "${{ matrix.container }}" != "" ]]; then
rad resource expose containers ${{ matrix.container }} ${{ matrix.exposeArgs }} --port ${{ matrix.port }} &
echo "Endpoint: http://localhost:${{ matrix.port }}"
export ENDPOINT="http://localhost:${{ matrix.port }}"
else
endpoint="$(rad app status -a ${{ matrix.app }} | sed 's/ /\n/g' | grep http)"
echo "Endpoint: $endpoint"
export ENDPOINT=$endpoint
fi
cd playwright/
npm ci
npx playwright install --with-deps
npx playwright test ${{ matrix.uiTestFile }} --retries 3
- name: Upload Playwright Results
uses: actions/upload-artifact@v4
if: always() && ( steps.run-playwright-test.outcome == 'success' || steps.run-playwright-test.outcome == 'failure' )
Expand All @@ -300,7 +305,7 @@ jobs:
# Create pod-logs directory
mkdir -p playwright/pod-logs/${{ matrix.name }}
# Get pod logs and save to file
namespace="default-${{ matrix.app }}"
namespace="${{ matrix.env }}-${{ matrix.app }}"
label="radapp.io/application=${{ matrix.app }}"
pod_names=($(kubectl get pods -l $label -n $namespace -o jsonpath='{.items[*].metadata.name}'))
for pod_name in "${pod_names[@]}"; do
Expand Down
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Contributing

Radius is in an early phase of development right now. We welcome feedback in the form of issues that comes from usage and is aligned with the current scope and goals of the project. We also welcome contributions and PRs for bug fixes or security fixes. For new functionality or new samples please open an issue first to discuss the scope and goals of the feature. We will not accept new functionality or samples without an issue first.

## How to contribute

1. Fork the repository
2. Create a branch for your changes
3. Make your changes
4. Open a PR
5. Wait for a maintainer to review your PR

## Code of Conduct

Please refer to our [Radius Community Code of Conduct](https://github.com/project-radius/radius/blob/main/CODE_OF_CONDUCT.md)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project Radius Samples
# Radius Samples

This repository contains the source code for quickstarts, reference apps, and tutorials for Project Radius.
This repository contains the source code for quickstarts, reference apps, and tutorials for Radius.

To try out one of these samples, visit https://docs.radapp.dev

Expand Down
71 changes: 71 additions & 0 deletions playwright/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading