diff --git a/.github/workflows/iact3-test.yml b/.github/workflows/iact3-test.yml deleted file mode 100644 index 9e7eb4a2..00000000 --- a/.github/workflows/iact3-test.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: iact3-test - -on: - pull_request_target: - types: [ opened, synchronize, reopened ] - - -jobs: - iact3Test: - runs-on: ubuntu-latest - if: github.actor == github.event.pull_request.user.login - - steps: - - uses: actions/checkout@v3 - id: checkout - with: - fetch-depth: 0 - - - name: Find changed templates - id: changed-templates - run: | - git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge - git checkout -qf FETCH_HEAD - echo "changed_files=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master) | xargs)" >> $GITHUB_OUTPUT - echo $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master) | xargs) - - - name: Validate templates - uses: aliyun/alibabacloud-ros-tool-iact3@master - with: - templates: ${{ steps.changed-templates.outputs.changed_files }} - access_key_id: ${{ secrets.VALIDATE_ACCOUNT_KEY }} - access_key_secret: ${{ secrets.VALIDATE_ACCOUNT_SECRET }} - type: ${{ steps.white-list.outputs.type }} - id: validate-templates - if: always() - - - name: DingTalk Robot - env: - TITLE: ${{ github.event.pull_request.title }} - if: always() - continue-on-error: true - run: | - if [[ "${{ steps.validate-templates.outputs.status }}" = "success" ]]; then - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI pass. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - else - curl -H 'Content-Type: application/json;charset=utf-8' -d '{"msgtype": "text","text": {"content": "Iact3-validate CI failed. ${{ github.event.pull_request.user.login }} PR#${{ github.event.pull_request.number }}:${TITLE} ${{ github.event.pull_request.html_url }} "}}' ${{ secrets.DINGDING_WEBHOOK }} - fi \ No newline at end of file diff --git a/documents/solution/high-availability-architecture/serverless-high-availability-architecture.yml b/documents/solution/high-availability-architecture/serverless-high-availability-architecture.yml index f075cd8e..38757835 100644 --- a/documents/solution/high-availability-architecture/serverless-high-availability-architecture.yml +++ b/documents/solution/high-availability-architecture/serverless-high-availability-architecture.yml @@ -176,7 +176,7 @@ Resources: AccountPrivilege: ReadWrite DBName: Ref: PolarDBDatabase - Alb: + ALB: Type: 'ALIYUN::ALB::LoadBalancer' Properties: LoadBalancerName: @@ -211,7 +211,7 @@ Resources: - .StackId[:5] - StackId: Ref: ALIYUN::StackId - SaeApp: + SAE: Type: 'ALIYUN::SAE::Application' DependsOn: SaeNamespace Properties: @@ -261,7 +261,7 @@ Resources: Liveness: '{"httpGet":{"path":"/","port":80,"scheme":"HTTP"},"initialDelaySeconds":10,"timeoutSeconds":10,"periodSeconds":10,"successThreshold":1,"failureThreshold":3}' WaitApp: Type: 'ALIYUN::ROS::Sleep' - DependsOn: SaeApp + DependsOn: SAE Properties: CreateDuration: 180 SaeIngress: @@ -273,19 +273,19 @@ Resources: Description: serverless-demo-router LoadBalanceType: alb SlbId: - Ref: Alb + Ref: ALB ListenerProtocol: HTTP ListenerPort: 80 Rules: - Domain: example.com Path: / AppId: - Ref: SaeApp + Ref: SAE ContainerPort: 80 BackendProtocol: http DefaultRule: AppId: - Ref: SaeApp + Ref: SAE ContainerPort: 80 BackendProtocol: http Outputs: @@ -294,7 +294,7 @@ Outputs: zh-cn: Web 访问地址。 en: The Addresses of Web. Value: - 'Fn::Sub': 'http://${Alb.DNSName}' + 'Fn::Sub': 'http://${ALB.DNSName}' Metadata: ALIYUN::ROS::Interface: ParameterGroups: