Merge pull request #136 from ruanzhengxin-zhuxing/master

Modify GA tpl

documents/help/ga/ga-accelerated-access-to-specified-ip.yml

@@ -1,13 +1,10 @@
-ROSTemplateFormatVersion: '2015-09-01'
+ROSTemplateFormatVersion: '2015-09-01'  
 Parameters:
   AccelerateRegionId:
     Type: String
     Label:
       en: Accelerate region ID.
       zh-cn: 加速地域ID。
-    Description:
-      zh-cn: 该模板不支持跨境网络（中国内地的地域与中国香港、中国澳门、中国台湾地域或其他国家和地区）加速。业务涉及跨境网络时，您可以选择中国香港作为加速地域或终端节点地域。
-      en: This template does not support cross-border network acceleration. When your business involves cross-border networks, you can choose Hong Kong, China as the acceleration region or terminal node region.
     AssociationProperty: ALIYUN::ECS::RegionId
     Default: cn-hongkong
   EndpointGroupRegion:
@@ -17,23 +14,27 @@ Parameters:
       zh-cn: 终端节点所在的地域ID。
     AssociationProperty: ALIYUN::ECS::RegionId
     Default: us-west-1
-  EndpointIPs:
-    Type: Json
+  EndpointIP:
+    Type: String
     Label:
-      en: Endpoint ip list.
+      en: Endpoint IP.
       zh-cn: 终端节点IP。
-    AssociationProperty: List[Parameter]
-    AssociationPropertyMetadata:
-      Parameter:
-        Type: String
-    MinLength: 2
-    MaxLength: 2
+  EnableCrossBorder:
+    Type: Boolean
+    Label:
+      en: CDT type accelerator whether to agree cross-border compliance commitments. If there is a cross-border situation between the acceleration region and the endpoint group region, you must agree to the compliance commitment.
+      zh-cn: CDT加速实例是否同意跨境合规协议。如果您的业务涉及跨境（中国内地的地域与中国香港、中国澳门、中国台湾地域或其他国家和地区）加速，必须同意该合规承诺。
+    Description:
+      en: "Please note: Your use of this product or this function will transfer your business data on the cloud to the region or product deployment region of your choice, which may involve cross-border data. You agree and confirm that you have full authority to dispose of this business data and are fully responsible for the data transmission. You should ensure that your data transfer complies with all applicable laws, including providing adequate data security protection technologies and strategies, fulfilling legal obligations such as obtaining full express consent from individuals, completing data export security assessment and declaration, and you promise that your business data does not contain The transmission or disclosure of which is restricted, prohibited or prohibited by any applicable law. If you fail to comply with the foregoing statements and warranties, you will bear the corresponding legal consequences, and you shall be liable for compensation for any losses suffered by Alibaba Cloud and or other affiliated companies."
+      zh-cn: 请注意：您使用该产品或该功能，将使您在云上的业务数据传输至您所选择的区域或产品部署区域，可能会涉及数据跨境。您同意并确认，您完全拥有该份业务数据的所有处置权限，对数据传输的行为全权负责。您应确保您的数据传输符合所有适用法律，包括提供充分的数据安全保护技术和策略，履行获得个人充分明示同意、完成数据出境安全评估和申报等法定义务，且您承诺您的业务数据不含任何所适用法律限制、禁止传输或披露的内容。如您未遵守前述声明与保证，您将承担对应的法律后果，导致阿里云和或其他关联公司遭受任何损失的，您应承担赔偿责任。
 Resources:
   Accelerator:
     Type: ALIYUN::GA::Accelerator
     Properties:
       BandwidthBillingType: CDT
       InstanceChargeType: PayAsYouGo
+      EnableCrossBorder:
+        Ref: EnableCrossBorder
   AccelerateRegion:
     Type: ALIYUN::GA::IpSets
     Properties:
@@ -67,17 +68,9 @@ Resources:
         Ref: Listener
       EndpointConfigurations:
       - Type: Ip
-        Weight: 10
+        Weight: 100
         Endpoint:
-          Fn::Select:
-          - 0
-          - Ref: EndpointIPs
-      - Type: Ip
-        Weight: 40
-        Endpoint:
-          Fn::Select:
-          - 1
-          - Ref: EndpointIPs
+          Ref: EndpointIP
 Outputs:
   AcceleratorId:
     Description:
@@ -114,10 +107,16 @@ Metadata:
           zh-cn: 加速地域
     - Parameters:
       - EndpointGroupRegion
-      - EndpointIPs
+      - EndpointIP
       Label:
         default:
           en: EndpointGroup
           zh-cn: 终端节点
+    - Parameters:
+      - EnableCrossBorder
+      Label:
+        default:
+          en: Cross-border Compliance Commitments
+          zh-cn: 跨境合规承诺
     TemplateTags:
     - acs:document-help:ga:加速访问指定IP的后端服务