Skip to content

Commit

Permalink
Merge remote-tracking branch 'internal/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jvallexm
jvallexm committed May 3, 2024
2 parents 2dce23c + 693d3b9 commit 4e70a39
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

## 1.15.3

### Upgrade Notes

- VPCs in Terraform code now always have `address_prefix_management` set to `manual`

### Features

- Users can integrate Security and Compliance Center with Cloud Object storage from the `/forms/sccV2` page
Expand Down
4 changes: 3 additions & 1 deletion client/src/lib/docs/release-notes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"Fixed an issue causing irregular spacing on the Power VS Instances and VTL forms",
"Fixed an issue causing Replication to not be enabled correctly on Power VS Storage pools"
],
"upgrade_notes": []
"upgrade_notes": [
"VPCs in Terraform code now always have `address_prefix_management` set to `manual`"
]
},
{
"version": "1.15.2",
Expand Down
15 changes: 8 additions & 7 deletions client/src/lib/json-to-iac/scc-v2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,16 @@ function formatScc2(scc_v2, config) {
`scc_to_${scc_v2.cos}_object_storage_policy`,
{
source_service_name: "compliance",
description: `Allow Security and Compliance Center to access ${titleCase(scc_v2.cos)} Object Storage`,
description: `Allow Security and Compliance Center to access ${titleCase(
scc_v2.cos
)} Object Storage`,
target_service_name: "cloud-object-storage",
target_resource_instance_id: cosRef(
target_resource_instance_id: cosRef(
scc_v2.cos,
"guid",
getObjectFromArray(config.object_storage, "name", scc_v2.cos)
.use_data
getObjectFromArray(config.object_storage, "name", scc_v2.cos).use_data
),
roles: ["Writer"]
roles: ["Writer"],
}
);
tf += jsonToTfPrint(
Expand All @@ -154,8 +155,8 @@ function formatScc2(scc_v2, config) {
],
event_notifications: [],
depends_on: [
`\${ibm_iam_authorization_policy.scc_to_${scc_v2.cos}_object_storage_policy}`
]
`\${ibm_iam_authorization_policy.scc_to_${scc_v2.cos}_object_storage_policy}`,
],
}
).replace(/=\s\[\s+\]/g, "{}");
}
Expand Down
4 changes: 1 addition & 3 deletions client/src/lib/json-to-iac/vpc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,13 @@ function ibmIsVpc(vpc, config, useVarRef) {
: null,
tags: getTags(config, useVarRef),
no_sg_acl_rules: true,
address_prefix_management: "manual",
},
};
if (!vpc.use_data) {
if (vpc.classic_access) {
data.data.classic_access = true;
}
if (vpc.manual_address_prefix_management) {
data.data.address_prefix_management = "manual";
}
}
return data;
}
Expand Down
7 changes: 5 additions & 2 deletions unit-tests/json-to-iac/vpc.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ resource "ibm_is_vpc" "management_vpc" {
name = "\${var.prefix}-management-vpc"
resource_group = var.slz_management_rg_id
no_sg_acl_rules = true
address_prefix_management = "manual"
default_network_acl_name = null
default_security_group_name = null
default_routing_table_name = null
Expand Down Expand Up @@ -226,6 +227,7 @@ resource "ibm_is_vpc" "management_vpc" {
default_security_group_name = "null"
default_routing_table_name = "null"
no_sg_acl_rules = true
address_prefix_management = "manual"
tags = [
"hello",
"world"
Expand Down Expand Up @@ -268,8 +270,8 @@ resource "ibm_is_vpc" "management_vpc" {
name = "\${var.prefix}-management-vpc"
resource_group = var.slz_management_rg_id
no_sg_acl_rules = true
classic_access = true
address_prefix_management = "manual"
classic_access = true
default_network_acl_name = null
default_security_group_name = null
default_routing_table_name = null
Expand Down Expand Up @@ -3908,6 +3910,7 @@ resource "ibm_is_vpc" "customer_a_vpc" {
name = "\${var.prefix}-customer-a-vpc"
resource_group = var.craig_rg_id
no_sg_acl_rules = true
address_prefix_management = "manual"
default_network_acl_name = null
default_security_group_name = null
default_routing_table_name = null
Expand Down Expand Up @@ -4409,7 +4412,7 @@ resource "ibm_is_subnet" "customer_a_subnet_tier_zone_2" {
let expectedData = {
customer_a_vpc: {
"main.tf":
'##############################################################################\n# Customer AVPC\n##############################################################################\n\nresource "ibm_is_vpc" "customer_a_vpc" {\n name = "${var.prefix}-customer-a-vpc"\n resource_group = var.craig_rg_id\n tags = var.tags\n no_sg_acl_rules = true\n default_network_acl_name = null\n default_security_group_name = null\n default_routing_table_name = null\n}\n\nresource "ibm_is_vpc_address_prefix" "customer_a_subnet_tier_zone_1_prefix" {\n name = "${var.prefix}-customer-a-subnet-tier-zone-1"\n vpc = ibm_is_vpc.customer_a_vpc.id\n zone = "${var.region}-1"\n cidr = "10.10.10.0/24"\n}\n\nresource "ibm_is_vpc_address_prefix" "customer_a_subnet_tier_zone_2_prefix" {\n name = "${var.prefix}-customer-a-subnet-tier-zone-2"\n vpc = ibm_is_vpc.customer_a_vpc.id\n zone = "${var.region}-2"\n cidr = "10.20.10.0/24"\n}\n\nresource "ibm_is_public_gateway" "customer_a_gateway_zone_2" {\n name = "${var.prefix}-customer-a-gateway-zone-2"\n vpc = ibm_is_vpc.customer_a_vpc.id\n resource_group = var.craig_rg_id\n zone = "${var.region}-2"\n tags = var.tags\n}\n\nresource "ibm_is_subnet" "customer_a_subnet_tier_zone_1" {\n vpc = ibm_is_vpc.customer_a_vpc.id\n name = "${var.prefix}-customer-a-subnet-tier-zone-1"\n zone = "${var.region}-1"\n resource_group = var.craig_rg_id\n tags = var.tags\n network_acl = ibm_is_network_acl.customer_a_subnet_acl_acl.id\n ipv4_cidr_block = ibm_is_vpc_address_prefix.customer_a_subnet_tier_zone_1_prefix.cidr\n}\n\nresource "ibm_is_subnet" "customer_a_subnet_tier_zone_2" {\n vpc = ibm_is_vpc.customer_a_vpc.id\n name = "${var.prefix}-customer-a-subnet-tier-zone-2"\n zone = "${var.region}-2"\n resource_group = var.craig_rg_id\n tags = var.tags\n network_acl = ibm_is_network_acl.customer_a_subnet_acl_acl.id\n ipv4_cidr_block = ibm_is_vpc_address_prefix.customer_a_subnet_tier_zone_2_prefix.cidr\n public_gateway = ibm_is_public_gateway.customer_a_gateway_zone_2.id\n}\n\n##############################################################################\n',
'##############################################################################\n# Customer AVPC\n##############################################################################\n\nresource "ibm_is_vpc" "customer_a_vpc" {\n name = "${var.prefix}-customer-a-vpc"\n resource_group = var.craig_rg_id\n tags = var.tags\n no_sg_acl_rules = true\n address_prefix_management = "manual"\n default_network_acl_name = null\n default_security_group_name = null\n default_routing_table_name = null\n}\n\nresource "ibm_is_vpc_address_prefix" "customer_a_subnet_tier_zone_1_prefix" {\n name = "${var.prefix}-customer-a-subnet-tier-zone-1"\n vpc = ibm_is_vpc.customer_a_vpc.id\n zone = "${var.region}-1"\n cidr = "10.10.10.0/24"\n}\n\nresource "ibm_is_vpc_address_prefix" "customer_a_subnet_tier_zone_2_prefix" {\n name = "${var.prefix}-customer-a-subnet-tier-zone-2"\n vpc = ibm_is_vpc.customer_a_vpc.id\n zone = "${var.region}-2"\n cidr = "10.20.10.0/24"\n}\n\nresource "ibm_is_public_gateway" "customer_a_gateway_zone_2" {\n name = "${var.prefix}-customer-a-gateway-zone-2"\n vpc = ibm_is_vpc.customer_a_vpc.id\n resource_group = var.craig_rg_id\n zone = "${var.region}-2"\n tags = var.tags\n}\n\nresource "ibm_is_subnet" "customer_a_subnet_tier_zone_1" {\n vpc = ibm_is_vpc.customer_a_vpc.id\n name = "${var.prefix}-customer-a-subnet-tier-zone-1"\n zone = "${var.region}-1"\n resource_group = var.craig_rg_id\n tags = var.tags\n network_acl = ibm_is_network_acl.customer_a_subnet_acl_acl.id\n ipv4_cidr_block = ibm_is_vpc_address_prefix.customer_a_subnet_tier_zone_1_prefix.cidr\n}\n\nresource "ibm_is_subnet" "customer_a_subnet_tier_zone_2" {\n vpc = ibm_is_vpc.customer_a_vpc.id\n name = "${var.prefix}-customer-a-subnet-tier-zone-2"\n zone = "${var.region}-2"\n resource_group = var.craig_rg_id\n tags = var.tags\n network_acl = ibm_is_network_acl.customer_a_subnet_acl_acl.id\n ipv4_cidr_block = ibm_is_vpc_address_prefix.customer_a_subnet_tier_zone_2_prefix.cidr\n public_gateway = ibm_is_public_gateway.customer_a_gateway_zone_2.id\n}\n\n##############################################################################\n',
"versions.tf":
'##############################################################################\n# Terraform Providers\n##############################################################################\n\nterraform {\n required_providers {\n ibm = {\n source = "IBM-Cloud/ibm"\n version = "~>1.63.0"\n }\n }\n required_version = ">=1.5"\n}\n\n##############################################################################\n',
"variables.tf":
Expand Down

0 comments on commit 4e70a39

Please sign in to comment.