Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VPC sg, sgrules migrated acc to new vpc-go-sdk #1476

Merged
merged 3 commits into from
May 26, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions examples/ibm-private-dns/main.tf
Original file line number Diff line number Diff line change
@@ -40,9 +40,8 @@ resource "ibm_dns_permitted_network" "test-pdns-permitted-network-nw" {


data "ibm_dns_permitted_networks" "test" {
depends_on = [ibm_dns_permitted_network.test-pdns-permitted-network-nw]
instance_id = ibm_dns_zone.test-pdns-zone.instance_id
zone_id = ibm_dns_zone.test-pdns-zone.zone_id
instance_id = ibm_dns_permitted_network.test-pdns-permitted-network-nw.instance_id
zone_id = ibm_dns_permitted_network.test-pdns-permitted-network-nw.zone_id
}

output "dns_permitted_nw_output" {
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -351,6 +351,8 @@ github.com/hashicorp/terraform-plugin-sdk v1.6.0 h1:Um5hsAL7kKsfTHtan8lybY/d03F2
github.com/hashicorp/terraform-plugin-sdk v1.6.0/go.mod h1:H5QLx/uhwfxBZ59Bc5SqT19M4i+fYt7LZjHTpbLZiAg=
github.com/hashicorp/terraform-plugin-sdk v1.9.1 h1:AgHnd6yPCg7o57XWrv4L7tIMdF0KQpcZro1pDHF1Xbw=
github.com/hashicorp/terraform-plugin-sdk v1.10.0 h1:JLV3dUnsAF8TKGUdEPkvl9H0Xb2LdcHxLJyDPZ1A5/U=
github.com/hashicorp/terraform-plugin-sdk v1.11.0 h1:qAI27eiSdIm0D+GCdlyGwtcWAYkjdVWC7OdS/3XcJq4=
github.com/hashicorp/terraform-plugin-sdk v1.12.0 h1:HPp65ShSsKUMPf6jD50UQn/xAjyrGVO4FxI63bvu+pc=
github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg=
github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
github.com/hashicorp/tf-sdk-migrator v1.0.0/go.mod h1:QWLOMtAF2IMPDqKLN30L4ijNYVco4YF6HLul6VDPNfc=
6 changes: 3 additions & 3 deletions ibm/data_source_ibm_private_dns_permitted_network_test.go
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ func testAccCheckIBMpDNSPermittedNetworksDataSourceConfig(riname, vpcname, zonen

resource "ibm_is_vpc" "test_pdns_vpc" {
name = "%s"
resource_group = data.ibm_resource_group.rg.id
}

resource "ibm_dns_zone" "test-pdns-zone" {
@@ -62,8 +63,7 @@ func testAccCheckIBMpDNSPermittedNetworksDataSourceConfig(riname, vpcname, zonen
}

data "ibm_dns_permitted_networks" "test" {
depends_on = [ibm_dns_permitted_network.test-pdns-permitted-network-nw]
instance_id = ibm_dns_zone.test-pdns-zone.instance_id
zone_id = ibm_dns_zone.test-pdns-zone.zone_id
instance_id = ibm_dns_permitted_network.test-pdns-permitted-network-nw.instance_id
zone_id = ibm_dns_permitted_network.test-pdns-permitted-network-nw.zone_id
}`, riname, vpcname, zonename)
}
6 changes: 3 additions & 3 deletions ibm/resource_ibm_is_instance.go
Original file line number Diff line number Diff line change
@@ -94,9 +94,9 @@ func resourceIBMISInstance() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Update: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
Update: schema.DefaultTimeout(10 * time.Minute),
},

CustomizeDiff: customdiff.Sequence(
4 changes: 2 additions & 2 deletions ibm/resource_ibm_is_lb.go
Original file line number Diff line number Diff line change
@@ -40,8 +40,8 @@ func resourceIBMISLB() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
},

CustomizeDiff: customdiff.Sequence(
6 changes: 3 additions & 3 deletions ibm/resource_ibm_is_lb_listener.go
Original file line number Diff line number Diff line change
@@ -37,9 +37,9 @@ func resourceIBMISLBListener() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Update: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Update: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
},

Schema: map[string]*schema.Schema{
6 changes: 3 additions & 3 deletions ibm/resource_ibm_is_lb_pool.go
Original file line number Diff line number Diff line change
@@ -45,9 +45,9 @@ func resourceIBMISLBPool() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Update: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Update: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
},

Schema: map[string]*schema.Schema{
4 changes: 2 additions & 2 deletions ibm/resource_ibm_is_networkacls.go
Original file line number Diff line number Diff line change
@@ -48,8 +48,8 @@ func resourceIBMISNetworkACL() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
},

Schema: map[string]*schema.Schema{
4 changes: 2 additions & 2 deletions ibm/resource_ibm_is_public_gateway.go
Original file line number Diff line number Diff line change
@@ -40,8 +40,8 @@ func resourceIBMISPublicGateway() *schema.Resource {
Importer: &schema.ResourceImporter{},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(60 * time.Minute),
Delete: schema.DefaultTimeout(60 * time.Minute),
Create: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(10 * time.Minute),
},

CustomizeDiff: customdiff.Sequence(
Loading