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.

Sign up for GitHub

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

vpn advance config #318

Closed
wants to merge 40 commits into from
Closed

vpn advance config #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6bbf648
Update build.sh
ujjwal-ibm Jan 24, 2024
ff09301
sdk changes
ujjwal-ibm Mar 6, 2024
021de53
Update resource_ibm_is_snapshot_consistency_group.go
ujjwal-ibm Mar 6, 2024
1fef14e
vpn 113 changes
ujjwal-ibm Mar 6, 2024
38b7e55
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm Mar 7, 2024
c09ce16
some changes
ujjwal-ibm Mar 7, 2024
bb59aae
updated sdk
ujjwal-ibm Mar 8, 2024
a55ea87
Added deprecation
ujjwal-ibm Mar 8, 2024
d3dbb79
made changes to sdk
ujjwal-ibm Mar 8, 2024
01883f8
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm Mar 8, 2024
ad9cc50
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm Mar 8, 2024
487cdc1
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm Mar 8, 2024
afb2e0a
Update is_vpn_gateway_connection.html.markdown
ujjwal-ibm Mar 14, 2024
b76e6ce
Merge branch 'master' into vpn-advanceconfig
ujjwal-ibm Mar 14, 2024
963e68e
sdk update
ujjwal-ibm Apr 1, 2024
ada59c0
sdk changes
ujjwal-ibm Apr 1, 2024
4f32b5a
set version to todays date in sdk
deepaksibm Apr 8, 2024
f594a92
temporary fix for routing protocol in sdk.
deepaksibm Apr 12, 2024
5d3061e
Merge remote-tracking branch 'origin/buildsh-forbinaries' into vpn-ad…
ujjwal-ibm Apr 17, 2024
744f904
error resolved
ujjwal-ibm Apr 25, 2024
d7d7765
go mod changes reverted
ujjwal-ibm Apr 25, 2024
6d15d7c
removed sdk
ujjwal-ibm May 14, 2024
a3d9f9d
Merge branch 'master' into vpn-advanceconfig
ujjwal-ibm May 14, 2024
12b531e
Update go.sum
ujjwal-ibm May 14, 2024
449c375
Update data_source_ibm_is_vpn_gateway_connection.go
ujjwal-ibm May 15, 2024
4816252
fixed datasource errors
ujjwal-ibm May 15, 2024
2ffd72b
gateway fix
ujjwal-ibm May 15, 2024
97aae00
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm May 15, 2024
2fb797f
Merge branch 'master' into vpn-advanceconfig
ujjwal-ibm May 15, 2024
50ca95d
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm May 15, 2024
0758a90
Merge branch 'master' into vpn-advanceconfig
ujjwal-ibm May 15, 2024
3a0f48e
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm May 15, 2024
695b648
Merge branch 'master' into vpn-advanceconfig
ujjwal-ibm May 21, 2024
8b0e38c
Update provider.go
ujjwal-ibm May 21, 2024
c77ce8f
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm May 21, 2024
e1ec21e
fixed error on setting
ujjwal-ibm May 22, 2024
8ace53f
fixed cidrs issue
ujjwal-ibm May 30, 2024
2a3bfb2
Update resource_ibm_is_vpn_gateway_connections.go
ujjwal-ibm May 30, 2024
2702764
Update resource_ibm_is_vpn_gateway_connection_test.go
ujjwal-ibm May 31, 2024
feaa6c4
Update resource_ibm_is_vpn_gateway_connection_test.go
ujjwal-ibm May 31, 2024
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
22 changes: 19 additions & 3 deletions examples/ibm-is-ng/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ resource "ibm_is_vpn_gateway" "VPNGateway1" {
subnet = ibm_is_subnet.subnet1.id
}

resource "ibm_is_vpn_gateway_connection" "VPNGatewayConnection1" {
name = "vpnconn1"
// Deprecated: peer_address, local_cidrs, peer_cidrs
resource "ibm_is_vpn_gateway_connection" "VPNGatewayConnection1_deprecated" {
name = "vpnconn1-deprecated"
vpn_gateway = ibm_is_vpn_gateway.VPNGateway1.id
peer_address = ibm_is_vpn_gateway.VPNGateway1.public_ip_address
preshared_key = "VPNDemoPassword"
Expand All @@ -209,6 +210,21 @@ resource "ibm_is_vpn_gateway_connection" "VPNGatewayConnection1" {
ipsec_policy = ibm_is_ipsec_policy.example.id
}

resource "ibm_is_vpn_gateway_connection" "VPNGatewayConnection1" {
name = "vpnconn1"
vpn_gateway = ibm_is_vpn_gateway.VPNGateway1.id
peer_address = ibm_is_vpn_gateway.VPNGateway1.public_ip_address
preshared_key = "VPNDemoPassword"
peer {
address = ibm_is_vpn_gateway.testacc_VPNGateway1.public_ip_address != "0.0.0.0" ? ibm_is_vpn_gateway.testacc_VPNGateway1.public_ip_address : ibm_is_vpn_gateway.testacc_VPNGateway1.public_ip_address2
peer_cidrs = [ibm_is_subnet.subnet2.ipv4_cidr_block]
}
local {
cidrs = [ibm_is_subnet.subnet1.ipv4_cidr_block]
}
ipsec_policy = ibm_is_ipsec_policy.example.id
}

resource "ibm_is_ssh_key" "sshkey" {
name = "ssh1"
public_key = file(var.ssh_public_key)
Expand Down Expand Up @@ -1592,7 +1608,7 @@ resource "ibm_is_reservation" "example" {
term = "one_year"
}
profile {
name = "ba2-2x8"
name = "ba2-2x8"
resource_type = "instance_profile"
}
zone = "us-east-3"
Expand Down
4 changes: 2 additions & 2 deletions examples/ibm-is-ng/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variable "ibmcloud_api_key" {
}

provider "ibm" {
ibmcloud_api_key = var.ibmcloud_api_key
region = "us-south"
ibmcloud_api_key = var.ibmcloud_api_key
region = "us-south"
}

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/IBM/schematics-go-sdk v0.2.3
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.4
github.com/IBM/vpc-beta-go-sdk v0.6.0
github.com/IBM/vpc-go-sdk v0.50.0
github.com/IBM/vpc-go-sdk v0.51.0
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ github.com/IBM/vmware-go-sdk v0.1.2 h1:5lKWFyInWz9e2hwGsoFTEoLa1jYkD30SReN0fQ10w
github.com/IBM/vmware-go-sdk v0.1.2/go.mod h1:2UGPBJju3jiv5VKKBBm9a5L6bzF/aJdKOKAzJ7HaOjA=
github.com/IBM/vpc-beta-go-sdk v0.6.0 h1:wfM3AcW3zOM3xsRtZ+EA6+sESlGUjQ6Yf4n5QQyz4uc=
github.com/IBM/vpc-beta-go-sdk v0.6.0/go.mod h1:fzHDAQIqH/5yJmYsKodKHLcqxMDT+yfH6vZjdiw8CQA=
github.com/IBM/vpc-go-sdk v0.50.0 h1:+vnXYK0FXFXYqaS/5/X1XEqH0bbRotkzkerRk21ZEjE=
github.com/IBM/vpc-go-sdk v0.50.0/go.mod h1:iBg9UJY1y/XpkweyP6YH7G6guzKPV8BYDoBMTdPupH4=
github.com/IBM/vpc-go-sdk v0.51.0 h1:JfeE/TnPm/NFU59UctiPzjxEhHtmBqXxG6zHH5eTI8I=
github.com/IBM/vpc-go-sdk v0.51.0/go.mod h1:3+zQ0dqiv46ALjRXXVrser+dCdAVXOHVwlYkCCX4bNU=
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
Expand Down
36 changes: 20 additions & 16 deletions ibm/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,22 +522,26 @@ func Provider() *schema.Provider {
"ibm_is_virtual_network_interface_ip": vpc.DataSourceIBMIsVirtualNetworkInterfaceIP(),
"ibm_is_virtual_network_interface_ips": vpc.DataSourceIBMIsVirtualNetworkInterfaceIPs(),

"ibm_is_share_mount_target": vpc.DataSourceIBMIsShareTarget(),
"ibm_is_share_mount_targets": vpc.DataSourceIBMIsShareTargets(),
"ibm_is_volume": vpc.DataSourceIBMISVolume(),
"ibm_is_volumes": vpc.DataSourceIBMIsVolumes(),
"ibm_is_volume_profile": vpc.DataSourceIBMISVolumeProfile(),
"ibm_is_volume_profiles": vpc.DataSourceIBMISVolumeProfiles(),
"ibm_is_vpc": vpc.DataSourceIBMISVPC(),
"ibm_is_vpc_dns_resolution_binding": vpc.DataSourceIBMIsVPCDnsResolutionBinding(),
"ibm_is_vpc_dns_resolution_bindings": vpc.DataSourceIBMIsVPCDnsResolutionBindings(),
"ibm_is_vpcs": vpc.DataSourceIBMISVPCs(),
"ibm_is_vpn_gateway": vpc.DataSourceIBMISVPNGateway(),
"ibm_is_vpn_gateways": vpc.DataSourceIBMISVPNGateways(),
"ibm_is_vpc_address_prefixes": vpc.DataSourceIbmIsVpcAddressPrefixes(),
"ibm_is_vpc_address_prefix": vpc.DataSourceIBMIsVPCAddressPrefix(),
"ibm_is_vpn_gateway_connection": vpc.DataSourceIBMISVPNGatewayConnection(),
"ibm_is_vpn_gateway_connections": vpc.DataSourceIBMISVPNGatewayConnections(),
"ibm_is_share_mount_target": vpc.DataSourceIBMIsShareTarget(),
"ibm_is_share_mount_targets": vpc.DataSourceIBMIsShareTargets(),
"ibm_is_volume": vpc.DataSourceIBMISVolume(),
"ibm_is_volumes": vpc.DataSourceIBMIsVolumes(),
"ibm_is_volume_profile": vpc.DataSourceIBMISVolumeProfile(),
"ibm_is_volume_profiles": vpc.DataSourceIBMISVolumeProfiles(),
"ibm_is_vpc": vpc.DataSourceIBMISVPC(),
"ibm_is_vpc_dns_resolution_binding": vpc.DataSourceIBMIsVPCDnsResolutionBinding(),
"ibm_is_vpc_dns_resolution_bindings": vpc.DataSourceIBMIsVPCDnsResolutionBindings(),
"ibm_is_vpcs": vpc.DataSourceIBMISVPCs(),
"ibm_is_vpn_gateway": vpc.DataSourceIBMISVPNGateway(),
"ibm_is_vpn_gateways": vpc.DataSourceIBMISVPNGateways(),
"ibm_is_vpc_address_prefixes": vpc.DataSourceIbmIsVpcAddressPrefixes(),
"ibm_is_vpc_address_prefix": vpc.DataSourceIBMIsVPCAddressPrefix(),
"ibm_is_vpn_gateway_connection": vpc.DataSourceIBMISVPNGatewayConnection(),
"ibm_is_vpn_gateway_connections": vpc.DataSourceIBMISVPNGatewayConnections(),

"ibm_is_vpn_gateway_connection_local_cidrs": vpc.DataSourceIBMIsVPNGatewayConnectionLocalCidrs(),
"ibm_is_vpn_gateway_connection_peer_cidrs": vpc.DataSourceIBMIsVPNGatewayConnectionPeerCidrs(),

"ibm_is_vpc_default_routing_table": vpc.DataSourceIBMISVPCDefaultRoutingTable(),
"ibm_is_vpc_routing_table": vpc.DataSourceIBMIBMIsVPCRoutingTable(),
"ibm_is_vpc_routing_tables": vpc.DataSourceIBMISVPCRoutingTables(),
Expand Down
Loading
Loading