From 86216e82f67d212dc60eca7b863c3097e666ae7a Mon Sep 17 00:00:00 2001 From: Aiyflowers <109748531+Aiyflowers@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:12:13 +0800 Subject: [PATCH 1/3] Update main.tf add PolicyReadable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加任意用户可读存储桶策略 --- aliyun/oss/special_bucket_policy/main.tf | 110 +++++++++++++---------- 1 file changed, 63 insertions(+), 47 deletions(-) diff --git a/aliyun/oss/special_bucket_policy/main.tf b/aliyun/oss/special_bucket_policy/main.tf index 5f4cbb4..f045817 100644 --- a/aliyun/oss/special_bucket_policy/main.tf +++ b/aliyun/oss/special_bucket_policy/main.tf @@ -9,53 +9,69 @@ resource "alicloud_oss_bucket" "Create_Bucket" { force_destroy = true policy = < Date: Tue, 11 Feb 2025 00:43:59 +0800 Subject: [PATCH 2/3] fix man.tf(instance_type) --- aliyun/ecs/ecs_ssrf/main.tf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aliyun/ecs/ecs_ssrf/main.tf b/aliyun/ecs/ecs_ssrf/main.tf index 95c5f1e..10f5e70 100644 --- a/aliyun/ecs/ecs_ssrf/main.tf +++ b/aliyun/ecs/ecs_ssrf/main.tf @@ -1,10 +1,11 @@ resource "alicloud_instance" "instance" { security_groups = alicloud_security_group.group.*.id - instance_type = data.alicloud_instance_types.types_ds.instance_types.0.id + instance_type = "ecs.e-c1m1.large" image_id = "ubuntu_18_04_64_20G_alibase_20190624.vhd" instance_name = "huocorp_terraform_goat_instance" vswitch_id = alicloud_vswitch.vswitch.id - system_disk_size = 20 + system_disk_size = 40 + system_disk_category = "cloud_essd" internet_max_bandwidth_out = 100 user_data = < Date: Tue, 11 Feb 2025 01:29:36 +0800 Subject: [PATCH 3/3] fix: fix aliyun tf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当按照指定教程步骤进行操作时，出现Zone.NotOnSale报错，导致ECS无法创建，但部分资源仍被创建。 报错原因是main.tf 中的instance_type配置问题。 解决办法： 参阅教程将instance_type修改为固定值ecs.e-c1m1.large 同时增加system_disk_category = "cloud_essd" 并修改system_disk_size = 40。经测试，上述修改可解决问题。 --- aliyun/ecs/ecs_virtual_machine_disks_are_unencrypted/main.tf | 5 +++-- aliyun/networking/vpc_security_group_open_all_ports/main.tf | 5 +++-- .../networking/vpc_security_group_open_common_ports/main.tf | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aliyun/ecs/ecs_virtual_machine_disks_are_unencrypted/main.tf b/aliyun/ecs/ecs_virtual_machine_disks_are_unencrypted/main.tf index 573e4ec..e0e1de4 100644 --- a/aliyun/ecs/ecs_virtual_machine_disks_are_unencrypted/main.tf +++ b/aliyun/ecs/ecs_virtual_machine_disks_are_unencrypted/main.tf @@ -1,9 +1,10 @@ resource "alicloud_instance" "instance" { security_groups = alicloud_security_group.group.*.id - instance_type = data.alicloud_instance_types.types_ds.instance_types.0.id + instance_type = "ecs.e-c1m1.large" image_id = "ubuntu_18_04_64_20G_alibase_20190624.vhd" vswitch_id = alicloud_vswitch.vswitch.id - system_disk_size = 20 + system_disk_size = 40 + system_disk_category = "cloud_essd" instance_name = "huocorp_terraform_goat_instance" depends_on = [ alicloud_security_group.group, diff --git a/aliyun/networking/vpc_security_group_open_all_ports/main.tf b/aliyun/networking/vpc_security_group_open_all_ports/main.tf index 0666348..ef40866 100644 --- a/aliyun/networking/vpc_security_group_open_all_ports/main.tf +++ b/aliyun/networking/vpc_security_group_open_all_ports/main.tf @@ -1,9 +1,10 @@ resource "alicloud_instance" "instance" { security_groups = alicloud_security_group.group.*.id - instance_type = data.alicloud_instance_types.types_ds.instance_types.0.id + instance_type = "ecs.e-c1m1.large" image_id = "ubuntu_18_04_64_20G_alibase_20190624.vhd" vswitch_id = alicloud_vswitch.vswitch.id - system_disk_size = 20 + system_disk_size = 40 + system_disk_category = "cloud_essd" instance_name = "huocorp_terraform_goat_instance" depends_on = [ alicloud_security_group.group, diff --git a/aliyun/networking/vpc_security_group_open_common_ports/main.tf b/aliyun/networking/vpc_security_group_open_common_ports/main.tf index cbc8527..e65caa3 100644 --- a/aliyun/networking/vpc_security_group_open_common_ports/main.tf +++ b/aliyun/networking/vpc_security_group_open_common_ports/main.tf @@ -1,9 +1,10 @@ resource "alicloud_instance" "instance" { security_groups = alicloud_security_group.group.*.id - instance_type = data.alicloud_instance_types.types_ds.instance_types.0.id + instance_type = "ecs.e-c1m1.large" image_id = "ubuntu_18_04_64_20G_alibase_20190624.vhd" vswitch_id = alicloud_vswitch.vswitch.id - system_disk_size = 20 + system_disk_size = 40 + system_disk_category = "cloud_essd" instance_name = "huocorp_terraform_goat_instance" depends_on = [ alicloud_security_group.group,