Skip to content

Commit

Permalink
Merge branch 'storage-browser/integrity' into opt-in-checksum
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanZhengYP authored Oct 9, 2024
2 parents b51a94d + 7318ba2 commit 1c4034d
Show file tree
Hide file tree
Showing 369 changed files with 7,120 additions and 3,172 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
/packages/geo @aws-amplify/amplify-js @aws-amplify/amplify-ui
/packages/pubsub @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/aws-amplify/package.json @aws-amplify/amplify-js-admins
packages/storage/src/storageBrowser @aws-amplify/amplify-js @aws-amplify/amplify-ui
packages/storage/storage-browser @aws-amplify/amplify-js @aws-amplify/amplify-ui
/.circleci/ @aws-amplify/amplify-js @aws-amplify/amplify-devops
/.github/ @aws-amplify/amplify-js-admins

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/1.bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Bug report
description: Create a report to help us improve Amplify JS
labels: pending-triage

body:
- type: markdown
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/2.feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Feature request
description: Suggest an idea for Amplify JS
labels: pending-triage

body:
- type: markdown
Expand Down
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/3.usage-question.md

This file was deleted.

46 changes: 0 additions & 46 deletions .github/ISSUE_TEMPLATE/4.rfc.md

This file was deleted.

7 changes: 4 additions & 3 deletions .github/dependency-review/dependecy-review-config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
allow-licenses:
- 'Apache-2.0'
- '0BSD'
- 'BSL-1.0'
- 'Apache-2.0'
- 'BlueOak-1.0.0'
- 'BSD-1-Clause'
- 'BSD-2-Clause-FreeBSD'
- 'BSD-2-Clause'
- 'BSD-3-Clause-Attribution'
- 'BSD-3-Clause'
- 'BSL-1.0'
- 'CC-BY-3.0'
- 'CC-BY-4.0'
- 'CC0-1.0'
- 'curl'
- 'ISC'
- 'JSON'
Expand All @@ -20,4 +22,3 @@ allow-licenses:
- 'Unlicense'
- 'WTFPL'
- 'Zlib'
- 'CC0-1.0'
4 changes: 4 additions & 0 deletions .github/integ-config/detox-integ-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@
- test_name: 'integ_rn_ios_api_v6_rn_72_detox_cli'
working_directory: amplify-js-samples-staging/samples/react-native/api/v6/ApiGRAPHQL
timeout_minutes: 120
- test_name: 'integ_rn_ios_oidc_signout'
working_directory: amplify-js-samples-staging/samples/react-native/auth/HosteduiApp
timeout_minutes: 120
host_signout_page: true
14 changes: 14 additions & 0 deletions .github/integ-config/integ-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,13 @@ tests:
sample_name: [sign-in-with-oauth]
spec: sign-in-with-oauth
browser: [chrome]
- test_name: integ_vue_sign_out_of_oidc_provider
desc: 'Sign-out of OIDC provider'
framework: vue
category: auth
sample_name: [sign-in-with-oauth]
spec: sign-out-oidc-provider
browser: [chrome]

# AUTH GEN2
- test_name: integ_react_javascript_authentication_gen2
Expand Down Expand Up @@ -595,6 +602,13 @@ tests:
sample_name: [sign-in-with-oauth]
spec: sign-in-with-oauth
browser: [chrome]
- test_name: subdomain_authentication
desc: 'Sign-in with the OAuth flow and subdomains'
framework: next
category: auth
sample_name: [subdomains]
spec: subdomains
browser: [chrome]

# DISABLED Angular/Vue tests:
# TODO: delete tests or add custom ui logic to support them.
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/callable-e2e-test-detox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ on:
timeout_minutes:
required: true
type: number
host_signout_page:
required: false
type: boolean
default: false

jobs:
e2e-test:
name: E2E-Detox ${{ inputs.test_name }}
runs-on: macos-latest
runs-on: macos-latest-large
timeout-minutes: ${{ inputs.timeout_minutes }}

steps:
Expand Down Expand Up @@ -70,6 +74,11 @@ jobs:
JEST_JUNIT_OUTPUT_NAME: detox-test-results.xml
working-directory: ${{ inputs.working_directory }}
shell: bash
- name: Start the http-server and host the oidc signout page locally (background).
if: ${{ inputs.host_signout_page }}
run: yarn host:signout
working-directory: ${{ inputs.working_directory }}
shell: bash
- name: Detox run
run: |
$GITHUB_WORKSPACE/amplify-js/scripts/retry-yarn-script.sh -s 'detox test -c ios.sim.debug -u' -n 3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/callable-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ jobs:
test_name: ${{ matrix.integ-config.test_name }}
working_directory: ${{ matrix.integ-config.working_directory }}
timeout_minutes: ${{ matrix.integ-config.timeout_minutes || 45 }}
host_signout_page: ${{ matrix.integ-config.host_signout_page || false }}
22 changes: 22 additions & 0 deletions .github/workflows/issue-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Issue Closed

on:
issues:
types: [closed]

permissions:
issues: write

jobs:
cleanup-labels:
runs-on: ubuntu-latest
if: ${{ (contains(github.event.issue.labels.*.name, 'pending-community-response') || contains(github.event.issue.labels.*.name, 'pending-maintainer-response') || contains(github.event.issue.labels.*.name, 'pending-triage')) }}
steps:
- name: Remove unnecessary labels after closing
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-community-response" --remove-label "pending-maintainer-response" --remove-label "pending-triage"
31 changes: 31 additions & 0 deletions .github/workflows/issue-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Issue Comment

on:
issue_comment:
types: [created]

jobs:
adjust-labels:
runs-on: ubuntu-latest
permissions:
issues: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
steps:
- name: Remove pending-community-response when new comment received
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) && !github.event.issue.pull_request }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-community-response"
- name: Add pending-maintainer-response when new community comment received
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
- name: Remove pending-maintainer-response when new owner/member comment received
if: ${{ contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-maintainer-response"
21 changes: 21 additions & 0 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Issue Labeled

on:
issues:
types: [labeled]

jobs:
remove-pending-triage-label:
runs-on: ubuntu-latest
if: ${{ contains(fromJSON('["question", "bug", "feature-request"]'), github.event.label.name) }}
permissions:
issues: write
steps:
- name: Remove the pending-triage label
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --remove-label "pending-triage"
25 changes: 25 additions & 0 deletions .github/workflows/issue-opened.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Issue Opened

on:
issues:
types: [opened]

jobs:
add-issue-opened-labels:
runs-on: ubuntu-latest
permissions:
issues: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE_NUMBER: ${{ github.event.issue.number }}
REPOSITORY_NAME: ${{ github.event.repository.full_name }}
steps:
- name: Add the pending-triage label
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-triage"
- name: Add the pending-maintainer-response label
if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.issue.author_association) }}
shell: bash
run: |
gh issue edit $ISSUE_NUMBER --repo $REPOSITORY_NAME --add-label "pending-maintainer-response"
15 changes: 0 additions & 15 deletions .github/workflows/issue-pending-response.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/push-preid-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:
on:
push:
branches:
- storage-browser/main
- storage-browser/integrity

jobs:
e2e:
Expand All @@ -34,5 +34,5 @@ jobs:
# The preid should be detected from the branch name recommending feat/{PREID}/whatever as branch naming pattern
# if your branch doesn't follow this pattern, you can override it here for your branch.
with:
preid: storage-browser
preid: storage-browser-integrity
# preid: ${{ needs.parse-preid.outputs.preid }}
2 changes: 1 addition & 1 deletion docs/api/assets/navigation.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/api/assets/search.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion docs/api/functions/aws_amplify.api.generateClient.html

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion docs/api/functions/aws_amplify.api.isCancelError.html

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion docs/api/functions/aws_amplify.auth.decodeJWT.html

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion docs/api/functions/aws_amplify.auth.fetchAuthSession.html

Large diffs are not rendered by default.

This file was deleted.

2 changes: 0 additions & 2 deletions docs/api/functions/aws_amplify.datastore.isEnumFieldType.html

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions docs/api/functions/aws_amplify.datastore.isPredicateObj.html

This file was deleted.

2 changes: 0 additions & 2 deletions docs/api/functions/aws_amplify.datastore.isSchemaModel.html

This file was deleted.

This file was deleted.

11 changes: 10 additions & 1 deletion docs/api/functions/aws_amplify.datastore.syncExpression-1.html

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion docs/api/functions/aws_amplify.storage.isCancelError.html

Large diffs are not rendered by default.

Loading

0 comments on commit 1c4034d

Please sign in to comment.