Skip to content

Commit 8208071

Browse files
authored
Merge pull request #1294 from terraform-providers/release_merge_v4.13.0
Candidate for release_v4.13.0
2 parents d17b554 + 854b9a7 commit 8208071

File tree

290 files changed

+15330
-803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+15330
-803
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 4.13.0 (Unreleased)
2+
3+
### Added
4+
- Add list to existing API (Erratum) to OS Management Service
5+
- Support for Database Performance and Management DB Admin
6+
- Support for instance agent plugin configuration
7+
- Support for DBaaS One-off Patching
8+
- Support for `options` in `oci_database_database_upgrade`
9+
- Support for Adjustable Time Periods added to `Budgets` service
10+
- Support new error format
11+
12+
### Fixed
13+
- Fixed Terraform init failure for resource discovery
14+
115
## 4.12.0 (February 03, 2021)
216

317
### Added

examples/budget/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ resource "oci_budget_budget" "test_budget" {
4545
#Optional
4646
description = "budget1 description"
4747
display_name = "budget1"
48+
budget_processing_period_start_offset = "11"
4849
}
4950

5051
data "oci_budget_budget" "budget1" {
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {
5+
6+
}
7+
8+
variable "user_ocid" {
9+
10+
}
11+
12+
variable "fingerprint" {
13+
14+
}
15+
16+
variable "private_key_path" {
17+
18+
}
19+
20+
variable "region" {
21+
22+
}
23+
24+
variable "compartment_ocid" {
25+
26+
}
27+
28+
provider "oci" {
29+
tenancy_ocid = var.tenancy_ocid
30+
user_ocid = var.user_ocid
31+
fingerprint = var.fingerprint
32+
private_key_path = var.private_key_path
33+
region = var.region
34+
}
35+
36+
variable "num_instances" {
37+
default = "1"
38+
}
39+
40+
variable "instance_shape" {
41+
default = "VM.Standard.E3.Flex"
42+
}
43+
44+
variable "instance_ocpus" {
45+
default = 1
46+
}
47+
48+
variable "instance_shape_config_memory_in_gbs" {
49+
default = 1
50+
}
51+
52+
variable "instance_image_ocid" {
53+
type = map(string)
54+
55+
default = {
56+
# See https://docs.us-phoenix-1.oraclecloud.com/images/
57+
# Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
58+
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
59+
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
60+
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
61+
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
62+
}
63+
}
64+
65+
variable "flex_instance_image_ocid" {
66+
type = map(string)
67+
default = {
68+
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaa6hooptnlbfwr5lwemqjbu3uqidntrlhnt45yihfj222zahe7p3wq"
69+
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaa6tp7lhyrcokdtf7vrbmxyp2pctgg4uxvt4jz4vc47qoc2ec4anha"
70+
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaadvi77prh3vjijhwe5xbd6kjg3n5ndxjcpod6om6qaiqeu3csof7a"
71+
uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaw5gvriwzjhzt2tnylrfnpanz5ndztyrv3zpwhlzxdbkqsjfkwxaq"
72+
}
73+
}
74+
75+
variable "db_size" {
76+
default = "50" # size in GBs
77+
}
78+
79+
80+
resource "oci_core_instance" "test_instance" {
81+
count = var.num_instances
82+
availability_domain = data.oci_identity_availability_domain.ad.name
83+
compartment_id = var.compartment_ocid
84+
display_name = "TestInstance${count.index}"
85+
shape = var.instance_shape
86+
87+
shape_config {
88+
ocpus = "${var.instance_ocpus}"
89+
memory_in_gbs = "${var.instance_shape_config_memory_in_gbs}"
90+
}
91+
92+
create_vnic_details {
93+
subnet_id = oci_core_subnet.test_subnet.id
94+
display_name = "Primaryvnic"
95+
assign_public_ip = true
96+
hostname_label = "tfexampleinstance${count.index}"
97+
}
98+
99+
source_details {
100+
source_type = "image"
101+
source_id = var.flex_instance_image_ocid[var.region]
102+
}
103+
104+
agent_config {
105+
are_all_plugins_disabled = false
106+
is_management_disabled = true
107+
is_monitoring_disabled = true
108+
plugins_config {
109+
name = "Compute Instance Monitoring"
110+
desired_state = "ENABLED"
111+
}
112+
}
113+
}
114+
115+
resource "oci_core_vcn" "test_vcn" {
116+
cidr_block = "10.1.0.0/16"
117+
compartment_id = var.compartment_ocid
118+
display_name = "TestVcn"
119+
dns_label = "testvcn"
120+
}
121+
122+
resource "oci_core_internet_gateway" "test_internet_gateway" {
123+
compartment_id = var.compartment_ocid
124+
display_name = "TestInternetGateway"
125+
vcn_id = oci_core_vcn.test_vcn.id
126+
}
127+
128+
resource "oci_core_default_route_table" "default_route_table" {
129+
manage_default_resource_id = oci_core_vcn.test_vcn.default_route_table_id
130+
display_name = "DefaultRouteTable"
131+
132+
route_rules {
133+
destination = "0.0.0.0/0"
134+
destination_type = "CIDR_BLOCK"
135+
network_entity_id = oci_core_internet_gateway.test_internet_gateway.id
136+
}
137+
}
138+
139+
resource "oci_core_subnet" "test_subnet" {
140+
availability_domain = data.oci_identity_availability_domain.ad.name
141+
cidr_block = "10.1.20.0/24"
142+
display_name = "TestSubnet"
143+
dns_label = "testsubnet"
144+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
145+
compartment_id = var.compartment_ocid
146+
vcn_id = oci_core_vcn.test_vcn.id
147+
route_table_id = oci_core_vcn.test_vcn.default_route_table_id
148+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
149+
}
150+
151+
data "oci_identity_availability_domain" "ad" {
152+
compartment_id = var.tenancy_ocid
153+
ad_number = 1
154+
}
155+
156+
data "oci_computeinstanceagent_instance_agent_plugins" "test_instance_agent_plugins" {
157+
compartment_id = var.compartment_ocid
158+
instanceagent_id = oci_core_instance.test_instance.0.id
159+
}
160+
161+
output "agent_plugins" {
162+
value = [data.oci_computeinstanceagent_instance_agent_plugins.test_instance_agent_plugins]
163+
}
164+
165+
variable "instance_available_plugin_os_name" {
166+
default = "Oracle Linux"
167+
}
168+
169+
variable "instance_available_plugin_os_version" {
170+
default = "7.8"
171+
}
172+
173+
174+
data "oci_computeinstanceagent_instance_available_plugins" "test_instance_available_plugins" {
175+
#Required
176+
compartment_id = var.compartment_ocid
177+
os_name = var.instance_available_plugin_os_name
178+
os_version = var.instance_available_plugin_os_version
179+
}
180+
181+
output "available_plugins" {
182+
value = [data.oci_computeinstanceagent_instance_available_plugins.test_instance_available_plugins]
183+
}

examples/database/db_upgrade/resources.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,6 @@ resource "oci_database_database_upgrade" "test_upgrade" {
5858
database_upgrade_source_details {
5959
db_version = "19.8.0.0"
6060
source = "DB_VERSION"
61+
options = "-upgradeTimezone false -keepEvents"
6162
}
6263
}
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {}
5+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_id" {}
10+
11+
variable "managed_database_group_description" {
12+
default = "Sales test database group"
13+
}
14+
15+
variable "managed_database_group_id" {
16+
default = "id"
17+
}
18+
19+
variable "managed_database_group_name" {
20+
default = "TestGroup"
21+
}
22+
23+
variable "managed_database_group_state" {
24+
default = "ACTIVE"
25+
}
26+
27+
variable "managed_database_id" {
28+
default = "testManagedDatabase0"
29+
}
30+
31+
provider "oci" {
32+
tenancy_ocid = var.tenancy_ocid
33+
user_ocid = var.user_ocid
34+
fingerprint = var.fingerprint
35+
private_key_path = var.private_key_path
36+
region = var.region
37+
}
38+
39+
resource "oci_database_management_managed_database_group" "test_managed_database_group" {
40+
#Required
41+
compartment_id = var.compartment_id
42+
name = var.managed_database_group_name
43+
44+
#Optional
45+
description = var.managed_database_group_description
46+
managed_databases {
47+
id = var.managed_database_id
48+
}
49+
}
50+
51+
data "oci_database_management_managed_database_groups" "test_managed_database_groups_with_id" {
52+
#Required
53+
compartment_id = var.compartment_id
54+
55+
#Optional
56+
id = oci_database_management_managed_database_group.test_managed_database_group.id
57+
state = var.managed_database_group_state
58+
}
59+
60+
data "oci_database_management_managed_database_groups" "test_managed_database_groups_with_name" {
61+
#Required
62+
compartment_id = var.compartment_id
63+
64+
#Optional
65+
name = var.managed_database_group_name
66+
state = var.managed_database_group_state
67+
}

examples/load_balancer/lb_full/lb_full.tf

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ variable "compartment_ocid" {
2828
variable "region" {
2929
}
3030

31+
variable ca_certificate {
32+
}
33+
34+
variable private_key {
35+
}
36+
37+
variable public_certificate {
38+
}
39+
3140
variable "instance_image_ocid" {
3241
type = map(string)
3342

@@ -251,8 +260,8 @@ resource "oci_load_balancer" "lb1" {
251260

252261
display_name = "lb1"
253262
reserved_ips {
254-
id = "${oci_core_public_ip.test_reserved_ip.id}"
255-
}
263+
id = "${oci_core_public_ip.test_reserved_ip.id}"
264+
}
256265
}
257266

258267
resource "oci_load_balancer" "lb2" {
@@ -264,7 +273,7 @@ resource "oci_load_balancer" "lb2" {
264273
oci_core_subnet.subnet2.id,
265274
]
266275

267-
display_name = "lb1"
276+
display_name = "lb2"
268277
}
269278

270279

@@ -286,10 +295,10 @@ resource "oci_load_balancer" "flex_lb" {
286295
]
287296

288297
shape_details {
289-
#Required
290-
maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
291-
minimum_bandwidth_in_mbps = var.load_balancer_shape_details_minimum_bandwidth_in_mbps
292-
}
298+
#Required
299+
maximum_bandwidth_in_mbps = var.load_balancer_shape_details_maximum_bandwidth_in_mbps
300+
minimum_bandwidth_in_mbps = var.load_balancer_shape_details_minimum_bandwidth_in_mbps
301+
}
293302

294303
display_name = "flex_lb"
295304
}
@@ -328,10 +337,10 @@ resource "oci_load_balancer_backend_set" "lb-bes2" {
328337

329338
resource "oci_load_balancer_certificate" "lb-cert1" {
330339
load_balancer_id = oci_load_balancer.lb1.id
331-
ca_certificate = "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCEpaMjTCJ8WzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMTAxMTkyMTI2MjRaFw0yNDAxMTkyMTI2MjRaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo83kaUQXpCcSoEuRVFX3\njztWDNKtWpjNG240f0RpERI1NnZtHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19g\neIXR6TeavT+W5iRh4goK+N7gubYkSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCt\nCgd4MDlsvLv/YHCLvJL4JgRxKyevjlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc\n+Je9EC3MWWxd5jBwXu3vgIYRuGR4DPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJ\nKN0NXp5obaQToYqMsvAZyHoEyfCBDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t5\n8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAX1rxV2hai02Pb4Cf8U44zj+1aY6wV\nLvOMWiL3zl53up4/X7PDcmWcPM9UMVCGTISZD6A6IPvNlkvbtvYCzgjhtGxDmrj7\nwTRV5gO9j3bAhxBO7XgTmwmD/9hpykM58nbhLFnkGf+Taja8qsy0U8H74Tr9w1M8\n8E5kghgGzBElNquM8AUuDakC1JL4aLO/VDMxe/1BLtmBHLZy3XTzVycjP9ZFPh6h\nT+cWJcVOjQSYY2U75sDnKD2Sg1cmK54HauA6SPh4kAkpmxyLyDZZjPBQe2sLFmmS\naZSE+g16yMR9TVHo3pTpRkxJwDEH0LePwYXA4vUIK3HHS6zgLe0ody8g\n-----END CERTIFICATE-----"
340+
ca_certificate = var.ca_certificate
332341
certificate_name = "certificate1"
333-
private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAo83kaUQXpCcSoEuRVFX3jztWDNKtWpjNG240f0RpERI1NnZt\nHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19geIXR6TeavT+W5iRh4goK+N7gubYk\nSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCtCgd4MDlsvLv/YHCLvJL4JgRxKyev\njlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc+Je9EC3MWWxd5jBwXu3vgIYRuGR4\nDPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJKN0NXp5obaQToYqMsvAZyHoEyfCB\nDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t58QIDAQABAoIBADIyHuOPJTt9abzL\nS26vpVw0D6uAR/UyS/Ay9k1ltliv3rSg19DaHlwLjPwqnvCx7jBgTeVCYZhAkvgx\nkSsGDDcCsw+npXiG6wP9dC1jbHdVPUJLqZTPqB6sZCu8bM9RIE4Z/DcUY+HRN3qh\nmoh5wn0HSvJkNokjhx+TfY687uQfDMu0de4V2UPScZ7mboCu9HqK9qu0/krdTMH1\nrtnnFGEnx/Pe38YJl0fWxo8BHKHprwEvWX0MQzQeklnUtxREMuofSAOBe/I2DJGh\n1I94b6I66ypxuX0qAozT1MPbJGuaR+puyKawLNAQmZa9pgrrFK7e8PQUzrGVpVCp\nFtwx420CgYEA0uX/G0ycia0UTdkxkIsKIiLjs12LC0XmYjiWgkoL0PjiZzcPITn6\nvqqqGSz44HwtbrttZPm3Mo79yJ5xFiHCX0vFJykgy6cfS94imMgm8qIOS0bXjX7w\nxH2BOgp0H32LP/Zt7owcWJLEIQCjj0/4+Nvu0GskGVHlE8EYrXWf1E8CgYEAxtWk\nxBo52uNXL712VGDPNxprVGUpWSbkXpE+7wtRso5LnAnAj6dpmZsGe2zaYjRIt3Ls\nGnno4HUmwpQ5yXlHFpDUJvb2soXq3afnuAh5aVu6aKRQoG/5o3cD4pOupNbjDDNs\nTVLtTLIAIYDbph/j7pV/JnJ2WHcdk6WiVJoW/b8CgYAopLZzNmJ8jeR51D+fEYyU\nY5DqQj7Hn2L0zt8CoO6CCVToe03pI1lVYWKCk44rBQNkca51ZUKO9cum3BIDJ+Jj\npyCJmX1+geigIGEefIQ1AlIq464q0Knp1B4RZ25Vm0Y4v28UJ+BWmYI+sfbTaaAb\npZbyh5NfZc717aKp2x9ANQKBgHQpvOkUqVhIGVe6yLbjGCyJMstLjqyXHDRjhvEB\nG+nFWEcBK47Br+Adwdu57JwTD6ida3LMZlE8IDjtgBVE1VNJqahaACasNlrpDWdn\nDAeRn4Yi+TfCM4Zcsdhdj1qecGdgY5WJLTnxhEIOlkSnvPJWRMKhfKKSdKUdz4i9\nvVDhAoGAEHxfhFLVwdTa0RMUq3KYSXa5WqLANRn2e62Cc3eUWekcUjbIATRF5AIo\nm0WS+rURZWy1Fd6fGg8sRHock0+vxwqeP6OlyW4tJMhL33NrNbgyvkXlMMIX6bC4\nUq8aAew0B3j61UUsTqhHMhYwIS3GOIHx/O10wwINPnUMIVER3Wg=\n-----END RSA PRIVATE KEY-----"
334-
public_certificate = "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCEpaMjTCJ8WzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMTAxMTkyMTI2MjRaFw0yNDAxMTkyMTI2MjRaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo83kaUQXpCcSoEuRVFX3\njztWDNKtWpjNG240f0RpERI1NnZtHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19g\neIXR6TeavT+W5iRh4goK+N7gubYkSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCt\nCgd4MDlsvLv/YHCLvJL4JgRxKyevjlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc\n+Je9EC3MWWxd5jBwXu3vgIYRuGR4DPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJ\nKN0NXp5obaQToYqMsvAZyHoEyfCBDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t5\n8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAX1rxV2hai02Pb4Cf8U44zj+1aY6wV\nLvOMWiL3zl53up4/X7PDcmWcPM9UMVCGTISZD6A6IPvNlkvbtvYCzgjhtGxDmrj7\nwTRV5gO9j3bAhxBO7XgTmwmD/9hpykM58nbhLFnkGf+Taja8qsy0U8H74Tr9w1M8\n8E5kghgGzBElNquM8AUuDakC1JL4aLO/VDMxe/1BLtmBHLZy3XTzVycjP9ZFPh6h\nT+cWJcVOjQSYY2U75sDnKD2Sg1cmK54HauA6SPh4kAkpmxyLyDZZjPBQe2sLFmmS\naZSE+g16yMR9TVHo3pTpRkxJwDEH0LePwYXA4vUIK3HHS6zgLe0ody8g\n-----END CERTIFICATE-----"
342+
private_key = var.private_key
343+
public_certificate = var.public_certificate
335344

336345
lifecycle {
337346
create_before_destroy = true
@@ -340,10 +349,10 @@ resource "oci_load_balancer_certificate" "lb-cert1" {
340349

341350
resource "oci_load_balancer_certificate" "lb-cert2" {
342351
load_balancer_id = oci_load_balancer.lb2.id
343-
ca_certificate = "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCEpaMjTCJ8WzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMTAxMTkyMTI2MjRaFw0yNDAxMTkyMTI2MjRaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo83kaUQXpCcSoEuRVFX3\njztWDNKtWpjNG240f0RpERI1NnZtHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19g\neIXR6TeavT+W5iRh4goK+N7gubYkSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCt\nCgd4MDlsvLv/YHCLvJL4JgRxKyevjlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc\n+Je9EC3MWWxd5jBwXu3vgIYRuGR4DPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJ\nKN0NXp5obaQToYqMsvAZyHoEyfCBDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t5\n8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAX1rxV2hai02Pb4Cf8U44zj+1aY6wV\nLvOMWiL3zl53up4/X7PDcmWcPM9UMVCGTISZD6A6IPvNlkvbtvYCzgjhtGxDmrj7\nwTRV5gO9j3bAhxBO7XgTmwmD/9hpykM58nbhLFnkGf+Taja8qsy0U8H74Tr9w1M8\n8E5kghgGzBElNquM8AUuDakC1JL4aLO/VDMxe/1BLtmBHLZy3XTzVycjP9ZFPh6h\nT+cWJcVOjQSYY2U75sDnKD2Sg1cmK54HauA6SPh4kAkpmxyLyDZZjPBQe2sLFmmS\naZSE+g16yMR9TVHo3pTpRkxJwDEH0LePwYXA4vUIK3HHS6zgLe0ody8g\n-----END CERTIFICATE-----"
352+
ca_certificate = var.ca_certificate
344353
certificate_name = "certificate2"
345-
private_key = "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAo83kaUQXpCcSoEuRVFX3jztWDNKtWpjNG240f0RpERI1NnZt\nHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19geIXR6TeavT+W5iRh4goK+N7gubYk\nSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCtCgd4MDlsvLv/YHCLvJL4JgRxKyev\njlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc+Je9EC3MWWxd5jBwXu3vgIYRuGR4\nDPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJKN0NXp5obaQToYqMsvAZyHoEyfCB\nDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t58QIDAQABAoIBADIyHuOPJTt9abzL\nS26vpVw0D6uAR/UyS/Ay9k1ltliv3rSg19DaHlwLjPwqnvCx7jBgTeVCYZhAkvgx\nkSsGDDcCsw+npXiG6wP9dC1jbHdVPUJLqZTPqB6sZCu8bM9RIE4Z/DcUY+HRN3qh\nmoh5wn0HSvJkNokjhx+TfY687uQfDMu0de4V2UPScZ7mboCu9HqK9qu0/krdTMH1\nrtnnFGEnx/Pe38YJl0fWxo8BHKHprwEvWX0MQzQeklnUtxREMuofSAOBe/I2DJGh\n1I94b6I66ypxuX0qAozT1MPbJGuaR+puyKawLNAQmZa9pgrrFK7e8PQUzrGVpVCp\nFtwx420CgYEA0uX/G0ycia0UTdkxkIsKIiLjs12LC0XmYjiWgkoL0PjiZzcPITn6\nvqqqGSz44HwtbrttZPm3Mo79yJ5xFiHCX0vFJykgy6cfS94imMgm8qIOS0bXjX7w\nxH2BOgp0H32LP/Zt7owcWJLEIQCjj0/4+Nvu0GskGVHlE8EYrXWf1E8CgYEAxtWk\nxBo52uNXL712VGDPNxprVGUpWSbkXpE+7wtRso5LnAnAj6dpmZsGe2zaYjRIt3Ls\nGnno4HUmwpQ5yXlHFpDUJvb2soXq3afnuAh5aVu6aKRQoG/5o3cD4pOupNbjDDNs\nTVLtTLIAIYDbph/j7pV/JnJ2WHcdk6WiVJoW/b8CgYAopLZzNmJ8jeR51D+fEYyU\nY5DqQj7Hn2L0zt8CoO6CCVToe03pI1lVYWKCk44rBQNkca51ZUKO9cum3BIDJ+Jj\npyCJmX1+geigIGEefIQ1AlIq464q0Knp1B4RZ25Vm0Y4v28UJ+BWmYI+sfbTaaAb\npZbyh5NfZc717aKp2x9ANQKBgHQpvOkUqVhIGVe6yLbjGCyJMstLjqyXHDRjhvEB\nG+nFWEcBK47Br+Adwdu57JwTD6ida3LMZlE8IDjtgBVE1VNJqahaACasNlrpDWdn\nDAeRn4Yi+TfCM4Zcsdhdj1qecGdgY5WJLTnxhEIOlkSnvPJWRMKhfKKSdKUdz4i9\nvVDhAoGAEHxfhFLVwdTa0RMUq3KYSXa5WqLANRn2e62Cc3eUWekcUjbIATRF5AIo\nm0WS+rURZWy1Fd6fGg8sRHock0+vxwqeP6OlyW4tJMhL33NrNbgyvkXlMMIX6bC4\nUq8aAew0B3j61UUsTqhHMhYwIS3GOIHx/O10wwINPnUMIVER3Wg=\n-----END RSA PRIVATE KEY-----"
346-
public_certificate = "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCEpaMjTCJ8WzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMTAxMTkyMTI2MjRaFw0yNDAxMTkyMTI2MjRaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo83kaUQXpCcSoEuRVFX3\njztWDNKtWpjNG240f0RpERI1NnZtHH0qnZqfaWAQQa8kx3+W1LOeFbkkRnkJz19g\neIXR6TeavT+W5iRh4goK+N7gubYkSMa2shVf+XsoHKERSbhdhrtX+GqvKzAvplCt\nCgd4MDlsvLv/YHCLvJL4JgRxKyevjlnE1rqrICJMCLbbZMrIKTzwb/K13hGrm6Bc\n+Je9EC3MWWxd5jBwXu3vgIYRuGR4DPg/yfMKPZr2xFDLpBsv5jaqULS9t6GwoEBJ\nKN0NXp5obaQToYqMsvAZyHoEyfCBDka16Bm5hGF60FwqgUT3p/+qlBn61cAJe9t5\n8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAX1rxV2hai02Pb4Cf8U44zj+1aY6wV\nLvOMWiL3zl53up4/X7PDcmWcPM9UMVCGTISZD6A6IPvNlkvbtvYCzgjhtGxDmrj7\nwTRV5gO9j3bAhxBO7XgTmwmD/9hpykM58nbhLFnkGf+Taja8qsy0U8H74Tr9w1M8\n8E5kghgGzBElNquM8AUuDakC1JL4aLO/VDMxe/1BLtmBHLZy3XTzVycjP9ZFPh6h\nT+cWJcVOjQSYY2U75sDnKD2Sg1cmK54HauA6SPh4kAkpmxyLyDZZjPBQe2sLFmmS\naZSE+g16yMR9TVHo3pTpRkxJwDEH0LePwYXA4vUIK3HHS6zgLe0ody8g\n-----END CERTIFICATE-----"
354+
private_key = var.private_key
355+
public_certificate = var.public_certificate
347356

348357
lifecycle {
349358
create_before_destroy = true

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
77
github.com/hashicorp/terraform-exec v0.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.15.0
9-
github.com/oracle/oci-go-sdk/v35 v35.0.0
9+
github.com/oracle/oci-go-sdk/v35 v35.1.0
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.6.1
1212
golang.org/x/mod v0.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
200200
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
201201
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
202202
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
203-
github.com/oracle/oci-go-sdk/v35 v35.0.0 h1:08emzWLiasf5BqwGeSJ79S0eTePeoMbPAm5TmX5OvUg=
204-
github.com/oracle/oci-go-sdk/v35 v35.0.0/go.mod h1:ahd0WhBivqXhNoeMIGThzpk9Ic7CpQiB9krgh0WEfRg=
203+
github.com/oracle/oci-go-sdk/v35 v35.1.0 h1:AJ/D8YYIfsisLwKxaE0bk8OMhWrDixKbAdDuFWc4eq4=
204+
github.com/oracle/oci-go-sdk/v35 v35.1.0/go.mod h1:ahd0WhBivqXhNoeMIGThzpk9Ic7CpQiB9krgh0WEfRg=
205205
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
206206
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
207207
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)